Title: [105920] trunk
- Revision
- 105920
- Author
- [email protected]
- Date
- 2012-01-25 13:06:51 -0800 (Wed, 25 Jan 2012)
Log Message
Unreviewed, rolling out r105906.
http://trac.webkit.org/changeset/105906
https://bugs.webkit.org/show_bug.cgi?id=77038
Breaks compositing/visibility/layer-visible-content.html and
compositing/visibility/visibility-image-layers-dynamic.html
(Requested by leviw|gardening on #webkit).
Patch by Sheriff Bot <[email protected]> on 2012-01-25
Source/WebCore:
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):
LayoutTests:
* compositing/visibility/layer-visible-content-expected.txt:
* compositing/visibility/visibility-image-layers-dynamic-expected.txt:
* platform/chromium/test_expectations.txt:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (105919 => 105920)
--- trunk/LayoutTests/ChangeLog 2012-01-25 20:57:17 UTC (rev 105919)
+++ trunk/LayoutTests/ChangeLog 2012-01-25 21:06:51 UTC (rev 105920)
@@ -1,3 +1,17 @@
+2012-01-25 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r105906.
+ http://trac.webkit.org/changeset/105906
+ https://bugs.webkit.org/show_bug.cgi?id=77038
+
+ Breaks compositing/visibility/layer-visible-content.html and
+ compositing/visibility/visibility-image-layers-dynamic.html
+ (Requested by leviw|gardening on #webkit).
+
+ * compositing/visibility/layer-visible-content-expected.txt:
+ * compositing/visibility/visibility-image-layers-dynamic-expected.txt:
+ * platform/chromium/test_expectations.txt:
+
2012-01-25 Hajime Morita <[email protected]>
<content> should create HTMLContentElement object
Modified: trunk/LayoutTests/compositing/visibility/layer-visible-content-expected.txt (105919 => 105920)
--- trunk/LayoutTests/compositing/visibility/layer-visible-content-expected.txt 2012-01-25 20:57:17 UTC (rev 105919)
+++ trunk/LayoutTests/compositing/visibility/layer-visible-content-expected.txt 2012-01-25 21:06:51 UTC (rev 105920)
@@ -3,10 +3,11 @@
(children 1
(GraphicsLayer
(bounds 800.00 600.00)
- (children 2
+ (children 1
(GraphicsLayer
(bounds 200.00 200.00)
(drawsContent 1)
+ (contentsVisible 0)
(children 1
(GraphicsLayer
(bounds 200.00 200.00)
@@ -18,11 +19,6 @@
)
)
)
- (GraphicsLayer
- (bounds 800.00 15.00)
- (opacity 0.00)
- (drawsContent 1)
- )
)
)
)
Modified: trunk/LayoutTests/compositing/visibility/visibility-image-layers-dynamic-expected.txt (105919 => 105920)
--- trunk/LayoutTests/compositing/visibility/visibility-image-layers-dynamic-expected.txt 2012-01-25 20:57:17 UTC (rev 105919)
+++ trunk/LayoutTests/compositing/visibility/visibility-image-layers-dynamic-expected.txt 2012-01-25 21:06:51 UTC (rev 105920)
@@ -35,6 +35,7 @@
(GraphicsLayer
(position 14.00 314.00)
(bounds 757.00 152.00)
+ (contentsVisible 0)
(children 1
(GraphicsLayer
(position 20.00 20.00)
@@ -49,10 +50,10 @@
After step 1
(GraphicsLayer
- (bounds 785.00 1286.00)
+ (bounds 785.00 1301.00)
(children 1
(GraphicsLayer
- (bounds 785.00 1286.00)
+ (bounds 785.00 1301.00)
(children 3
(GraphicsLayer
(position 14.00 6.00)
@@ -79,6 +80,7 @@
(GraphicsLayer
(position 14.00 314.00)
(bounds 757.00 152.00)
+ (contentsVisible 0)
(children 1
(GraphicsLayer
(position 20.00 20.00)
@@ -93,10 +95,10 @@
After step 2
(GraphicsLayer
- (bounds 785.00 1935.00)
+ (bounds 785.00 1965.00)
(children 1
(GraphicsLayer
- (bounds 785.00 1935.00)
+ (bounds 785.00 1965.00)
(children 3
(GraphicsLayer
(position 14.00 6.00)
@@ -122,6 +124,7 @@
(GraphicsLayer
(position 14.00 314.00)
(bounds 757.00 152.00)
+ (contentsVisible 0)
(children 1
(GraphicsLayer
(position 20.00 20.00)
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (105919 => 105920)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-01-25 20:57:17 UTC (rev 105919)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-01-25 21:06:51 UTC (rev 105920)
@@ -4004,6 +4004,8 @@
// Need to implement file name logging.
BUGWK76572 : http/tests/download = FAIL
+BUGWK76716 : compositing/visibility/layer-visible-content.html = IMAGE+TEXT
+
BUGWK76967 : media/media-fragments/TC0030-TC0039.html = PASS TIMEOUT
BUGABARTH : media/audio-garbage-collect.html = PASS TIMEOUT
Modified: trunk/Source/WebCore/ChangeLog (105919 => 105920)
--- trunk/Source/WebCore/ChangeLog 2012-01-25 20:57:17 UTC (rev 105919)
+++ trunk/Source/WebCore/ChangeLog 2012-01-25 21:06:51 UTC (rev 105920)
@@ -1,3 +1,16 @@
+2012-01-25 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r105906.
+ http://trac.webkit.org/changeset/105906
+ https://bugs.webkit.org/show_bug.cgi?id=77038
+
+ Breaks compositing/visibility/layer-visible-content.html and
+ compositing/visibility/visibility-image-layers-dynamic.html
+ (Requested by leviw|gardening on #webkit).
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):
+
2012-01-25 Mike Fenton <[email protected]>
Page Up and Page Down mappings are backwards on BlackBerry port.
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (105919 => 105920)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2012-01-25 20:57:17 UTC (rev 105919)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2012-01-25 21:06:51 UTC (rev 105920)
@@ -403,11 +403,7 @@
#endif
m_owningLayer->updateVisibilityStatus();
-
- // m_graphicsLayer is the corresponding GraphicsLayer for this RenderLayer and its non-compositing
- // descendants. So, the visibility flag for m_graphicsLayer should be true if there are any
- // non-compositing visible layers.
- m_graphicsLayer->setContentsVisible(m_owningLayer->hasVisibleContent() || m_owningLayer->hasVisibleDescendant());
+ m_graphicsLayer->setContentsVisible(m_owningLayer->hasVisibleContent());
RenderStyle* style = renderer()->style();
m_graphicsLayer->setPreserves3D(style->transformStyle3D() == TransformStyle3DPreserve3D && !renderer()->hasReflection());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
