[webkit-changes] [100832] trunk

Fri, 18 Nov 2011 17:48:20 -0800

Title: [100832] trunk
Revision
100832
Author
[email protected]
Date
2011-11-18 17:48:13 -0800 (Fri, 18 Nov 2011)

Log Message

Unreviewed, rolling out r100693.
http://trac.webkit.org/changeset/100693
https://bugs.webkit.org/show_bug.cgi?id=72779

This patch caused a rendering regression (see bug 72770)
(Requested by philip__ on #webkit).

Patch by Sheriff Bot <[email protected]> on 2011-11-18

Source/WebCore:

* rendering/RenderObject.cpp:
(WebCore::RenderObject::setStyle):
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::diff):

LayoutTests:

* fast/layers/layer-absolute-parent-opacity-expected.png: Removed.
* fast/layers/layer-absolute-parent-opacity-expected.txt: Removed.
* fast/layers/layer-absolute-parent-opacity.html: Removed.

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (100831 => 100832)


--- trunk/LayoutTests/ChangeLog	2011-11-19 01:17:12 UTC (rev 100831)
+++ trunk/LayoutTests/ChangeLog	2011-11-19 01:48:13 UTC (rev 100832)
@@ -1,3 +1,16 @@
+2011-11-18  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r100693.
+        http://trac.webkit.org/changeset/100693
+        https://bugs.webkit.org/show_bug.cgi?id=72779
+
+        This patch caused a rendering regression (see bug 72770)
+        (Requested by philip__ on #webkit).
+
+        * fast/layers/layer-absolute-parent-opacity-expected.png: Removed.
+        * fast/layers/layer-absolute-parent-opacity-expected.txt: Removed.
+        * fast/layers/layer-absolute-parent-opacity.html: Removed.
+
 2011-11-18  Simon Fraser  <[email protected]>
 
         Reflection on composited element doesn't update if the element changes to show no content

Deleted: trunk/LayoutTests/fast/layers/layer-absolute-parent-opacity-expected.png (100831 => 100832)


--- trunk/LayoutTests/fast/layers/layer-absolute-parent-opacity-expected.png	2011-11-19 01:17:12 UTC (rev 100831)
+++ trunk/LayoutTests/fast/layers/layer-absolute-parent-opacity-expected.png	2011-11-19 01:48:13 UTC (rev 100832)
@@ -1,6 +0,0 @@
-\x89PNG
-
-
-IHDR X')tEXtchecksum755fd1e0a0d89bfc6d37d478c727fb78\xEF\xA33
-\xE8IDATx\x9C\xEDܱ
-\xC20E\xC1\x80\xD8\xD1\xD9&\xCA6وuX\xBA'\xD6]\x99H\xD6/\x9F\\xF86\xC6\xD8޹\xAE\xEB\xED\xF7w\x9E\xB3\xB0\xA2\xE7s\x9F=\x80r\x9F=`5 &\xB0b &\xB0b &\xB0b\x8FO?\xCEm\xD5\xA3\x8E\xD9\x80Ź\xC1\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88=f\xF8\xBA\xE3\xEC\x8F܎\xFCL\xFE˾\xCF^\xC0/q\x83X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81\xBB\x8D1foX\x8A,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\xD8_\xBE\xEC\xFC5SCIEND\xAEB`\x82
\ No newline at end of file

Deleted: trunk/LayoutTests/fast/layers/layer-absolute-parent-opacity-expected.txt (100831 => 100832)


--- trunk/LayoutTests/fast/layers/layer-absolute-parent-opacity-expected.txt	2011-11-19 01:17:12 UTC (rev 100831)
+++ trunk/LayoutTests/fast/layers/layer-absolute-parent-opacity-expected.txt	2011-11-19 01:48:13 UTC (rev 100832)
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-layer at (8,8) size 100x100
-  RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#00FF00]
-layer at (80,0) size 200x50
-  RenderBlock (positioned) {DIV} at (80,0) size 200x50 [bgcolor=#0000FF]

Deleted: trunk/LayoutTests/fast/layers/layer-absolute-parent-opacity.html (100831 => 100832)


--- trunk/LayoutTests/fast/layers/layer-absolute-parent-opacity.html	2011-11-19 01:17:12 UTC (rev 100831)
+++ trunk/LayoutTests/fast/layers/layer-absolute-parent-opacity.html	2011-11-19 01:48:13 UTC (rev 100832)
@@ -1,43 +0,0 @@
-<!--
-Test for https://bugs.webkit.org/show_bug.cgi?id=68777
-When we change opacity for parent DIV, this should change also opacity for absolute child, which is
-on its own layer. Before fixing this worked only second time, when parent DIV already has its own
-layer.
--->
-<html>
-    <head>
-        <style>
-        #parentDiv {
-            background: #0f0;
-            width: 100px;
-            height: 100px;
-        }
-        #childDiv {
-            position: absolute;
-            background: #00f;
-            top: 0px;
-            left: 80px;
-            width: 200px;
-            height: 50px;
-    }
-  </style>
-        <script type="text/_javascript_">
-            function test() {
-                if (window.layoutTestController) {
-                    layoutTestController.display();
-                    setTimeout(function() {
-                        document.getElementById("parentDiv").style.opacity = 0.5;
-                        layoutTestController.notifyDone();
-                    }, 0);
-                    layoutTestController.waitUntilDone();
-                }
-            }
-        </script>
-    </head>
-    <body _onload_="test()">
-        <div id="parentDiv">
-            <div id="childDiv"/>
-        </div>
-    </body>
-</html>
-

Modified: trunk/Source/WebCore/ChangeLog (100831 => 100832)


--- trunk/Source/WebCore/ChangeLog	2011-11-19 01:17:12 UTC (rev 100831)
+++ trunk/Source/WebCore/ChangeLog	2011-11-19 01:48:13 UTC (rev 100832)
@@ -1,3 +1,17 @@
+2011-11-18  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r100693.
+        http://trac.webkit.org/changeset/100693
+        https://bugs.webkit.org/show_bug.cgi?id=72779
+
+        This patch caused a rendering regression (see bug 72770)
+        (Requested by philip__ on #webkit).
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::setStyle):
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::diff):
+
 2011-11-18  Simon Fraser  <[email protected]>
 
         Reflection on composited element doesn't update if the element changes to show no content

Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (100831 => 100832)


--- trunk/Source/WebCore/rendering/RenderObject.cpp	2011-11-19 01:17:12 UTC (rev 100831)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp	2011-11-19 01:48:13 UTC (rev 100832)
@@ -1772,11 +1772,7 @@
             setNeedsSimplifiedNormalFlowLayout();
     }
     
-    if (diff == StyleDifferenceRepaint && updatedDiff == StyleDifferenceRepaintLayer) {
-        // If there was no layer, we ignored StyleDifferenceRepaintLayer and processed it as
-        // StyleDifferenceRepaint, so do layers repaint now.
-        toRenderBoxModelObject(this)->layer()->repaintIncludingDescendants();
-    } else if (updatedDiff == StyleDifferenceRepaintLayer || updatedDiff == StyleDifferenceRepaint) {
+    if (updatedDiff == StyleDifferenceRepaintLayer || updatedDiff == StyleDifferenceRepaint) {
         // Do a repaint with the new style now, e.g., for example if we go from
         // not having an outline to having an outline.
         repaint();

Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (100831 => 100832)


--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp	2011-11-19 01:17:12 UTC (rev 100831)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp	2011-11-19 01:48:13 UTC (rev 100832)
@@ -563,7 +563,6 @@
         // to add a selfNeedsSimplifiedLayout bit in order to not get confused and taint every line).
         // In addition we need to solve the floating object issue when layers come and go. Right now
         // a full layout is necessary to keep floating object lists sane.
-        changedContextSensitiveProperties |= ContextSensitivePropertyOpacity;
         return StyleDifferenceLayout;
     }
 

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to