Diff
Modified: trunk/Source/WebKit2/ChangeLog (166360 => 166361)
--- trunk/Source/WebKit2/ChangeLog 2014-03-27 16:47:58 UTC (rev 166360)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-27 17:42:48 UTC (rev 166361)
@@ -1,3 +1,32 @@
+2014-03-27 Anders Carlsson <ander...@apple.com>
+
+ Rename WKFrameHandle to _WKFrameHandle
+ https://bugs.webkit.org/show_bug.cgi?id=130847
+
+ Reviewed by Tim Horton.
+
+ * Shared/API/Cocoa/_WKFrameHandle.h: Renamed from Source/WebKit2/Shared/API/Cocoa/WKFrameHandle.h.
+ * Shared/API/Cocoa/_WKFrameHandle.mm: Renamed from Source/WebKit2/Shared/API/Cocoa/WKFrameHandle.mm.
+ (-[_WKFrameHandle dealloc]):
+ (-[_WKFrameHandle isEqual:]):
+ (-[_WKFrameHandle hash]):
+ (-[_WKFrameHandle _frameID]):
+ (-[_WKFrameHandle copyWithZone:]):
+ (+[_WKFrameHandle supportsSecureCoding]):
+ (-[_WKFrameHandle initWithCoder:]):
+ (-[_WKFrameHandle encodeWithCoder:]):
+ (-[_WKFrameHandle API::]):
+ * Shared/API/Cocoa/_WKFrameHandleInternal.h: Renamed from Source/WebKit2/Shared/API/Cocoa/WKFrameHandleInternal.h.
+ (WebKit::wrapper):
+ * Shared/Cocoa/APIObject.mm:
+ (API::Object::newObject):
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.h:
+ * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm:
+ (+[WKWebProcessPlugInFrame lookUpFrameFromHandle:]):
+ (-[WKWebProcessPlugInFrame handle]):
+ * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFramePrivate.h:
+
2014-03-27 Alexey Proskuryakov <a...@apple.com>
Connection::dispatchOneMessage() can be re-entered while handling Cmd-key menu
Deleted: trunk/Source/WebKit2/Shared/API/Cocoa/WKFrameHandle.h (166360 => 166361)
--- trunk/Source/WebKit2/Shared/API/Cocoa/WKFrameHandle.h 2014-03-27 16:47:58 UTC (rev 166360)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKFrameHandle.h 2014-03-27 17:42:48 UTC (rev 166361)
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 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. 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 <WebKit2/WKFoundation.h>
-
-#if WK_API_ENABLED
-
-#import <Foundation/Foundation.h>
-
-WK_API_CLASS
-@interface WKFrameHandle : NSObject <NSCopying, NSSecureCoding>
-
-@end
-
-#endif // WK_API_ENABLED
Deleted: trunk/Source/WebKit2/Shared/API/Cocoa/WKFrameHandle.mm (166360 => 166361)
--- trunk/Source/WebKit2/Shared/API/Cocoa/WKFrameHandle.mm 2014-03-27 16:47:58 UTC (rev 166360)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKFrameHandle.mm 2014-03-27 17:42:48 UTC (rev 166361)
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 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. 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 "config.h"
-#import "WKFrameHandleInternal.h"
-
-#if WK_API_ENABLED
-
-using namespace WebKit;
-
-@implementation WKFrameHandle {
- API::ObjectStorage<API::FrameHandle> _frameHandle;
-}
-
-- (void)dealloc
-{
- _frameHandle->~FrameHandle();
-
- [super dealloc];
-}
-
-- (BOOL)isEqual:(id)object
-{
- if (object == self)
- return YES;
-
- if (![object isKindOfClass:[WKFrameHandle self]])
- return NO;
-
- return _frameHandle->frameID() == ((WKFrameHandle *)object)->_frameHandle->frameID();
-}
-
-- (NSUInteger)hash
-{
- return _frameHandle->frameID();
-}
-
-- (uint64_t)_frameID
-{
- return _frameHandle->frameID();
-}
-
-#pragma mark NSCopying protocol implementation
-
-- (id)copyWithZone:(NSZone *)zone
-{
- return [self retain];
-}
-
-#pragma mark NSSecureCoding protocol implementation
-
-+ (BOOL)supportsSecureCoding
-{
- return YES;
-}
-
-- (id)initWithCoder:(NSCoder *)decoder
-{
- if (!(self = [super init]))
- return nil;
-
- NSNumber *frameID = [decoder decodeObjectOfClass:[NSNumber self] forKey:@"frameID"];
- if (![frameID isKindOfClass:[NSNumber self]]) {
- [self release];
- return nil;
- }
-
- API::Object::constructInWrapper<API::FrameHandle>(self, frameID.unsignedLongLongValue);
-
- return self;
-}
-
-- (void)encodeWithCoder:(NSCoder *)coder
-{
- [coder encodeObject:@(_frameHandle->frameID()) forKey:@"frameID"];
-}
-
-#pragma mark WKObject protocol implementation
-
-- (API::Object&)_apiObject
-{
- return *_frameHandle;
-}
-
-@end
-
-#endif // WK_API_ENABLED
Deleted: trunk/Source/WebKit2/Shared/API/Cocoa/WKFrameHandleInternal.h (166360 => 166361)
--- trunk/Source/WebKit2/Shared/API/Cocoa/WKFrameHandleInternal.h 2014-03-27 16:47:58 UTC (rev 166360)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKFrameHandleInternal.h 2014-03-27 17:42:48 UTC (rev 166361)
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 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. 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 "WKFrameHandle.h"
-
-#if WK_API_ENABLED
-
-#import "APIFrameHandle.h"
-#import "WKObject.h"
-
-namespace WebKit {
-
-inline WKFrameHandle *wrapper(API::FrameHandle& frameHandle)
-{
- ASSERT([frameHandle.wrapper() isKindOfClass:[WKFrameHandle self]]);
- return (WKFrameHandle *)frameHandle.wrapper();
-}
-
-}
-
-@interface WKFrameHandle () <WKObject>
-
-@property (nonatomic, readonly) uint64_t _frameID;
-
-@end
-
-#endif // WK_API_ENABLED
Copied: trunk/Source/WebKit2/Shared/API/Cocoa/_WKFrameHandle.h (from rev 166360, trunk/Source/WebKit2/Shared/API/Cocoa/WKFrameHandle.h) (0 => 166361)
--- trunk/Source/WebKit2/Shared/API/Cocoa/_WKFrameHandle.h (rev 0)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/_WKFrameHandle.h 2014-03-27 17:42:48 UTC (rev 166361)
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 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. 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 <WebKit2/WKFoundation.h>
+
+#if WK_API_ENABLED
+
+#import <Foundation/Foundation.h>
+
+WK_API_CLASS
+@interface _WKFrameHandle : NSObject <NSCopying, NSSecureCoding>
+
+@end
+
+#endif // WK_API_ENABLED
Copied: trunk/Source/WebKit2/Shared/API/Cocoa/_WKFrameHandle.mm (from rev 166360, trunk/Source/WebKit2/Shared/API/Cocoa/WKFrameHandle.mm) (0 => 166361)
--- trunk/Source/WebKit2/Shared/API/Cocoa/_WKFrameHandle.mm (rev 0)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/_WKFrameHandle.mm 2014-03-27 17:42:48 UTC (rev 166361)
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 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. 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 "config.h"
+#import "_WKFrameHandleInternal.h"
+
+#if WK_API_ENABLED
+
+using namespace WebKit;
+
+@implementation _WKFrameHandle {
+ API::ObjectStorage<API::FrameHandle> _frameHandle;
+}
+
+- (void)dealloc
+{
+ _frameHandle->~FrameHandle();
+
+ [super dealloc];
+}
+
+- (BOOL)isEqual:(id)object
+{
+ if (object == self)
+ return YES;
+
+ if (![object isKindOfClass:[_WKFrameHandle self]])
+ return NO;
+
+ return _frameHandle->frameID() == ((_WKFrameHandle *)object)->_frameHandle->frameID();
+}
+
+- (NSUInteger)hash
+{
+ return _frameHandle->frameID();
+}
+
+- (uint64_t)_frameID
+{
+ return _frameHandle->frameID();
+}
+
+#pragma mark NSCopying protocol implementation
+
+- (id)copyWithZone:(NSZone *)zone
+{
+ return [self retain];
+}
+
+#pragma mark NSSecureCoding protocol implementation
+
++ (BOOL)supportsSecureCoding
+{
+ return YES;
+}
+
+- (id)initWithCoder:(NSCoder *)decoder
+{
+ if (!(self = [super init]))
+ return nil;
+
+ NSNumber *frameID = [decoder decodeObjectOfClass:[NSNumber self] forKey:@"frameID"];
+ if (![frameID isKindOfClass:[NSNumber self]]) {
+ [self release];
+ return nil;
+ }
+
+ API::Object::constructInWrapper<API::FrameHandle>(self, frameID.unsignedLongLongValue);
+
+ return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder
+{
+ [coder encodeObject:@(_frameHandle->frameID()) forKey:@"frameID"];
+}
+
+#pragma mark WKObject protocol implementation
+
+- (API::Object&)_apiObject
+{
+ return *_frameHandle;
+}
+
+@end
+
+#endif // WK_API_ENABLED
Copied: trunk/Source/WebKit2/Shared/API/Cocoa/_WKFrameHandleInternal.h (from rev 166360, trunk/Source/WebKit2/Shared/API/Cocoa/WKFrameHandleInternal.h) (0 => 166361)
--- trunk/Source/WebKit2/Shared/API/Cocoa/_WKFrameHandleInternal.h (rev 0)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/_WKFrameHandleInternal.h 2014-03-27 17:42:48 UTC (rev 166361)
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 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. 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 "_WKFrameHandle.h"
+
+#if WK_API_ENABLED
+
+#import "APIFrameHandle.h"
+#import "WKObject.h"
+
+namespace WebKit {
+
+inline _WKFrameHandle *wrapper(API::FrameHandle& frameHandle)
+{
+ ASSERT([frameHandle.wrapper() isKindOfClass:[_WKFrameHandle self]]);
+ return (_WKFrameHandle *)frameHandle.wrapper();
+}
+
+}
+
+@interface _WKFrameHandle () <WKObject>
+
+@property (nonatomic, readonly) uint64_t _frameID;
+
+@end
+
+#endif // WK_API_ENABLED
Modified: trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm (166360 => 166361)
--- trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2014-03-27 16:47:58 UTC (rev 166360)
+++ trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2014-03-27 17:42:48 UTC (rev 166361)
@@ -34,7 +34,7 @@
#import "WKBrowsingContextControllerInternal.h"
#import "WKBrowsingContextGroupInternal.h"
#import "WKConnectionInternal.h"
-#import "WKFrameHandleInternal.h"
+#import "_WKFrameHandleInternal.h"
#import "WKNSArray.h"
#import "WKNSData.h"
#import "WKNSDictionary.h"
@@ -123,7 +123,7 @@
break;
case Type::FrameHandle:
- wrapper = [WKFrameHandle alloc];
+ wrapper = [_WKFrameHandle alloc];
break;
case Type::NavigationData:
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (166360 => 166361)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-03-27 16:47:58 UTC (rev 166360)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-03-27 17:42:48 UTC (rev 166361)
@@ -630,10 +630,10 @@
373CEAD5185417AE008C363D /* WKNSData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 373CEAD3185417AE008C363D /* WKNSData.mm */; };
373CEAD6185417AE008C363D /* WKNSData.h in Headers */ = {isa = PBXBuildFile; fileRef = 373CEAD4185417AE008C363D /* WKNSData.h */; };
373CEAD81859553F008C363D /* WKPagePolicyClientInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 373CEAD71859553F008C363D /* WKPagePolicyClientInternal.h */; };
- 373D122218A473010066D9CC /* WKFrameHandle.mm in Sources */ = {isa = PBXBuildFile; fileRef = 373D122018A473010066D9CC /* WKFrameHandle.mm */; };
- 373D122318A473010066D9CC /* WKFrameHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 373D122118A473010066D9CC /* WKFrameHandle.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 373D122218A473010066D9CC /* _WKFrameHandle.mm in Sources */ = {isa = PBXBuildFile; fileRef = 373D122018A473010066D9CC /* _WKFrameHandle.mm */; };
+ 373D122318A473010066D9CC /* _WKFrameHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 373D122118A473010066D9CC /* _WKFrameHandle.h */; settings = {ATTRIBUTES = (Private, ); }; };
373D122518A473B30066D9CC /* WKBrowsingContextHandleInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 373D122418A473B30066D9CC /* WKBrowsingContextHandleInternal.h */; };
- 373D122718A473F60066D9CC /* WKFrameHandleInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 373D122618A473F60066D9CC /* WKFrameHandleInternal.h */; };
+ 373D122718A473F60066D9CC /* _WKFrameHandleInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 373D122618A473F60066D9CC /* _WKFrameHandleInternal.h */; };
373D122D18A4B6EB0066D9CC /* WKWebProcessPlugInFramePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 373D122C18A4B6A80066D9CC /* WKWebProcessPlugInFramePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
3743925818BC4C60001C8675 /* WKUIDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 3743925718BC4C60001C8675 /* WKUIDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
374436881820E7240049579F /* WKObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 374436871820E7240049579F /* WKObject.mm */; };
@@ -2425,10 +2425,10 @@
373CEAD3185417AE008C363D /* WKNSData.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNSData.mm; sourceTree = "<group>"; };
373CEAD4185417AE008C363D /* WKNSData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNSData.h; sourceTree = "<group>"; };
373CEAD71859553F008C363D /* WKPagePolicyClientInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPagePolicyClientInternal.h; sourceTree = "<group>"; };
- 373D122018A473010066D9CC /* WKFrameHandle.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKFrameHandle.mm; sourceTree = "<group>"; };
- 373D122118A473010066D9CC /* WKFrameHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFrameHandle.h; sourceTree = "<group>"; };
+ 373D122018A473010066D9CC /* _WKFrameHandle.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKFrameHandle.mm; sourceTree = "<group>"; };
+ 373D122118A473010066D9CC /* _WKFrameHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKFrameHandle.h; sourceTree = "<group>"; };
373D122418A473B30066D9CC /* WKBrowsingContextHandleInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBrowsingContextHandleInternal.h; sourceTree = "<group>"; };
- 373D122618A473F60066D9CC /* WKFrameHandleInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFrameHandleInternal.h; sourceTree = "<group>"; };
+ 373D122618A473F60066D9CC /* _WKFrameHandleInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKFrameHandleInternal.h; sourceTree = "<group>"; };
373D122C18A4B6A80066D9CC /* WKWebProcessPlugInFramePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInFramePrivate.h; sourceTree = "<group>"; };
3743925718BC4C60001C8675 /* WKUIDelegatePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUIDelegatePrivate.h; sourceTree = "<group>"; };
374436871820E7240049579F /* WKObject.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKObject.mm; sourceTree = "<group>"; };
@@ -4675,9 +4675,6 @@
1AE00D4A182D6EB000087DD7 /* WKBrowsingContextHandle.mm */,
1AE00D4E182D6F5000087DD7 /* WKBrowsingContextHandleInternal.h */,
37DFA6FF1810BB92001F4A9F /* WKFoundation.h */,
- 373D122118A473010066D9CC /* WKFrameHandle.h */,
- 373D122018A473010066D9CC /* WKFrameHandle.mm */,
- 373D122618A473F60066D9CC /* WKFrameHandleInternal.h */,
373D122418A473B30066D9CC /* WKBrowsingContextHandleInternal.h */,
1A9E32991822E1CC00F5D04C /* WKRemoteObject.h */,
1A9E32981822E1CC00F5D04C /* WKRemoteObject.mm */,
@@ -4691,6 +4688,9 @@
1A9E32A01823018900F5D04C /* WKRemoteObjectRegistryInternal.h */,
1F604BA61889FA7400EE0395 /* WKRenderingProgressEvents.h */,
1F604BA71889FA7400EE0395 /* WKRenderingProgressEventsInternal.h */,
+ 373D122118A473010066D9CC /* _WKFrameHandle.h */,
+ 373D122018A473010066D9CC /* _WKFrameHandle.mm */,
+ 373D122618A473F60066D9CC /* _WKFrameHandleInternal.h */,
);
path = Cocoa;
sourceTree = "<group>";
@@ -6962,7 +6962,7 @@
1A81B38118BD66AD0007FDAC /* _WKVisitedLinkProvider.h in Headers */,
51032F1E180F791700961BB7 /* DatabaseToWebProcessConnectionMessages.h in Headers */,
51A9E1061315CCFC009E7031 /* WebKeyValueStorageManager.h in Headers */,
- 373D122718A473F60066D9CC /* WKFrameHandleInternal.h in Headers */,
+ 373D122718A473F60066D9CC /* _WKFrameHandleInternal.h in Headers */,
1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */,
BCB63478116BF10600603215 /* WebKit2_C.h in Headers */,
1A81B38518BD673A0007FDAC /* _WKVisitedLinkProviderInternal.h in Headers */,
@@ -7178,7 +7178,7 @@
BC1DFE8F12B31CA8005DF730 /* WKOpenPanelResultListener.h in Headers */,
BCD597D7112B56DC00EC8C23 /* WKPage.h in Headers */,
2D6CD119189058A500E5A4A0 /* ViewSnapshotStore.h in Headers */,
- 373D122318A473010066D9CC /* WKFrameHandle.h in Headers */,
+ 373D122318A473010066D9CC /* _WKFrameHandle.h in Headers */,
BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */,
BC2D021912AC426C00E732A3 /* WKPageLoadTypes.h in Headers */,
93BDEB01171DD7AF00BFEE1B /* WKPageLoadTypesPrivate.h in Headers */,
@@ -8513,7 +8513,7 @@
BC204EEE11C83EC8008F3375 /* WKBundle.cpp in Sources */,
7C6E70FB18B2DC7A00F24E2E /* WebProcessCocoa.mm in Sources */,
935EEB9E127761AC003322B8 /* WKBundleBackForwardList.cpp in Sources */,
- 373D122218A473010066D9CC /* WKFrameHandle.mm in Sources */,
+ 373D122218A473010066D9CC /* _WKFrameHandle.mm in Sources */,
935EEBA0127761AC003322B8 /* WKBundleBackForwardListItem.cpp in Sources */,
51FA2D7715212E2600C1BA0B /* WKBundleDOMWindowExtension.cpp in Sources */,
BCD25F1811D6BDE100169B0E /* WKBundleFrame.cpp in Sources */,
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.h (166360 => 166361)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.h 2014-03-27 16:47:58 UTC (rev 166360)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.h 2014-03-27 17:42:48 UTC (rev 166361)
@@ -31,7 +31,7 @@
#import <Foundation/Foundation.h>
#import <_javascript_Core/JSContext.h>
-@class WKFrameHandle;
+@class _WKFrameHandle;
@class WKWebProcessPlugInHitTestResult;
@class WKWebProcessPlugInNodeHandle;
@class WKWebProcessPlugInScriptWorld;
@@ -43,7 +43,7 @@
@property (nonatomic, readonly) NSArray *childFrames;
@property (nonatomic, readonly) BOOL containsAnyFormElements;
-@property (nonatomic, readonly) WKFrameHandle *handle;
+@property (nonatomic, readonly) _WKFrameHandle *handle;
- (JSContext *)jsContextForWorld:(WKWebProcessPlugInScriptWorld *)world;
- (WKWebProcessPlugInHitTestResult *)hitTest:(CGPoint)point;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm (166360 => 166361)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm 2014-03-27 16:47:58 UTC (rev 166360)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm 2014-03-27 17:42:48 UTC (rev 166361)
@@ -28,7 +28,6 @@
#if WK_API_ENABLED
-#import "WKFrameHandleInternal.h"
#import "WKNSArray.h"
#import "WKNSURLExtras.h"
#import "WKWebProcessPlugInBrowserContextControllerInternal.h"
@@ -36,6 +35,7 @@
#import "WKWebProcessPlugInNodeHandleInternal.h"
#import "WKWebProcessPlugInScriptWorldInternal.h"
#import "WebProcess.h"
+#import "_WKFrameHandleInternal.h"
#import <_javascript_Core/JSValue.h>
#import <WebCore/IntPoint.h>
@@ -45,7 +45,7 @@
API::ObjectStorage<WebFrame> _frame;
}
-+ (instancetype)lookUpFrameFromHandle:(WKFrameHandle *)handle
++ (instancetype)lookUpFrameFromHandle:(_WKFrameHandle *)handle
{
WebFrame* webFrame = WebProcess::shared().webFrame(handle._frameID);
if (!webFrame)
@@ -97,7 +97,7 @@
return !!_frame->containsAnyFormElements();
}
-- (WKFrameHandle *)handle
+- (_WKFrameHandle *)handle
{
return [wrapper(*API::FrameHandle::create(_frame->frameID()).leakRef()) autorelease];
}
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFramePrivate.h (166360 => 166361)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFramePrivate.h 2014-03-27 16:47:58 UTC (rev 166360)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFramePrivate.h 2014-03-27 17:42:48 UTC (rev 166361)
@@ -31,7 +31,7 @@
@interface WKWebProcessPlugInFrame (WKPrivate)
-+ (instancetype)lookUpFrameFromHandle:(WKFrameHandle *)handle;
++ (instancetype)lookUpFrameFromHandle:(_WKFrameHandle *)handle;
@property (nonatomic, readonly) WKWebProcessPlugInBrowserContextController *_browserContextController;
