Title: [135822] trunk/Source
Revision
135822
Author
[email protected]
Date
2012-11-26 22:58:16 -0800 (Mon, 26 Nov 2012)

Log Message

Unreviewed, rolling out r135818.
http://trac.webkit.org/changeset/135818
https://bugs.webkit.org/show_bug.cgi?id=103368

platform/chromium/virtual/threaded/compositing/visibility
/visibility-simple-webgl-layer.html crash on Mountain Lion
(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 (135821 => 135822)


--- trunk/Source/WebCore/ChangeLog	2012-11-27 06:45:48 UTC (rev 135821)
+++ trunk/Source/WebCore/ChangeLog	2012-11-27 06:58:16 UTC (rev 135822)
@@ -1,3 +1,17 @@
+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
+
+        platform/chromium/virtual/threaded/compositing/visibility
+        /visibility-simple-webgl-layer.html crash on Mountain Lion
+        (Requested by apavlov on #webkit).
+
+        * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+        (WebCore::GraphicsLayerTextureMapper::setMaskLayer):
+        (WebCore::GraphicsLayerTextureMapper::setContentsVisible):
+
 2012-11-26  Huang Dongsung  <[email protected]>
 
         Coordinated Graphics: Set visibility to a mask layer in GraphicsLayer::setContentsVisible().

Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (135821 => 135822)


--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp	2012-11-27 06:45:48 UTC (rev 135821)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp	2012-11-27 06:58:16 UTC (rev 135822)
@@ -195,7 +195,6 @@
     if (!value)
         return;
     value->setSize(size());
-    value->setContentsVisible(contentsAreVisible());
 }
 
 
@@ -301,8 +300,6 @@
         return;
     notifyChange(TextureMapperLayer::ContentsVisibleChange);
     GraphicsLayer::setContentsVisible(value);
-    if (maskLayer())
-        maskLayer()->setContentsVisible(value);
 }
 
 /* \reimp (GraphicsLayer.h)

Modified: trunk/Source/WebKit2/ChangeLog (135821 => 135822)


--- trunk/Source/WebKit2/ChangeLog	2012-11-27 06:45:48 UTC (rev 135821)
+++ trunk/Source/WebKit2/ChangeLog	2012-11-27 06:58:16 UTC (rev 135822)
@@ -1,3 +1,17 @@
+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
+
+        platform/chromium/virtual/threaded/compositing/visibility
+        /visibility-simple-webgl-layer.html crash on Mountain Lion
+        (Requested by apavlov on #webkit).
+
+        * WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp:
+        (WebCore::CoordinatedGraphicsLayer::setContentsVisible):
+        (WebCore::CoordinatedGraphicsLayer::setMaskLayer):
+
 2012-11-26  Dan Bernstein  <[email protected]>
 
         <rdar://problem/11931191> Entering Tab View after a bunch of YouTube pages were opened in background tabs makes all of them start playing simultaneously

Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp (135821 => 135822)


--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp	2012-11-27 06:45:48 UTC (rev 135821)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp	2012-11-27 06:58:16 UTC (rev 135822)
@@ -269,8 +269,6 @@
     if (contentsAreVisible() == b)
         return;
     GraphicsLayer::setContentsVisible(b);
-    if (maskLayer())
-        maskLayer()->setContentsVisible(b);
 
     didChangeLayerState();
 }
@@ -392,7 +390,6 @@
         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

Reply via email to