Diff
Modified: trunk/Source/WebCore/ChangeLog (162453 => 162454)
--- trunk/Source/WebCore/ChangeLog 2014-01-21 19:19:19 UTC (rev 162453)
+++ trunk/Source/WebCore/ChangeLog 2014-01-21 19:36:19 UTC (rev 162454)
@@ -1,5 +1,17 @@
2014-01-21 Tim Horton <timothy_hor...@apple.com>
+ Address late review naming comments after r162453.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/graphics/ca/mac/PlatformCALayerMac.mm:
+ * platform/graphics/mac/CALayerWebAdditions.h: Removed.
+ * platform/graphics/mac/CALayerWebAdditions.mm: Removed.
+ * platform/graphics/mac/WebCoreCALayerExtras.h: Added.
+ * platform/graphics/mac/WebCoreCALayerExtras.mm: Added.
+ (-[CALayer web_disableAllActions]):
+
+2014-01-21 Tim Horton <timothy_hor...@apple.com>
+
Keep CALayer implicit animation disabling code in a single place
https://bugs.webkit.org/show_bug.cgi?id=127355
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (162453 => 162454)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-21 19:19:19 UTC (rev 162453)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-21 19:36:19 UTC (rev 162454)
@@ -1063,8 +1063,8 @@
2D9A247515B9C2E300D34527 /* DOMDOMSecurityPolicyInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D9A247115B9C29500D34527 /* DOMDOMSecurityPolicyInternal.h */; };
2D9A247615B9C2F400D34527 /* DOMDOMSecurityPolicy.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 2D9A247015B9C29500D34527 /* DOMDOMSecurityPolicy.h */; };
2D9F0E1314FF1CBF00BA0FF7 /* linearSRGB.icc in Resources */ = {isa = PBXBuildFile; fileRef = 2D9F0E1214FF1CBF00BA0FF7 /* linearSRGB.icc */; };
- 2DBADE0B188E5915004D7981 /* CALayerWebAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DBADE09188E5915004D7981 /* CALayerWebAdditions.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 2DBADE0C188E5915004D7981 /* CALayerWebAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DBADE0A188E5915004D7981 /* CALayerWebAdditions.mm */; };
+ 2DBADE0B188E5915004D7981 /* WebCoreCALayerExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DBADE09188E5915004D7981 /* WebCoreCALayerExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 2DBADE0C188E5915004D7981 /* WebCoreCALayerExtras.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DBADE0A188E5915004D7981 /* WebCoreCALayerExtras.mm */; };
2DF2E9D5166E39750035BEF2 /* ConsoleAPITypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DF2E9D4166E39740035BEF2 /* ConsoleAPITypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
2E0888D41148848A00AF4265 /* JSDOMFormData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E0888D21148848A00AF4265 /* JSDOMFormData.cpp */; };
2E0888D51148848A00AF4265 /* JSDOMFormData.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E0888D31148848A00AF4265 /* JSDOMFormData.h */; };
@@ -7929,8 +7929,8 @@
2D9A247115B9C29500D34527 /* DOMDOMSecurityPolicyInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMDOMSecurityPolicyInternal.h; sourceTree = "<group>"; };
2D9A247215B9C2C700D34527 /* DOMDOMSecurityPolicy.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMDOMSecurityPolicy.mm; sourceTree = "<group>"; };
2D9F0E1214FF1CBF00BA0FF7 /* linearSRGB.icc */ = {isa = PBXFileReference; lastKnownFileType = file; path = linearSRGB.icc; sourceTree = "<group>"; };
- 2DBADE09188E5915004D7981 /* CALayerWebAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CALayerWebAdditions.h; sourceTree = "<group>"; };
- 2DBADE0A188E5915004D7981 /* CALayerWebAdditions.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CALayerWebAdditions.mm; sourceTree = "<group>"; };
+ 2DBADE09188E5915004D7981 /* WebCoreCALayerExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreCALayerExtras.h; sourceTree = "<group>"; };
+ 2DBADE0A188E5915004D7981 /* WebCoreCALayerExtras.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreCALayerExtras.mm; sourceTree = "<group>"; };
2DF2E9D4166E39740035BEF2 /* ConsoleAPITypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConsoleAPITypes.h; sourceTree = "<group>"; };
2E0888C3114883A900AF4265 /* DOMFormData.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DOMFormData.idl; sourceTree = "<group>"; };
2E0888D21148848A00AF4265 /* JSDOMFormData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMFormData.cpp; sourceTree = "<group>"; };
@@ -19872,8 +19872,8 @@
B27535490B053814002CE64F /* mac */ = {
isa = PBXGroup;
children = (
- 2DBADE09188E5915004D7981 /* CALayerWebAdditions.h */,
- 2DBADE0A188E5915004D7981 /* CALayerWebAdditions.mm */,
+ 2DBADE09188E5915004D7981 /* WebCoreCALayerExtras.h */,
+ 2DBADE0A188E5915004D7981 /* WebCoreCALayerExtras.mm */,
EDE3A4FF0C7A430600956A37 /* ColorMac.h */,
B275354A0B053814002CE64F /* ColorMac.mm */,
37C2360E1097EE7700EF9F72 /* ComplexTextController.cpp */,
@@ -24399,7 +24399,7 @@
AB4CB4EB0B8BDA3D009F40B0 /* JSHTMLSelectElementCustom.h in Headers */,
E446143C0CD689CC00FADA75 /* JSHTMLSourceElement.h in Headers */,
078E093F17D16E1C00420AA1 /* RTCDTMFSenderHandlerClient.h in Headers */,
- 2DBADE0B188E5915004D7981 /* CALayerWebAdditions.h in Headers */,
+ 2DBADE0B188E5915004D7981 /* WebCoreCALayerExtras.h in Headers */,
9752D38E1413104B003305BD /* JSHTMLSpanElement.h in Headers */,
A80E7B0E0A19D606007FB8C5 /* JSHTMLStyleElement.h in Headers */,
BCA169A30BFD55B40019CA76 /* JSHTMLTableCaptionElement.h in Headers */,
@@ -27907,7 +27907,7 @@
598365E41355F604001B185D /* JSPositionCallback.cpp in Sources */,
FE80DA710E9C472F000D6F75 /* JSPositionError.cpp in Sources */,
598365E61355F60D001B185D /* JSPositionErrorCallback.cpp in Sources */,
- 2DBADE0C188E5915004D7981 /* CALayerWebAdditions.mm in Sources */,
+ 2DBADE0C188E5915004D7981 /* WebCoreCALayerExtras.mm in Sources */,
65DF31FF09D1CC60000BE325 /* JSProcessingInstruction.cpp in Sources */,
E44613ED0CD681BA00FADA75 /* JSProgressEvent.cpp in Sources */,
B658FFA11522EF3A00DD5595 /* JSRadioNodeList.cpp in Sources */,
Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm (162453 => 162454)
--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2014-01-21 19:19:19 UTC (rev 162453)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2014-01-21 19:36:19 UTC (rev 162454)
@@ -31,7 +31,6 @@
#import "AnimationUtilities.h"
#import "BlockExceptions.h"
-#import "CALayerWebAdditions.h"
#import "GraphicsContext.h"
#import "GraphicsLayerCA.h"
#import "LengthFunctions.h"
@@ -41,6 +40,7 @@
#import "SoftLinking.h"
#import "TiledBacking.h"
#import "TileController.h"
+#import "WebCoreCALayerExtras.h"
#import "WebLayer.h"
#import "WebTiledBackingLayer.h"
#import <objc/objc-auto.h>
Deleted: trunk/Source/WebCore/platform/graphics/mac/CALayerWebAdditions.h (162453 => 162454)
--- trunk/Source/WebCore/platform/graphics/mac/CALayerWebAdditions.h 2014-01-21 19:19:19 UTC (rev 162453)
+++ trunk/Source/WebCore/platform/graphics/mac/CALayerWebAdditions.h 2014-01-21 19:36:19 UTC (rev 162454)
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef CALayerWebAdditions_h
-#define CALayerWebAdditions_h
-
-#import <QuartzCore/QuartzCore.h>
-
-@interface CALayer (WebAdditions)
-
-- (void)web_disableAllActions;
-
-@end
-
-#endif // CALayerWebAdditions_h
Deleted: trunk/Source/WebCore/platform/graphics/mac/CALayerWebAdditions.mm (162453 => 162454)
--- trunk/Source/WebCore/platform/graphics/mac/CALayerWebAdditions.mm 2014-01-21 19:19:19 UTC (rev 162453)
+++ trunk/Source/WebCore/platform/graphics/mac/CALayerWebAdditions.mm 2014-01-21 19:36:19 UTC (rev 162454)
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#import "CALayerWebAdditions.h"
-
-@implementation CALayer (WebAdditions)
-
-- (void)web_disableAllActions
-{
- NSNull *nullValue = [NSNull null];
- self.style = @{
- @"actions" : @{
- @"anchorPoint" : nullValue,
- @"anchorPointZ" : nullValue,
- @"backgroundColor" : nullValue,
- @"borderColor" : nullValue,
- @"borderWidth" : nullValue,
- @"bounds" : nullValue,
- @"contents" : nullValue,
- @"contentsRect" : nullValue,
- @"contentsScale" : nullValue,
- @"cornerRadius" : nullValue,
- @"opacity" : nullValue,
- @"position" : nullValue,
- @"shadowColor" : nullValue,
- @"sublayerTransform" : nullValue,
- @"sublayers" : nullValue,
- @"transform" : nullValue,
- @"zPosition" : nullValue
- }
- };
-}
-
-@end
Added: trunk/Source/WebCore/platform/graphics/mac/WebCoreCALayerExtras.h (0 => 162454)
--- trunk/Source/WebCore/platform/graphics/mac/WebCoreCALayerExtras.h (rev 0)
+++ trunk/Source/WebCore/platform/graphics/mac/WebCoreCALayerExtras.h 2014-01-21 19:36:19 UTC (rev 162454)
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebCoreCALayerExtras_h
+#define WebCoreCALayerExtras_h
+
+#import <QuartzCore/QuartzCore.h>
+
+@interface CALayer (WebCoreCALayerExtras)
+
+- (void)web_disableAllActions;
+
+@end
+
+#endif // WebCoreCALayerExtras_h
Added: trunk/Source/WebCore/platform/graphics/mac/WebCoreCALayerExtras.mm (0 => 162454)
--- trunk/Source/WebCore/platform/graphics/mac/WebCoreCALayerExtras.mm (rev 0)
+++ trunk/Source/WebCore/platform/graphics/mac/WebCoreCALayerExtras.mm 2014-01-21 19:36:19 UTC (rev 162454)
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#import "WebCoreCALayerExtras.h"
+
+@implementation CALayer (WebCoreCALayerExtras)
+
+- (void)web_disableAllActions
+{
+ NSNull *nullValue = [NSNull null];
+ self.style = @{
+ @"actions" : @{
+ @"anchorPoint" : nullValue,
+ @"anchorPointZ" : nullValue,
+ @"backgroundColor" : nullValue,
+ @"borderColor" : nullValue,
+ @"borderWidth" : nullValue,
+ @"bounds" : nullValue,
+ @"contents" : nullValue,
+ @"contentsRect" : nullValue,
+ @"contentsScale" : nullValue,
+ @"cornerRadius" : nullValue,
+ @"opacity" : nullValue,
+ @"position" : nullValue,
+ @"shadowColor" : nullValue,
+ @"sublayerTransform" : nullValue,
+ @"sublayers" : nullValue,
+ @"transform" : nullValue,
+ @"zPosition" : nullValue
+ }
+ };
+}
+
+@end
Modified: trunk/Source/WebKit2/ChangeLog (162453 => 162454)
--- trunk/Source/WebKit2/ChangeLog 2014-01-21 19:19:19 UTC (rev 162453)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-21 19:36:19 UTC (rev 162454)
@@ -1,5 +1,15 @@
2014-01-21 Tim Horton <timothy_hor...@apple.com>
+ Address late review naming comments after r162453.
+
+ * UIProcess/API/mac/WKView.mm:
+ And, fix the build by adding an include I accidentally missed.
+
+ * UIProcess/mac/RemoteLayerTreeHost.mm:
+ * WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.mm:
+
+2014-01-21 Tim Horton <timothy_hor...@apple.com>
+
Keep CALayer implicit animation disabling code in a single place
https://bugs.webkit.org/show_bug.cgi?id=127355
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (162453 => 162454)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-01-21 19:19:19 UTC (rev 162453)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-01-21 19:36:19 UTC (rev 162454)
@@ -83,6 +83,7 @@
#import <WebCore/Region.h>
#import <WebCore/SharedBuffer.h>
#import <WebCore/TextAlternativeWithRange.h>
+#import <WebCore/WebCoreCALayerExtras.h>
#import <WebCore/WebCoreFullScreenPlaceholderView.h>
#import <WebCore/WebCoreFullScreenWindow.h>
#import <WebCore/WebCoreNSStringExtras.h>
Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm (162453 => 162454)
--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm 2014-01-21 19:19:19 UTC (rev 162453)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm 2014-01-21 19:36:19 UTC (rev 162454)
@@ -32,7 +32,7 @@
#import "ShareableBitmap.h"
#import "WebPageProxy.h"
#import "WebProcessProxy.h"
-#import <WebCore/CALayerWebAdditions.h>
+#import <WebCore/WebCoreCALayerExtras.h>
#import <WebCore/PlatformLayer.h>
#import <WebKitSystemInterface.h>
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.mm (162453 => 162454)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.mm 2014-01-21 19:19:19 UTC (rev 162453)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.mm 2014-01-21 19:36:19 UTC (rev 162454)
@@ -33,7 +33,7 @@
#import "RemoteLayerTreeContext.h"
#import "RemoteLayerTreePropertyApplier.h"
#import "WebProcess.h"
-#import <WebCore/CALayerWebAdditions.h>
+#import <WebCore/WebCoreCALayerExtras.h>
#import <WebCore/GraphicsLayerCA.h>
#import <WebCore/PlatformCALayerMac.h>
#import <WebCore/SoftLinking.h>
