Diff
Modified: trunk/Source/WebKit/ChangeLog (256331 => 256332)
--- trunk/Source/WebKit/ChangeLog 2020-02-11 19:34:33 UTC (rev 256331)
+++ trunk/Source/WebKit/ChangeLog 2020-02-11 19:40:03 UTC (rev 256332)
@@ -1,3 +1,36 @@
+2020-02-11 Alex Christensen <[email protected]>
+
+ Deprecate _WKUserContentWorld replaced by WKContentWorld
+ https://bugs.webkit.org/show_bug.cgi?id=207514
+
+ Reviewed by Brady Eidson.
+
+ I also add SPI to convert between the two to aid a smooth transition.
+
+ * Shared/Cocoa/APIObject.mm:
+ (API::Object::newObject):
+ * UIProcess/API/APIContentWorld.cpp:
+ (API::ContentWorld::fromUserContentWorld):
+ (API::ContentWorld::ContentWorld):
+ * UIProcess/API/APIContentWorld.h:
+ (API::ContentWorldBase::ContentWorldBase):
+ * UIProcess/API/APIUserContentWorld.cpp:
+ (API::UserContentWorld::fromContentWorld):
+ (API::UserContentWorld::UserContentWorld):
+ * UIProcess/API/APIUserContentWorld.h:
+ * UIProcess/API/Cocoa/WKContentWorld.mm:
+ (-[WKContentWorld _userContentWorld]):
+ * UIProcess/API/Cocoa/WKContentWorldInternal.h:
+ * UIProcess/API/Cocoa/WKContentWorldPrivate.h: Added.
+ * UIProcess/API/Cocoa/WKUserContentController.mm:
+ * UIProcess/API/Cocoa/WKUserScript.mm:
+ * UIProcess/API/Cocoa/_WKUserContentWorld.h:
+ * UIProcess/API/Cocoa/_WKUserContentWorld.mm:
+ * UIProcess/API/Cocoa/_WKUserContentWorldInternal.h:
+ * UIProcess/API/Cocoa/_WKUserStyleSheet.h:
+ * UIProcess/API/Cocoa/_WKUserStyleSheet.mm:
+ * WebKit.xcodeproj/project.pbxproj:
+
2020-02-11 Youenn Fablet <[email protected]>
REGRESSION (r256009): [ Mojave wk2 Debug ] ASSERTION FAILED: Completion handler should always be called under WebKit::WebMDNSRegister::PendingRegistration
Modified: trunk/Source/WebKit/Shared/Cocoa/APIObject.mm (256331 => 256332)
--- trunk/Source/WebKit/Shared/Cocoa/APIObject.mm 2020-02-11 19:34:33 UTC (rev 256331)
+++ trunk/Source/WebKit/Shared/Cocoa/APIObject.mm 2020-02-11 19:40:03 UTC (rev 256332)
@@ -352,7 +352,9 @@
break;
case Type::UserContentWorld:
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
wrapper = [_WKUserContentWorld alloc];
+ ALLOW_DEPRECATED_DECLARATIONS_END
break;
case Type::UserInitiatedAction:
Modified: trunk/Source/WebKit/UIProcess/API/APIContentWorld.cpp (256331 => 256332)
--- trunk/Source/WebKit/UIProcess/API/APIContentWorld.cpp 2020-02-11 19:34:33 UTC (rev 256331)
+++ trunk/Source/WebKit/UIProcess/API/APIContentWorld.cpp 2020-02-11 19:40:03 UTC (rev 256332)
@@ -76,6 +76,11 @@
return *world.get();
}
+Ref<ContentWorld> ContentWorld::fromUserContentWorld(const UserContentWorld& userContentWorld)
+{
+ return adoptRef(*new ContentWorld(userContentWorld));
+}
+
ContentWorld::ContentWorld(const WTF::String& name)
: ContentWorldBase(name)
{
@@ -86,6 +91,11 @@
{
}
+ContentWorld::ContentWorld(const UserContentWorld& userContentWorld)
+ : ContentWorldBase(userContentWorld.identifier(), userContentWorld.name())
+{
+}
+
ContentWorld::~ContentWorld()
{
if (name().isNull())
Modified: trunk/Source/WebKit/UIProcess/API/APIContentWorld.h (256331 => 256332)
--- trunk/Source/WebKit/UIProcess/API/APIContentWorld.h 2020-02-11 19:34:33 UTC (rev 256331)
+++ trunk/Source/WebKit/UIProcess/API/APIContentWorld.h 2020-02-11 19:40:03 UTC (rev 256332)
@@ -31,6 +31,8 @@
namespace API {
+class UserContentWorld;
+
class ContentWorldBase {
public:
virtual ~ContentWorldBase() = default;
@@ -45,10 +47,10 @@
protected:
ContentWorldBase(const WTF::String& name);
ContentWorldBase(WebKit::ContentWorldIdentifier identifier)
+ : m_identifier(identifier) { }
+ ContentWorldBase(WebKit::ContentWorldIdentifier identifier, const WTF::String& name)
: m_identifier(identifier)
- {
- }
-
+ , m_name(name) { }
private:
WebKit::ContentWorldIdentifier m_identifier;
WTF::String m_name;
@@ -59,6 +61,7 @@
static Ref<ContentWorld> sharedWorldWithName(const WTF::String&);
static ContentWorld& pageContentWorld();
static ContentWorld& defaultClientWorld();
+ static Ref<ContentWorld> fromUserContentWorld(const UserContentWorld&);
virtual ~ContentWorld();
@@ -68,6 +71,7 @@
private:
explicit ContentWorld(const WTF::String&);
explicit ContentWorld(WebKit::ContentWorldIdentifier);
+ explicit ContentWorld(const UserContentWorld&);
};
} // namespace API
Modified: trunk/Source/WebKit/UIProcess/API/APIUserContentWorld.cpp (256331 => 256332)
--- trunk/Source/WebKit/UIProcess/API/APIUserContentWorld.cpp 2020-02-11 19:34:33 UTC (rev 256331)
+++ trunk/Source/WebKit/UIProcess/API/APIUserContentWorld.cpp 2020-02-11 19:40:03 UTC (rev 256332)
@@ -35,6 +35,11 @@
return adoptRef(*new UserContentWorld(name));
}
+Ref<UserContentWorld> UserContentWorld::fromContentWorld(const ContentWorld& contentWorld)
+{
+ return adoptRef(*new UserContentWorld(contentWorld));
+}
+
UserContentWorld& UserContentWorld::normalWorld()
{
static UserContentWorld* world = new UserContentWorld(ForNormalWorldOnly::NormalWorld);
@@ -51,6 +56,11 @@
{
}
+UserContentWorld::UserContentWorld(const ContentWorld& contentWorld)
+ : ContentWorldBase(contentWorld.identifier(), contentWorld.name())
+{
+}
+
UserContentWorld::~UserContentWorld()
{
}
Modified: trunk/Source/WebKit/UIProcess/API/APIUserContentWorld.h (256331 => 256332)
--- trunk/Source/WebKit/UIProcess/API/APIUserContentWorld.h 2020-02-11 19:34:33 UTC (rev 256331)
+++ trunk/Source/WebKit/UIProcess/API/APIUserContentWorld.h 2020-02-11 19:40:03 UTC (rev 256332)
@@ -34,6 +34,7 @@
public:
static Ref<UserContentWorld> worldWithName(const WTF::String&);
static UserContentWorld& normalWorld();
+ static Ref<UserContentWorld> fromContentWorld(const ContentWorld&);
virtual ~UserContentWorld();
@@ -42,6 +43,7 @@
private:
explicit UserContentWorld(const WTF::String&);
+ explicit UserContentWorld(const ContentWorld&);
enum class ForNormalWorldOnly { NormalWorld };
explicit UserContentWorld(ForNormalWorldOnly);
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKContentWorld.mm (256331 => 256332)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKContentWorld.mm 2020-02-11 19:34:33 UTC (rev 256331)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKContentWorld.mm 2020-02-11 19:40:03 UTC (rev 256332)
@@ -26,6 +26,8 @@
#import "config.h"
#import "WKContentWorldInternal.h"
+#import "_WKUserContentWorldInternal.h"
+
@implementation WKContentWorld
+ (WKContentWorld *)pageWorld
@@ -66,3 +68,14 @@
}
@end
+
+@implementation WKContentWorld (WKPrivate)
+
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
+- (_WKUserContentWorld *)_userContentWorld
+{
+ return wrapper(API::UserContentWorld::fromContentWorld(*_contentWorld));
+}
+ALLOW_DEPRECATED_DECLARATIONS_END
+
+@end
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKContentWorldInternal.h (256331 => 256332)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKContentWorldInternal.h 2020-02-11 19:34:33 UTC (rev 256331)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKContentWorldInternal.h 2020-02-11 19:40:03 UTC (rev 256332)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "WKContentWorld.h"
+#import "WKContentWorldPrivate.h"
#import "APIContentWorld.h"
#import "WKObject.h"
Added: trunk/Source/WebKit/UIProcess/API/Cocoa/WKContentWorldPrivate.h (0 => 256332)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKContentWorldPrivate.h (rev 0)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKContentWorldPrivate.h 2020-02-11 19:40:03 UTC (rev 256332)
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2019 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. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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.
+ */
+
+#import <WebKit/WKContentWorld.h>
+
+@class _WKUserContentWorld;
+
+@interface WKContentWorld (WKPrivate)
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+@property (nonatomic, copy, readonly) _WKUserContentWorld *_userContentWorld;
+#pragma clang diagnostic pop
+
+@end
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKUserContentController.mm (256331 => 256332)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKUserContentController.mm 2020-02-11 19:34:33 UTC (rev 256331)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKUserContentController.mm 2020-02-11 19:40:03 UTC (rev 256332)
@@ -172,10 +172,12 @@
_userContentControllerProxy->removeUserScript(*userScript->_userScript);
}
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
- (void)_removeAllUserScriptsAssociatedWithUserContentWorld:(_WKUserContentWorld *)userContentWorld
{
_userContentControllerProxy->removeAllUserScripts(*userContentWorld->_userContentWorld);
}
+ALLOW_DEPRECATED_DECLARATIONS_END
- (void)_addUserScriptImmediately:(WKUserScript *)userScript
{
@@ -223,6 +225,7 @@
_userContentControllerProxy->removeAllUserStyleSheets();
}
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
- (void)_removeAllUserStyleSheetsAssociatedWithUserContentWorld:(_WKUserContentWorld *)userContentWorld
{
_userContentControllerProxy->removeAllUserStyleSheets(*userContentWorld->_userContentWorld);
@@ -244,5 +247,6 @@
{
_userContentControllerProxy->removeAllUserMessageHandlers(*userContentWorld->_userContentWorld);
}
+ALLOW_DEPRECATED_DECLARATIONS_END
@end
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKUserScript.mm (256331 => 256332)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKUserScript.mm 2020-02-11 19:34:33 UTC (rev 256331)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKUserScript.mm 2020-02-11 19:40:03 UTC (rev 256332)
@@ -78,6 +78,7 @@
@implementation WKUserScript (WKPrivate)
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
- (instancetype)_initWithSource:(NSString *)source injectionTime:(WKUserScriptInjectionTime)injectionTime forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(NSArray *)legacyWhitelist legacyBlacklist:(NSArray *)legacyBlacklist userContentWorld:(_WKUserContentWorld *)userContentWorld
{
if (!(self = [super init]))
@@ -102,5 +103,6 @@
{
return wrapper(_userScript->userContentWorld());
}
+ALLOW_DEPRECATED_DECLARATIONS_END
@end
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.h (256331 => 256332)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.h 2020-02-11 19:34:33 UTC (rev 256331)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.h 2020-02-11 19:40:03 UTC (rev 256332)
@@ -27,7 +27,7 @@
NS_ASSUME_NONNULL_BEGIN
-WK_CLASS_AVAILABLE(macos(10.12), ios(10.0))
+WK_CLASS_DEPRECATED_WITH_REPLACEMENT("WKContentWorld", macos(10.12, WK_MAC_TBA), ios(10.0, WK_IOS_TBA))
@interface _WKUserContentWorld : NSObject
+ (_WKUserContentWorld *)worldWithName:(NSString *)name;
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.mm (256331 => 256332)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.mm 2020-02-11 19:34:33 UTC (rev 256331)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.mm 2020-02-11 19:40:03 UTC (rev 256332)
@@ -26,6 +26,7 @@
#import "config.h"
#import "_WKUserContentWorldInternal.h"
+ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
@implementation _WKUserContentWorld
+ (_WKUserContentWorld *)worldWithName:(NSString *)name
@@ -60,3 +61,4 @@
}
@end
+ALLOW_DEPRECATED_IMPLEMENTATIONS_END
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorldInternal.h (256331 => 256332)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorldInternal.h 2020-02-11 19:34:33 UTC (rev 256331)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorldInternal.h 2020-02-11 19:40:03 UTC (rev 256332)
@@ -33,7 +33,9 @@
namespace WebKit {
template<> struct WrapperTraits<API::UserContentWorld> {
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
using WrapperClass = _WKUserContentWorld;
+ ALLOW_DEPRECATED_DECLARATIONS_END
};
}
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.h (256331 => 256332)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.h 2020-02-11 19:34:33 UTC (rev 256331)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.h 2020-02-11 19:40:03 UTC (rev 256332)
@@ -41,8 +41,11 @@
@property (nonatomic, readonly, getter=isForMainFrameOnly) BOOL forMainFrameOnly;
- (instancetype)initWithSource:(NSString *)source forMainFrameOnly:(BOOL)forMainFrameOnly;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- (instancetype)initWithSource:(NSString *)source forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(NSArray<NSString *> *)legacyWhitelist legacyBlacklist:(NSArray<NSString *> *)legacyBlacklist userContentWorld:(_WKUserContentWorld *)userContentWorld;
- (instancetype)initWithSource:(NSString *)source forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(NSArray<NSString *> *)legacyWhitelist legacyBlacklist:(NSArray<NSString *> *)legacyBlacklist baseURL:(NSURL *)baseURL userContentWorld:(_WKUserContentWorld *)userContentWorld;
+#pragma clang diagnostic pop
@end
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.mm (256331 => 256332)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.mm 2020-02-11 19:34:33 UTC (rev 256331)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.mm 2020-02-11 19:40:03 UTC (rev 256332)
@@ -47,6 +47,7 @@
return self;
}
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
- (instancetype)initWithSource:(NSString *)source forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(NSArray<NSString *> *)legacyWhitelist legacyBlacklist:(NSArray<NSString *> *)legacyBlacklist userContentWorld:(_WKUserContentWorld *)userContentWorld
{
if (!(self = [super init]))
@@ -72,6 +73,7 @@
return self;
}
+ALLOW_DEPRECATED_DECLARATIONS_END
- (void)dealloc
{
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (256331 => 256332)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-02-11 19:34:33 UTC (rev 256331)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-02-11 19:40:03 UTC (rev 256332)
@@ -1729,6 +1729,7 @@
D3B9484711FF4B6500032B39 /* WebPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = D3B9484311FF4B6500032B39 /* WebPopupMenu.h */; };
D3B9484911FF4B6500032B39 /* WebSearchPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = D3B9484511FF4B6500032B39 /* WebSearchPopupMenu.h */; };
DF462E0F23F22F5500EFF35F /* WKHTTPCookieStorePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF462E0E23F22F5300EFF35F /* WKHTTPCookieStorePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ DF462E1223F338BE00EFF35F /* WKContentWorldPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF462E1123F338AD00EFF35F /* WKContentWorldPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
E105FE5418D7B9DE008F57A8 /* EditingRange.h in Headers */ = {isa = PBXBuildFile; fileRef = E105FE5318D7B9DE008F57A8 /* EditingRange.h */; };
E11D35AE16B63D1B006D23D7 /* com.apple.WebProcess.sb in Resources */ = {isa = PBXBuildFile; fileRef = E1967E37150AB5E200C73169 /* com.apple.WebProcess.sb */; };
E14A954A16E016A40068DE82 /* NetworkProcessPlatformStrategies.h in Headers */ = {isa = PBXBuildFile; fileRef = E14A954816E016A40068DE82 /* NetworkProcessPlatformStrategies.h */; };
@@ -4994,6 +4995,7 @@
D3B9484411FF4B6500032B39 /* WebSearchPopupMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSearchPopupMenu.cpp; sourceTree = "<group>"; };
D3B9484511FF4B6500032B39 /* WebSearchPopupMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSearchPopupMenu.h; sourceTree = "<group>"; };
DF462E0E23F22F5300EFF35F /* WKHTTPCookieStorePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKHTTPCookieStorePrivate.h; sourceTree = "<group>"; };
+ DF462E1123F338AD00EFF35F /* WKContentWorldPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContentWorldPrivate.h; sourceTree = "<group>"; };
DF58C6311371AC5800F9A37C /* NativeWebWheelEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeWebWheelEvent.h; sourceTree = "<group>"; };
DF58C6351371ACA000F9A37C /* NativeWebWheelEventMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NativeWebWheelEventMac.mm; sourceTree = "<group>"; };
E105FE5318D7B9DE008F57A8 /* EditingRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditingRange.h; sourceTree = "<group>"; };
@@ -6964,6 +6966,7 @@
511065FA23EC956B005443D6 /* WKContentWorld.h */,
511065F923EC956B005443D6 /* WKContentWorld.mm */,
511065FB23EC956B005443D6 /* WKContentWorldInternal.h */,
+ DF462E1123F338AD00EFF35F /* WKContentWorldPrivate.h */,
5CE0C369229F2D4A003695F0 /* WKContextMenuElementInfo.h */,
5CE0C368229F2D4A003695F0 /* WKContextMenuElementInfo.mm */,
5CE0C36B229F2D4B003695F0 /* WKContextMenuElementInfoInternal.h */,
@@ -10241,6 +10244,7 @@
2D5875BF219B53150070B9AA /* EditableImageController.h in Headers */,
E105FE5418D7B9DE008F57A8 /* EditingRange.h in Headers */,
1AA41AB512C02EC4002BE67B /* EditorState.h in Headers */,
+ DF462E1223F338BE00EFF35F /* WKContentWorldPrivate.h in Headers */,
BC032DA810F437D10058C15A /* Encoder.h in Headers */,
51B15A8513843A3900321AD8 /* EnvironmentUtilities.h in Headers */,
1AA575FB1496B52600A4EE06 /* EventDispatcher.h in Headers */,
