Title: [154063] branches/safari-537-branch/Source/WebCore

Diff

Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (154062 => 154063)


--- branches/safari-537-branch/Source/WebCore/ChangeLog	2013-08-14 18:51:19 UTC (rev 154062)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog	2013-08-14 18:52:34 UTC (rev 154063)
@@ -1,3 +1,21 @@
+2013-08-14  Lucas Forschler  <[email protected]>
+
+        Merge r154030
+
+    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-12  Lucas Forschler  <[email protected]>
 
         Merge r153917

Modified: branches/safari-537-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (154062 => 154063)


--- branches/safari-537-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp	2013-08-14 18:51:19 UTC (rev 154062)
+++ branches/safari-537-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp	2013-08-14 18:52:34 UTC (rev 154063)
@@ -2684,8 +2684,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: branches/safari-537-branch/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp (154062 => 154063)


--- branches/safari-537-branch/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp	2013-08-14 18:51:19 UTC (rev 154062)
+++ branches/safari-537-branch/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp	2013-08-14 18:52:34 UTC (rev 154063)
@@ -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