Changeset 183461 in webkit

Timestamp:

Apr 27, 2015, 11:52:20 PM (10 years ago)

Author:

Simon Fraser

Message:

Eliminate styleDidChange with StyleDifferenceEqual when updates are actually necessary
​https://bugs.webkit.org/show_bug.cgi?id=144198

Followup: fix assertions seen in fullscreen and pseudo-element tests. These code
paths set the style to the existing pointer, but with a SyntheticStyleChange.
We have to avoid an early return in this case.

• rendering/RenderElement.cpp:

(WebCore::RenderElement::setStyle):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderElement.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-04-27  Simon Fraser  <simon.fraser@apple.com>
+
+        Eliminate styleDidChange with StyleDifferenceEqual when updates are actually necessary
+        https://bugs.webkit.org/show_bug.cgi?id=144198
+
+        Followup: fix assertions seen in fullscreen and pseudo-element tests. These code
+        paths set the style to the existing pointer, but with a SyntheticStyleChange.
+        We have to avoid an early return in this case.
+
+        * rendering/RenderElement.cpp:
+        (WebCore::RenderElement::setStyle):
+
 2015-04-25  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/rendering/RenderElement.cpp

@@ -402 +402 @@
     ASSERT(m_hasInitializedStyle || isRenderView());
 
-    if (m_style.ptr() == style.ptr()) {
+    if (m_style.ptr() == style.ptr() && minimalStyleDifference != StyleDifferenceEqual) {
         // FIXME: Can we change things so we never hit this code path?
         // We need to run through adjustStyleDifference() for iframes, plugins, and canvas so
@@ -409 +409 @@
         ASSERT(!isEmbeddedObject());
         ASSERT(!isCanvas());
-        ASSERT(minimalStyleDifference == StyleDifferenceEqual);
         return;
     }