Commit fdfc3bb9 authored by timothy_horton@apple.com's avatar timothy_horton@apple.com
Browse files

Keep CALayer implicit animation disabling code in a single place

https://bugs.webkit.org/show_bug.cgi?id=127355

Reviewed by Simon Fraser.

* WebCore.xcodeproj/project.pbxproj:
Add CALayerWebAdditions.{h,mm}.

* platform/graphics/ca/mac/PlatformCALayerMac.mm:
(PlatformCALayerMac::commonInit):
Remove nullActionsDictionary() and use [CALayer(WebAdditions) web_disableAllActions] instead.

* platform/graphics/mac/CALayerWebAdditions.h: Added.
* platform/graphics/mac/CALayerWebAdditions.mm: Added.
(-[CALayer web_disableAllActions]):
Added. Disable all implicit actions on the layer.

* Shared/mac/RemoteLayerTreePropertyApplier.h:
* Shared/mac/RemoteLayerTreePropertyApplier.mm:
Remove disableActionsForLayer.

* UIProcess/API/mac/WKView.mm:
(-[WKView _rootLayer]):
Disable actions on the root layer. It doesn't need them, and currently
isn't affected by implicit animations, but future patches which animate
the root layer will benefit from this.

* UIProcess/mac/RemoteLayerTreeHost.mm:
(WebKit::RemoteLayerTreeHost::createLayer):
Use web_disableAllActions instead of disableActionsForLayer.

* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.mm: Renamed from Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.cpp.
(PlatformCALayerRemoteCustom::PlatformCALayerRemoteCustom):
(PlatformCALayerRemoteCustom::~PlatformCALayerRemoteCustom):
(PlatformCALayerRemoteCustom::hostingContextID):
Use web_disableAllActions instead of disableActionsForLayer.
This requires making this file Obj-C++ but that's OK since it's Mac/iOS only.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@162453 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 3ffc4f37
2014-01-21 Tim Horton <timothy_horton@apple.com>
Keep CALayer implicit animation disabling code in a single place
https://bugs.webkit.org/show_bug.cgi?id=127355
Reviewed by Simon Fraser.
* WebCore.xcodeproj/project.pbxproj:
Add CALayerWebAdditions.{h,mm}.
* platform/graphics/ca/mac/PlatformCALayerMac.mm:
(PlatformCALayerMac::commonInit):
Remove nullActionsDictionary() and use [CALayer(WebAdditions) web_disableAllActions] instead.
* platform/graphics/mac/CALayerWebAdditions.h: Added.
* platform/graphics/mac/CALayerWebAdditions.mm: Added.
(-[CALayer web_disableAllActions]):
Added. Disable all implicit actions on the layer.
2014-01-21 Gavin Barraclough <barraclough@apple.com>
 
Change Page, FocusController to use ViewState
......@@ -1063,6 +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 */; };
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 */; };
......@@ -7927,6 +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>"; };
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>"; };
......@@ -19868,6 +19872,8 @@
B27535490B053814002CE64F /* mac */ = {
isa = PBXGroup;
children = (
2DBADE09188E5915004D7981 /* CALayerWebAdditions.h */,
2DBADE0A188E5915004D7981 /* CALayerWebAdditions.mm */,
EDE3A4FF0C7A430600956A37 /* ColorMac.h */,
B275354A0B053814002CE64F /* ColorMac.mm */,
37C2360E1097EE7700EF9F72 /* ComplexTextController.cpp */,
......@@ -24393,6 +24399,7 @@
AB4CB4EB0B8BDA3D009F40B0 /* JSHTMLSelectElementCustom.h in Headers */,
E446143C0CD689CC00FADA75 /* JSHTMLSourceElement.h in Headers */,
078E093F17D16E1C00420AA1 /* RTCDTMFSenderHandlerClient.h in Headers */,
2DBADE0B188E5915004D7981 /* CALayerWebAdditions.h in Headers */,
9752D38E1413104B003305BD /* JSHTMLSpanElement.h in Headers */,
A80E7B0E0A19D606007FB8C5 /* JSHTMLStyleElement.h in Headers */,
BCA169A30BFD55B40019CA76 /* JSHTMLTableCaptionElement.h in Headers */,
......@@ -27900,6 +27907,7 @@
598365E41355F604001B185D /* JSPositionCallback.cpp in Sources */,
FE80DA710E9C472F000D6F75 /* JSPositionError.cpp in Sources */,
598365E61355F60D001B185D /* JSPositionErrorCallback.cpp in Sources */,
2DBADE0C188E5915004D7981 /* CALayerWebAdditions.mm in Sources */,
65DF31FF09D1CC60000BE325 /* JSProcessingInstruction.cpp in Sources */,
E44613ED0CD681BA00FADA75 /* JSProgressEvent.cpp in Sources */,
B658FFA11522EF3A00DD5595 /* JSRadioNodeList.cpp in Sources */,
......@@ -31,6 +31,7 @@
#import "AnimationUtilities.h"
#import "BlockExceptions.h"
#import "CALayerWebAdditions.h"
#import "GraphicsContext.h"
#import "GraphicsLayerCA.h"
#import "LengthFunctions.h"
......@@ -153,31 +154,6 @@ void PlatformCALayerMac::setOwner(PlatformCALayerClient* owner)
[static_cast<WebAnimationDelegate*>(m_delegate.get()) setOwner:this];
}
static NSDictionary *nullActionsDictionary()
{
NSNull *nullValue = [NSNull null];
NSDictionary *actions = [NSDictionary dictionaryWithObjectsAndKeys:
nullValue, @"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",
nil];
return actions;
}
static NSString *toCAFilterType(PlatformCALayer::FilterType type)
{
switch (type) {
......@@ -243,7 +219,7 @@ void PlatformCALayerMac::commonInit()
[m_layer.get() setValue:[NSValue valueWithPointer:this] forKey:platformCALayerPointer];
// Clear all the implicit animations on the CALayer
[m_layer.get() setStyle:[NSDictionary dictionaryWithObject:nullActionsDictionary() forKey:@"actions"]];
[m_layer web_disableAllActions];
// So that the scrolling thread's performance logging code can find all the tiles, mark this as being a tile.
if (m_layerType == LayerTypeTiledBackingTileLayer)
......
/*
* 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
/*
* 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
2014-01-21 Tim Horton <timothy_horton@apple.com>
Keep CALayer implicit animation disabling code in a single place
https://bugs.webkit.org/show_bug.cgi?id=127355
Reviewed by Simon Fraser.
* Shared/mac/RemoteLayerTreePropertyApplier.h:
* Shared/mac/RemoteLayerTreePropertyApplier.mm:
Remove disableActionsForLayer.
* UIProcess/API/mac/WKView.mm:
(-[WKView _rootLayer]):
Disable actions on the root layer. It doesn't need them, and currently
isn't affected by implicit animations, but future patches which animate
the root layer will benefit from this.
* UIProcess/mac/RemoteLayerTreeHost.mm:
(WebKit::RemoteLayerTreeHost::createLayer):
Use web_disableAllActions instead of disableActionsForLayer.
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.mm: Renamed from Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.cpp.
(PlatformCALayerRemoteCustom::PlatformCALayerRemoteCustom):
(PlatformCALayerRemoteCustom::~PlatformCALayerRemoteCustom):
(PlatformCALayerRemoteCustom::hostingContextID):
Use web_disableAllActions instead of disableActionsForLayer.
This requires making this file Obj-C++ but that's OK since it's Mac/iOS only.
2014-01-21 Gavin Barraclough <barraclough@apple.com>
 
Change Page, FocusController to use ViewState
......
......@@ -35,7 +35,6 @@ class RemoteLayerTreePropertyApplier {
public:
typedef HashMap<WebCore::GraphicsLayer::PlatformLayerID, CALayer *> RelatedLayerMap;
static void applyPropertiesToLayer(CALayer *, RemoteLayerTreeTransaction::LayerProperties, RelatedLayerMap);
static void disableActionsForLayer(CALayer *);
};
} // namespace WebKit
......
......@@ -187,30 +187,4 @@ void RemoteLayerTreePropertyApplier::applyPropertiesToLayer(CALayer *layer, Remo
updateCustomAppearance(layer, properties.customAppearance);
}
void RemoteLayerTreePropertyApplier::disableActionsForLayer(CALayer *layer)
{
NSNull *nullValue = [NSNull null];
layer.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
}
};
}
} // namespace WebKit
......@@ -2476,13 +2476,14 @@ static NSString * const backingPropertyOldScaleFactorKey = @"NSBackingPropertyOl
if (!_data->_layerHostingView) {
// Create an NSView that will host our layer tree.
_data->_layerHostingView = adoptNS([[WKFlippedView alloc] initWithFrame:[self bounds]]);
[_data->_layerHostingView.get() setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
[_data->_layerHostingView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
[self addSubview:_data->_layerHostingView.get() positioned:NSWindowBelow relativeTo:nil];
// Create a root layer that will back the NSView.
RetainPtr<CALayer> layer = adoptNS([[CALayer alloc] init]);
[layer web_disableAllActions];
#ifndef NDEBUG
[layer setName:@"Hosting root layer"];
#endif
......
......@@ -32,6 +32,7 @@
#import "ShareableBitmap.h"
#import "WebPageProxy.h"
#import "WebProcessProxy.h"
#import <WebCore/CALayerWebAdditions.h>
#import <WebCore/PlatformLayer.h>
#import <WebKitSystemInterface.h>
......@@ -121,7 +122,7 @@ CALayer *RemoteLayerTreeHost::createLayer(RemoteLayerTreeTransaction::LayerCreat
ASSERT_NOT_REACHED();
}
RemoteLayerTreePropertyApplier::disableActionsForLayer(layer.get());
[layer web_disableAllActions];
return layer.get();
}
......
......@@ -407,7 +407,7 @@
2D819BA11862800E001F03D1 /* ViewGestureGeometryCollectorMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D819B9F1862800E001F03D1 /* ViewGestureGeometryCollectorMessageReceiver.cpp */; };
2D819BA21862800E001F03D1 /* ViewGestureGeometryCollectorMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D819BA01862800E001F03D1 /* ViewGestureGeometryCollectorMessages.h */; };
2D870D1016234FFE000A3F20 /* PDFPlugin.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D870D0E1622B7F9000A3F20 /* PDFPlugin.mm */; };
2D8710161828415D0018FA01 /* PlatformCALayerRemoteCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8710141828415D0018FA01 /* PlatformCALayerRemoteCustom.cpp */; };
2D8710161828415D0018FA01 /* PlatformCALayerRemoteCustom.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D8710141828415D0018FA01 /* PlatformCALayerRemoteCustom.mm */; };
2D8710171828415D0018FA01 /* PlatformCALayerRemoteCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D8710151828415D0018FA01 /* PlatformCALayerRemoteCustom.h */; };
2D8949F0182044F600E898AA /* PlatformCALayerRemoteTiledBacking.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8949EE182044F600E898AA /* PlatformCALayerRemoteTiledBacking.cpp */; };
2D8949F1182044F600E898AA /* PlatformCALayerRemoteTiledBacking.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D8949EF182044F600E898AA /* PlatformCALayerRemoteTiledBacking.h */; };
......@@ -2053,7 +2053,7 @@
2D819BA01862800E001F03D1 /* ViewGestureGeometryCollectorMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewGestureGeometryCollectorMessages.h; sourceTree = "<group>"; };
2D870D0D1622B7F9000A3F20 /* PDFPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PDFPlugin.h; path = PDF/PDFPlugin.h; sourceTree = "<group>"; };
2D870D0E1622B7F9000A3F20 /* PDFPlugin.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PDFPlugin.mm; path = PDF/PDFPlugin.mm; sourceTree = "<group>"; };
2D8710141828415D0018FA01 /* PlatformCALayerRemoteCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformCALayerRemoteCustom.cpp; sourceTree = "<group>"; };
2D8710141828415D0018FA01 /* PlatformCALayerRemoteCustom.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformCALayerRemoteCustom.mm; sourceTree = "<group>"; };
2D8710151828415D0018FA01 /* PlatformCALayerRemoteCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformCALayerRemoteCustom.h; sourceTree = "<group>"; };
2D8949EE182044F600E898AA /* PlatformCALayerRemoteTiledBacking.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformCALayerRemoteTiledBacking.cpp; sourceTree = "<group>"; };
2D8949EF182044F600E898AA /* PlatformCALayerRemoteTiledBacking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformCALayerRemoteTiledBacking.h; sourceTree = "<group>"; };
......@@ -5518,7 +5518,7 @@
2DA049B6180CCD0A00AAFA9E /* GraphicsLayerCARemote.h */,
2DA049B1180CCCD300AAFA9E /* PlatformCALayerRemote.cpp */,
2DA049B2180CCCD300AAFA9E /* PlatformCALayerRemote.h */,
2D8710141828415D0018FA01 /* PlatformCALayerRemoteCustom.cpp */,
2D8710141828415D0018FA01 /* PlatformCALayerRemoteCustom.mm */,
2D8710151828415D0018FA01 /* PlatformCALayerRemoteCustom.h */,
2D8949EE182044F600E898AA /* PlatformCALayerRemoteTiledBacking.cpp */,
2D8949EF182044F600E898AA /* PlatformCALayerRemoteTiledBacking.h */,
......@@ -7935,7 +7935,7 @@
F036978515F4BE6B00C3A80E /* WKColorPickerResultListener.cpp in Sources */,
BCA284D61492F2C7001F9042 /* WKConnection.mm in Sources */,
BC4A6296147313A0006C681A /* WKConnectionRef.cpp in Sources */,
2D8710161828415D0018FA01 /* PlatformCALayerRemoteCustom.cpp in Sources */,
2D8710161828415D0018FA01 /* PlatformCALayerRemoteCustom.mm in Sources */,
BCB9E24C1120E15C00A137E0 /* WKContext.cpp in Sources */,
51A555F5128C6C47009ABCEC /* WKContextMenuItem.cpp in Sources */,
9FB5F394169E6A80002C25BF /* WKContextPrivateMac.mm in Sources */,
......
......@@ -33,6 +33,7 @@
#import "RemoteLayerTreeContext.h"
#import "RemoteLayerTreePropertyApplier.h"
#import "WebProcess.h"
#import <WebCore/CALayerWebAdditions.h>
#import <WebCore/GraphicsLayerCA.h>
#import <WebCore/PlatformCALayerMac.h>
#import <WebCore/SoftLinking.h>
......@@ -58,7 +59,7 @@ PlatformCALayerRemoteCustom::PlatformCALayerRemoteCustom(PlatformLayer* customLa
m_layerHostingContext->setRootLayer(customLayer);
m_platformLayer = customLayer;
RemoteLayerTreePropertyApplier::disableActionsForLayer(customLayer);
[customLayer web_disableAllActions];
}
PlatformCALayerRemoteCustom::~PlatformCALayerRemoteCustom()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment