Title: [157611] trunk/Source/WebCore
- Revision
- 157611
- Author
- timothy_hor...@apple.com
- Date
- 2013-10-17 16:20:07 -0700 (Thu, 17 Oct 2013)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (157610 => 157611)
--- trunk/Source/WebCore/ChangeLog 2013-10-17 23:08:46 UTC (rev 157610)
+++ trunk/Source/WebCore/ChangeLog 2013-10-17 23:20:07 UTC (rev 157611)
@@ -1,3 +1,18 @@
+2013-10-17 Tim Horton <timothy_hor...@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 <ach...@adobe.com>
Web Inspector: [CSS Regions] Crash when highlighting a node of a flow with no regions
Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm (157610 => 157611)
--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2013-10-17 23:08:46 UTC (rev 157610)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2013-10-17 23:20:07 UTC (rev 157611)
@@ -179,37 +179,36 @@
if ([layer isKindOfClass:getAVPlayerLayerClass()])
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;
+ }
- 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]);
}
-
- if (layerClass)
- m_layer = adoptNS([[layerClass alloc] init]);
// Save a pointer to 'this' in the CALayer
[m_layer.get() setValue:[NSValue valueWithPointer:this] forKey:platformCALayerPointer];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
