Title: [154030] trunk/Source/WebCore
Revision
154030
Author
[email protected]
Date
2013-08-13 16:37:00 -0700 (Tue, 13 Aug 2013)

Log Message

[Windows] Windows is incorrectly using a LayerTypeTiledBackingLayer
https://bugs.webkit.org/show_bug.cgi?id=119772

Reviewed by Simon Fraser.

* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::swapFromOrToTiledLayer): Ensure that we use
the correct (supported) tiled layer type for Windows.
* platform/graphics/ca/win/PlatformCALayerWin.cpp:
(PlatformCALayer::PlatformCALayer): Add an assertion to notify us if
we introduce this mistake again in the future.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (154029 => 154030)


--- trunk/Source/WebCore/ChangeLog	2013-08-13 22:51:40 UTC (rev 154029)
+++ trunk/Source/WebCore/ChangeLog	2013-08-13 23:37:00 UTC (rev 154030)
@@ -1,3 +1,17 @@
+2013-08-13  Brent Fulgham  <[email protected]>
+
+        [Windows] Windows is incorrectly using a LayerTypeTiledBackingLayer
+        https://bugs.webkit.org/show_bug.cgi?id=119772
+
+        Reviewed by Simon Fraser.
+
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::swapFromOrToTiledLayer): Ensure that we use
+        the correct (supported) tiled layer type for Windows.
+        * platform/graphics/ca/win/PlatformCALayerWin.cpp:
+        (PlatformCALayer::PlatformCALayer): Add an assertion to notify us if
+        we introduce this mistake again in the future.
+
 2013-08-13  Anders Carlsson  <[email protected]>
 
         <https://webkit.org/b/119771> Use NeverDestroyed for smart pointer slot static locals

Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (154029 => 154030)


--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp	2013-08-13 22:51:40 UTC (rev 154029)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp	2013-08-13 23:37:00 UTC (rev 154030)
@@ -2682,8 +2682,15 @@
     ASSERT(m_layer->layerType() != PlatformCALayer::LayerTypePageTiledBackingLayer);
     ASSERT(useTiledLayer != m_usingTiledBacking);
     RefPtr<PlatformCALayer> oldLayer = m_layer;
-    
-    m_layer = PlatformCALayer::create(useTiledLayer ? PlatformCALayer::LayerTypeTiledBackingLayer : PlatformCALayer::LayerTypeWebLayer, this);
+
+#if PLATFORM(WIN)
+    PlatformCALayer::LayerType layerType = useTiledLayer ? PlatformCALayer::LayerTypeWebTiledLayer : PlatformCALayer::LayerTypeWebLayer;
+#else
+    PlatformCALayer::LayerType layerType = useTiledLayer ? PlatformCALayer::LayerTypeTiledBackingLayer : PlatformCALayer::LayerTypeWebLayer;
+#endif
+
+    m_layer = PlatformCALayer::create(layerType, this);
+
     m_usingTiledBacking = useTiledLayer;
     
     m_layer->adoptSublayers(oldLayer.get());

Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp (154029 => 154030)


--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp	2013-08-13 22:51:40 UTC (rev 154029)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp	2013-08-13 23:37:00 UTC (rev 154030)
@@ -116,6 +116,7 @@
         m_layer = layer;
     } else {
         m_layerType = layerType;
+        ASSERT((layerType != LayerTypeTiledBackingLayer) && (layerType != LayerTypePageTiledBackingLayer));
         m_layer = adoptCF(CACFLayerCreate(toCACFLayerType(layerType)));
 
         // Create the PlatformCALayerWinInternal object and point to it in the userdata.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to