Changeset 177244 in webkit

Timestamp:

Dec 12, 2014 3:38:36 PM (9 years ago)

Author:

Simon Fraser

Message:

REGRESSION (r168217): Images are cropped out during animation at jetblue.com
​https://bugs.webkit.org/show_bug.cgi?id=136410

Reviewed by Dean Jackson.

We were hitting the new assertion under Page::setPageScaleFactor(), which
calls recalcStyle(), so move the AnimationUpdateBlock from updateStyleIfNeeded()
to recalcStyle().

• dom/Document.cpp:

(WebCore::Document::recalcStyle):
(WebCore::Document::updateStyleIfNeeded):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ -15 +15 @@
         * page/FrameView.cpp:
         (WebCore::FrameView::scrollContentsFastPath):
+
+2014-12-12  Simon Fraser  <simon.fraser@apple.com>
+
+        REGRESSION (r168217): Images are cropped out during animation at jetblue.com
+        https://bugs.webkit.org/show_bug.cgi?id=136410
+
+        Reviewed by Dean Jackson.
+
+        We were hitting the new assertion under Page::setPageScaleFactor(), which
+        calls recalcStyle(), so move the AnimationUpdateBlock from updateStyleIfNeeded()
+        to recalcStyle().
+
+        * dom/Document.cpp:
+        (WebCore::Document::recalcStyle):
+        (WebCore::Document::updateStyleIfNeeded):
 
 2014-12-12  Simon Fraser  <simon.fraser@apple.com>

trunk/Source/WebCore/dom/Document.cpp

@@ -1766 +1766 @@
 
     RenderView::RepaintRegionAccumulator repaintRegionAccumulator(renderView());
+    AnimationUpdateBlock animationUpdateBlock(&m_frame->animation());
 
     // FIXME: We should update style on our ancestor chain before proceeding (especially for seamless),
@@ -1838 +1839 @@
         return;
 
-    AnimationUpdateBlock animationUpdateBlock(m_frame ? &m_frame->animation() : nullptr);
     recalcStyle(Style::NoChange);
 }