Changeset 157611 in webkit

Timestamp:

Oct 17, 2013, 4:20:07 PM (13 years ago)

Author:

timothy_horton@apple.com

Message:

PlatformCALayer constructor should take layer type as an argument
​https://bugs.webkit.org/show_bug.cgi?id=122915

Reviewed by Anders Carlsson.

No new tests, just restoring old code.

Un-do part of the patch for bug 122915; we can't early-return
in the constructor, there's still more work to do.

• platform/graphics/ca/mac/PlatformCALayerMac.mm:

(PlatformCALayerMac::PlatformCALayerMac):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/ca/mac/PlatformCALayerMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-17  Tim Horton  <timothy_horton@apple.com>
+
+        PlatformCALayer constructor should take layer type as an argument
+        https://bugs.webkit.org/show_bug.cgi?id=122915
+
+        Reviewed by Anders Carlsson.
+
+        No new tests, just restoring old code.
+
+        Un-do part of the patch for bug 122915; we can't early-return
+        in the constructor, there's still more work to do.
+
+        * platform/graphics/ca/mac/PlatformCALayerMac.mm:
+        (PlatformCALayerMac::PlatformCALayerMac):
+
 2013-10-17  Alexandru Chiculita  <achicu@adobe.com>
 

trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm

@@ -180 +180 @@
             m_layerType = LayerTypeAVPlayerLayer;
         m_layer = layer;
-        return;
+    } else {
+        Class layerClass = Nil;
+        switch (layerType) {
+        case LayerTypeLayer:
+        case LayerTypeRootLayer:
+            layerClass = [CALayer class];
+            break;
+        case LayerTypeWebLayer:
+            layerClass = [WebLayer class];
+            break;
+        case LayerTypeTransformLayer:
+            layerClass = [CATransformLayer class];
+            break;
+        case LayerTypeWebTiledLayer:
+            layerClass = [WebTiledLayer class];
+            break;
+        case LayerTypeTiledBackingLayer:
+        case LayerTypePageTiledBackingLayer:
+            layerClass = [WebTiledBackingLayer class];
+            break;
+        case LayerTypeAVPlayerLayer:
+            layerClass = getAVPlayerLayerClass();
+            break;
+        case LayerTypeCustom:
+            break;
+        }
+
+        if (layerClass)
+            m_layer = adoptNS([[layerClass alloc] init]);
     }
-
-    Class layerClass = Nil;
-    switch (layerType) {
-    case LayerTypeLayer:
-    case LayerTypeRootLayer:
-        layerClass = [CALayer class];
-        break;
-    case LayerTypeWebLayer:
-        layerClass = [WebLayer class];
-        break;
-    case LayerTypeTransformLayer:
-        layerClass = [CATransformLayer class];
-        break;
-    case LayerTypeWebTiledLayer:
-        layerClass = [WebTiledLayer class];
-        break;
-    case LayerTypeTiledBackingLayer:
-    case LayerTypePageTiledBackingLayer:
-        layerClass = [WebTiledBackingLayer class];
-        break;
-    case LayerTypeAVPlayerLayer:
-        layerClass = getAVPlayerLayerClass();
-        break;
-    case LayerTypeCustom:
-        break;
-    }
-
-    if (layerClass)
-        m_layer = adoptNS([[layerClass alloc] init]);
     
     // Save a pointer to 'this' in the CALayer