Title: [177244] trunk/Source/WebCore
Revision
177244
Author
simon.fra...@apple.com
Date
2014-12-12 15:38:36 -0800 (Fri, 12 Dec 2014)

Log 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):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (177243 => 177244)


--- trunk/Source/WebCore/ChangeLog	2014-12-12 23:35:43 UTC (rev 177243)
+++ trunk/Source/WebCore/ChangeLog	2014-12-12 23:38:36 UTC (rev 177244)
@@ -19,6 +19,21 @@
 
         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.fra...@apple.com>
+
+        REGRESSION (r168217): Images are cropped out during animation at jetblue.com
+        https://bugs.webkit.org/show_bug.cgi?id=136410
         rdar://problem/18188533
 
         Reviewed by Dean Jackson.

Modified: trunk/Source/WebCore/dom/Document.cpp (177243 => 177244)


--- trunk/Source/WebCore/dom/Document.cpp	2014-12-12 23:35:43 UTC (rev 177243)
+++ trunk/Source/WebCore/dom/Document.cpp	2014-12-12 23:38:36 UTC (rev 177244)
@@ -1765,6 +1765,7 @@
         return; // Guard against re-entrancy. -dwh
 
     RenderView::RepaintRegionAccumulator repaintRegionAccumulator(renderView());
+    AnimationUpdateBlock animationUpdateBlock(&m_frame->animation());
 
     // FIXME: We should update style on our ancestor chain before proceeding (especially for seamless),
     // however doing so currently causes several tests to crash, as Frame::setDocument calls Document::attach
@@ -1837,7 +1838,6 @@
     if ((!m_pendingStyleRecalcShouldForce && !childNeedsStyleRecalc()) || inPageCache())
         return;
 
-    AnimationUpdateBlock animationUpdateBlock(m_frame ? &m_frame->animation() : nullptr);
     recalcStyle(Style::NoChange);
 }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to