Title: [135826] trunk/Source
- Revision
- 135826
- Author
- [email protected]
- Date
- 2012-11-26 23:22:35 -0800 (Mon, 26 Nov 2012)
Log Message
Unreviewed, rolling out r135822.
http://trac.webkit.org/changeset/135822
https://bugs.webkit.org/show_bug.cgi?id=103369
Undo the revert of r135818, since that change does not affect
code used by Chromium (Requested by apavlov on #webkit).
Patch by Sheriff Bot <[email protected]> on 2012-11-26
Source/WebCore:
* platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
(WebCore::GraphicsLayerTextureMapper::setMaskLayer):
(WebCore::GraphicsLayerTextureMapper::setContentsVisible):
Source/WebKit2:
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp:
(WebCore::CoordinatedGraphicsLayer::setContentsVisible):
(WebCore::CoordinatedGraphicsLayer::setMaskLayer):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (135825 => 135826)
--- trunk/Source/WebCore/ChangeLog 2012-11-27 07:20:00 UTC (rev 135825)
+++ trunk/Source/WebCore/ChangeLog 2012-11-27 07:22:35 UTC (rev 135826)
@@ -1,3 +1,16 @@
+2012-11-26 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r135822.
+ http://trac.webkit.org/changeset/135822
+ https://bugs.webkit.org/show_bug.cgi?id=103369
+
+ Undo the revert of r135818, since that change does not affect
+ code used by Chromium (Requested by apavlov on #webkit).
+
+ * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+ (WebCore::GraphicsLayerTextureMapper::setMaskLayer):
+ (WebCore::GraphicsLayerTextureMapper::setContentsVisible):
+
2012-11-26 Michael Pruett <[email protected]>
[GTK] Fix build error on GTK due to r135749
Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (135825 => 135826)
--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2012-11-27 07:20:00 UTC (rev 135825)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2012-11-27 07:22:35 UTC (rev 135826)
@@ -195,6 +195,7 @@
if (!value)
return;
value->setSize(size());
+ value->setContentsVisible(contentsAreVisible());
}
@@ -300,6 +301,8 @@
return;
notifyChange(TextureMapperLayer::ContentsVisibleChange);
GraphicsLayer::setContentsVisible(value);
+ if (maskLayer())
+ maskLayer()->setContentsVisible(value);
}
/* \reimp (GraphicsLayer.h)
Modified: trunk/Source/WebKit2/ChangeLog (135825 => 135826)
--- trunk/Source/WebKit2/ChangeLog 2012-11-27 07:20:00 UTC (rev 135825)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-27 07:22:35 UTC (rev 135826)
@@ -1,5 +1,18 @@
2012-11-26 Sheriff Bot <[email protected]>
+ Unreviewed, rolling out r135822.
+ http://trac.webkit.org/changeset/135822
+ https://bugs.webkit.org/show_bug.cgi?id=103369
+
+ Undo the revert of r135818, since that change does not affect
+ code used by Chromium (Requested by apavlov on #webkit).
+
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp:
+ (WebCore::CoordinatedGraphicsLayer::setContentsVisible):
+ (WebCore::CoordinatedGraphicsLayer::setMaskLayer):
+
+2012-11-26 Sheriff Bot <[email protected]>
+
Unreviewed, rolling out r135818.
http://trac.webkit.org/changeset/135818
https://bugs.webkit.org/show_bug.cgi?id=103368
Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp (135825 => 135826)
--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp 2012-11-27 07:20:00 UTC (rev 135825)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp 2012-11-27 07:22:35 UTC (rev 135826)
@@ -269,6 +269,8 @@
if (contentsAreVisible() == b)
return;
GraphicsLayer::setContentsVisible(b);
+ if (maskLayer())
+ maskLayer()->setContentsVisible(b);
didChangeLayerState();
}
@@ -390,6 +392,7 @@
return;
layer->setSize(size());
+ layer->setContentsVisible(contentsAreVisible());
CoordinatedGraphicsLayer* CoordinatedGraphicsLayer = toCoordinatedGraphicsLayer(layer);
CoordinatedGraphicsLayer->setMaskTarget(this);
CoordinatedGraphicsLayer->didChangeLayerState();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
