<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[163629] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/163629">163629</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-02-07 10:32:04 -0800 (Fri, 07 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] API::FrameHandle has a generic wrapper
https://bugs.webkit.org/show_bug.cgi?id=128366
Reviewed by Anders Carlsson.
Added WKFrameHandle.
* Shared/API/Cocoa/WKFrameHandle.h: Added.
* Shared/API/Cocoa/WKFrameHandle.mm: Added.
(-[WKFrameHandle dealloc]): Calls the API::FrameHandle destructor.
(-[WKFrameHandle isEqual:]): Checks for frame ID equality.
(-[WKFrameHandle hash]): Returns the frame ID.
(-[WKFrameHandle _frameID]): Ditto.
(-[WKFrameHandle copyWithZone:]): Retains self.
(+[WKFrameHandle supportsSecureCoding]): Returns YES.
(-[WKFrameHandle initWithCoder:]): Decodes the frame ID and constructs an API::FrameHandle
with it.
(-[WKFrameHandle encodeWithCoder:]): Encodes the frame ID.
(-[WKFrameHandle _apiObject]): Returns the wrapped API::FrameHandle.
* Shared/API/Cocoa/WKFrameHandleInternal.h: Added.
(WebKit::wrapper): Added. Returns an API::FrameHandle’s wrapper as a WKFrameHandle.
* Shared/APIFrameHandle.cpp:
(API::FrameHandle::create): Changed to return a PassRefPtr.
* Shared/APIFrameHandle.h: Made the constructor public for -[WKFrameHandle initWithCoder:].
* Shared/Cocoa/APIObject.mm:
(API::Object::newObject): Allocate a WKFrameHandle if the object is an API::FrameHandle.
* WebKit2.xcodeproj/project.pbxproj: Added references to new files.
* WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.h: Declared handle property.
* WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm:
(+[WKWebProcessPlugInFrame lookUpFrameFromHandle:]): Added. Calls WebProcess::webFrame to
look up a frame with the given handle’s frame ID.
(-[WKWebProcessPlugInFrame handle]): Added. Returns a new handle with the frame’s ID.
* WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrameInternal.h: Updated #import.
* WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFramePrivate.h: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIFrameHandlecpp">trunk/Source/WebKit2/Shared/APIFrameHandle.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIFrameHandleh">trunk/Source/WebKit2/Shared/APIFrameHandle.h</a></li>
<li><a href="#trunkSourceWebKit2SharedCocoaAPIObjectmm">trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInFrameh">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInFramemm">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInFrameInternalh">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrameInternal.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedAPICocoaWKFrameHandleh">trunk/Source/WebKit2/Shared/API/Cocoa/WKFrameHandle.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPICocoaWKFrameHandlemm">trunk/Source/WebKit2/Shared/API/Cocoa/WKFrameHandle.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedAPICocoaWKFrameHandleInternalh">trunk/Source/WebKit2/Shared/API/Cocoa/WKFrameHandleInternal.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInFramePrivateh">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFramePrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163628 => 163629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-07 18:31:29 UTC (rev 163628)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-07 18:32:04 UTC (rev 163629)
</span><span class="lines">@@ -1,5 +1,46 @@
</span><span class="cx"> 2014-02-07 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><ins>+ [Cocoa] API::FrameHandle has a generic wrapper
+ https://bugs.webkit.org/show_bug.cgi?id=128366
+
+ Reviewed by Anders Carlsson.
+
+ Added WKFrameHandle.
+
+ * Shared/API/Cocoa/WKFrameHandle.h: Added.
+ * Shared/API/Cocoa/WKFrameHandle.mm: Added.
+ (-[WKFrameHandle dealloc]): Calls the API::FrameHandle destructor.
+ (-[WKFrameHandle isEqual:]): Checks for frame ID equality.
+ (-[WKFrameHandle hash]): Returns the frame ID.
+ (-[WKFrameHandle _frameID]): Ditto.
+ (-[WKFrameHandle copyWithZone:]): Retains self.
+ (+[WKFrameHandle supportsSecureCoding]): Returns YES.
+ (-[WKFrameHandle initWithCoder:]): Decodes the frame ID and constructs an API::FrameHandle
+ with it.
+ (-[WKFrameHandle encodeWithCoder:]): Encodes the frame ID.
+ (-[WKFrameHandle _apiObject]): Returns the wrapped API::FrameHandle.
+ * Shared/API/Cocoa/WKFrameHandleInternal.h: Added.
+ (WebKit::wrapper): Added. Returns an API::FrameHandle’s wrapper as a WKFrameHandle.
+
+ * Shared/APIFrameHandle.cpp:
+ (API::FrameHandle::create): Changed to return a PassRefPtr.
+ * Shared/APIFrameHandle.h: Made the constructor public for -[WKFrameHandle initWithCoder:].
+
+ * Shared/Cocoa/APIObject.mm:
+ (API::Object::newObject): Allocate a WKFrameHandle if the object is an API::FrameHandle.
+
+ * WebKit2.xcodeproj/project.pbxproj: Added references to new files.
+
+ * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.h: Declared handle property.
+ * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm:
+ (+[WKWebProcessPlugInFrame lookUpFrameFromHandle:]): Added. Calls WebProcess::webFrame to
+ look up a frame with the given handle’s frame ID.
+ (-[WKWebProcessPlugInFrame handle]): Added. Returns a new handle with the frame’s ID.
+ * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrameInternal.h: Updated #import.
+ * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFramePrivate.h: Added.
+
+2014-02-07 Dan Bernstein <mitz@apple.com>
+
</ins><span class="cx"> [Cocoa] WKWebProcessPlugInNodeHandle methods leak and may crash
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=128365
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoaWKFrameHandleh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/Shared/API/Cocoa/WKFrameHandle.h (0 => 163629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/WKFrameHandle.h (rev 0)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKFrameHandle.h 2014-02-07 18:32:04 UTC (rev 163629)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+/*
+ * 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
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoaWKFrameHandlemm"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/Shared/API/Cocoa/WKFrameHandle.mm (0 => 163629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/WKFrameHandle.mm (rev 0)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKFrameHandle.mm 2014-02-07 18:32:04 UTC (rev 163629)
</span><span class="lines">@@ -0,0 +1,109 @@
</span><ins>+/*
+ * 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
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoaWKFrameHandleInternalh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/Shared/API/Cocoa/WKFrameHandleInternal.h (0 => 163629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/WKFrameHandleInternal.h (rev 0)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKFrameHandleInternal.h 2014-02-07 18:32:04 UTC (rev 163629)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+/*
+ * 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
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIFrameHandlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/APIFrameHandle.cpp (163628 => 163629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIFrameHandle.cpp 2014-02-07 18:31:29 UTC (rev 163628)
+++ trunk/Source/WebKit2/Shared/APIFrameHandle.cpp 2014-02-07 18:32:04 UTC (rev 163629)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx">
</span><del>-RefPtr<FrameHandle> FrameHandle::create(uint64_t frameID)
</del><ins>+PassRefPtr<FrameHandle> FrameHandle::create(uint64_t frameID)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new FrameHandle(frameID));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIFrameHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/APIFrameHandle.h (163628 => 163629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIFrameHandle.h 2014-02-07 18:31:29 UTC (rev 163628)
+++ trunk/Source/WebKit2/Shared/APIFrameHandle.h 2014-02-07 18:32:04 UTC (rev 163629)
</span><span class="lines">@@ -33,14 +33,14 @@
</span><span class="cx">
</span><span class="cx"> class FrameHandle : public ObjectImpl<Object::Type::FrameHandle> {
</span><span class="cx"> public:
</span><del>- static RefPtr<FrameHandle> create(uint64_t frameID);
</del><ins>+ explicit FrameHandle(uint64_t frameID);
+
+ static PassRefPtr<FrameHandle> create(uint64_t frameID);
</ins><span class="cx"> virtual ~FrameHandle();
</span><span class="cx">
</span><span class="cx"> uint64_t frameID() const { return m_frameID; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit FrameHandle(uint64_t frameID);
-
</del><span class="cx"> uint64_t m_frameID;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaAPIObjectmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm (163628 => 163629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2014-02-07 18:31:29 UTC (rev 163628)
+++ trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2014-02-07 18:32:04 UTC (rev 163629)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #import "WKBrowsingContextControllerInternal.h"
</span><span class="cx"> #import "WKBrowsingContextGroupInternal.h"
</span><span class="cx"> #import "WKConnectionInternal.h"
</span><ins>+#import "WKFrameHandleInternal.h"
</ins><span class="cx"> #import "WKNSArray.h"
</span><span class="cx"> #import "WKNSData.h"
</span><span class="cx"> #import "WKNSDictionary.h"
</span><span class="lines">@@ -116,6 +117,10 @@
</span><span class="cx"> wrapper = NSAllocateObject([WKNSError self], size, nullptr);
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case Type::FrameHandle:
+ wrapper = [WKFrameHandle alloc];
+ break;
+
</ins><span class="cx"> case Type::NavigationData:
</span><span class="cx"> wrapper = [WKNavigationData alloc];
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (163628 => 163629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-02-07 18:31:29 UTC (rev 163628)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-02-07 18:32:04 UTC (rev 163629)
</span><span class="lines">@@ -565,6 +565,11 @@
</span><span class="cx"> 373CEAD5185417AE008C363D /* WKNSData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 373CEAD3185417AE008C363D /* WKNSData.mm */; };
</span><span class="cx"> 373CEAD6185417AE008C363D /* WKNSData.h in Headers */ = {isa = PBXBuildFile; fileRef = 373CEAD4185417AE008C363D /* WKNSData.h */; };
</span><span class="cx"> 373CEAD81859553F008C363D /* WKPagePolicyClientInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 373CEAD71859553F008C363D /* WKPagePolicyClientInternal.h */; };
</span><ins>+ 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 */; };
+ 373D122D18A4B6EB0066D9CC /* WKWebProcessPlugInFramePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 373D122C18A4B6A80066D9CC /* WKWebProcessPlugInFramePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 374436881820E7240049579F /* WKObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 374436871820E7240049579F /* WKObject.mm */; };
</span><span class="cx"> 3760881E150413E900FC82C7 /* WebRenderObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3760881C150413E900FC82C7 /* WebRenderObject.cpp */; };
</span><span class="cx"> 3760881F150413E900FC82C7 /* WebRenderObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 3760881D150413E900FC82C7 /* WebRenderObject.h */; };
</span><span class="lines">@@ -2270,6 +2275,11 @@
</span><span class="cx"> 373CEAD3185417AE008C363D /* WKNSData.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNSData.mm; sourceTree = "<group>"; };
</span><span class="cx"> 373CEAD4185417AE008C363D /* WKNSData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNSData.h; sourceTree = "<group>"; };
</span><span class="cx"> 373CEAD71859553F008C363D /* WKPagePolicyClientInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPagePolicyClientInternal.h; sourceTree = "<group>"; };
</span><ins>+ 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>"; };
+ 373D122C18A4B6A80066D9CC /* WKWebProcessPlugInFramePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInFramePrivate.h; sourceTree = "<group>"; };
</ins><span class="cx"> 374436871820E7240049579F /* WKObject.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKObject.mm; sourceTree = "<group>"; };
</span><span class="cx"> 375FB4731883415600BE34D4 /* Info-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-iOS.plist"; sourceTree = "<group>"; };
</span><span class="cx"> 3760881C150413E900FC82C7 /* WebRenderObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebRenderObject.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4094,6 +4104,7 @@
</span><span class="cx"> 1F0181691858DC1500F92884 /* WKWebProcessPlugInFrame.h */,
</span><span class="cx"> 1F01816A1858DC1500F92884 /* WKWebProcessPlugInFrame.mm */,
</span><span class="cx"> 1F01816B1858DC1500F92884 /* WKWebProcessPlugInFrameInternal.h */,
</span><ins>+ 373D122C18A4B6A80066D9CC /* WKWebProcessPlugInFramePrivate.h */,
</ins><span class="cx"> 1F01816C1858DC1500F92884 /* WKWebProcessPlugInHitTestResult.h */,
</span><span class="cx"> 1F01816D1858DC1600F92884 /* WKWebProcessPlugInHitTestResult.mm */,
</span><span class="cx"> 1F01816E1858DC1600F92884 /* WKWebProcessPlugInHitTestResultInternal.h */,
</span><span class="lines">@@ -4389,6 +4400,10 @@
</span><span class="cx"> 1AE00D4A182D6EB000087DD7 /* WKBrowsingContextHandle.mm */,
</span><span class="cx"> 1AE00D4E182D6F5000087DD7 /* WKBrowsingContextHandleInternal.h */,
</span><span class="cx"> 37DFA6FF1810BB92001F4A9F /* WKFoundation.h */,
</span><ins>+ 373D122118A473010066D9CC /* WKFrameHandle.h */,
+ 373D122018A473010066D9CC /* WKFrameHandle.mm */,
+ 373D122618A473F60066D9CC /* WKFrameHandleInternal.h */,
+ 373D122418A473B30066D9CC /* WKBrowsingContextHandleInternal.h */,
</ins><span class="cx"> 1A9E32991822E1CC00F5D04C /* WKRemoteObject.h */,
</span><span class="cx"> 1A9E32981822E1CC00F5D04C /* WKRemoteObject.mm */,
</span><span class="cx"> 1A9E329D1822FEDD00F5D04C /* WKRemoteObjectCoder.h */,
</span><span class="lines">@@ -6269,6 +6284,7 @@
</span><span class="cx"> 518E8F0A16B2093700E91429 /* DownloadAuthenticationClient.h in Headers */,
</span><span class="cx"> 518E8F0C16B2093700E91429 /* DownloadManager.h in Headers */,
</span><span class="cx"> 1AB7D4CA1288AAA700CFD08C /* DownloadProxy.h in Headers */,
</span><ins>+ 373D122D18A4B6EB0066D9CC /* WKWebProcessPlugInFramePrivate.h in Headers */,
</ins><span class="cx"> 1AD25E96167AB08100EA9BCD /* DownloadProxyMap.h in Headers */,
</span><span class="cx"> 1AB7D61A1288B9D900CFD08C /* DownloadProxyMessages.h in Headers */,
</span><span class="cx"> C517388112DF8F4F00EE3F47 /* DragControllerAction.h in Headers */,
</span><span class="lines">@@ -6441,6 +6457,7 @@
</span><span class="cx"> BC597075116591D000551FCA /* ProcessModel.h in Headers */,
</span><span class="cx"> 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */,
</span><span class="cx"> 1AB16ADE1648598400290D62 /* RemoteLayerTreeDrawingArea.h in Headers */,
</span><ins>+ 373D122518A473B30066D9CC /* WKBrowsingContextHandleInternal.h in Headers */,
</ins><span class="cx"> 1AB16AE21648656D00290D62 /* RemoteLayerTreeDrawingAreaProxy.h in Headers */,
</span><span class="cx"> 1AA3D75C1651B44F008713D0 /* RemoteLayerTreeHost.h in Headers */,
</span><span class="cx"> 1AF1AC6C1651759E00C17D7F /* RemoteLayerTreeTransaction.h in Headers */,
</span><span class="lines">@@ -6603,6 +6620,7 @@
</span><span class="cx"> 1CA8B946127C882A00576C2B /* WebInspectorProxyMessages.h in Headers */,
</span><span class="cx"> 51032F1E180F791700961BB7 /* DatabaseToWebProcessConnectionMessages.h in Headers */,
</span><span class="cx"> 51A9E1061315CCFC009E7031 /* WebKeyValueStorageManager.h in Headers */,
</span><ins>+ 373D122718A473F60066D9CC /* WKFrameHandleInternal.h in Headers */,
</ins><span class="cx"> 1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */,
</span><span class="cx"> BCB63478116BF10600603215 /* WebKit2_C.h in Headers */,
</span><span class="cx"> BC9BA5051697C45300E44616 /* WebKit2Initialize.h in Headers */,
</span><span class="lines">@@ -6807,6 +6825,7 @@
</span><span class="cx"> BC1DFE8F12B31CA8005DF730 /* WKOpenPanelResultListener.h in Headers */,
</span><span class="cx"> BCD597D7112B56DC00EC8C23 /* WKPage.h in Headers */,
</span><span class="cx"> 2D6CD119189058A500E5A4A0 /* ViewSnapshotStore.h in Headers */,
</span><ins>+ 373D122318A473010066D9CC /* WKFrameHandle.h in Headers */,
</ins><span class="cx"> BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */,
</span><span class="cx"> BC2D021912AC426C00E732A3 /* WKPageLoadTypes.h in Headers */,
</span><span class="cx"> 93BDEB01171DD7AF00BFEE1B /* WKPageLoadTypesPrivate.h in Headers */,
</span><span class="lines">@@ -8115,6 +8134,7 @@
</span><span class="cx"> 51290992183ACEAF005522A6 /* WebIDBServerConnection.cpp in Sources */,
</span><span class="cx"> BC204EEE11C83EC8008F3375 /* WKBundle.cpp in Sources */,
</span><span class="cx"> 935EEB9E127761AC003322B8 /* WKBundleBackForwardList.cpp in Sources */,
</span><ins>+ 373D122218A473010066D9CC /* WKFrameHandle.mm in Sources */,
</ins><span class="cx"> 935EEBA0127761AC003322B8 /* WKBundleBackForwardListItem.cpp in Sources */,
</span><span class="cx"> 51FA2D7715212E2600C1BA0B /* WKBundleDOMWindowExtension.cpp in Sources */,
</span><span class="cx"> BCD25F1811D6BDE100169B0E /* WKBundleFrame.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.h (163628 => 163629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.h 2014-02-07 18:31:29 UTC (rev 163628)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.h 2014-02-07 18:32:04 UTC (rev 163629)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx"> #import <JavaScriptCore/JSContext.h>
</span><span class="cx">
</span><ins>+@class WKFrameHandle;
</ins><span class="cx"> @class WKWebProcessPlugInHitTestResult;
</span><span class="cx"> @class WKWebProcessPlugInNodeHandle;
</span><span class="cx"> @class WKWebProcessPlugInScriptWorld;
</span><span class="lines">@@ -42,6 +43,8 @@
</span><span class="cx"> @property (nonatomic, readonly) NSArray *childFrames;
</span><span class="cx"> @property (nonatomic, readonly) BOOL containsAnyFormElements;
</span><span class="cx">
</span><ins>+@property (nonatomic, readonly) WKFrameHandle *handle;
+
</ins><span class="cx"> - (JSContext *)jsContextForWorld:(WKWebProcessPlugInScriptWorld *)world;
</span><span class="cx"> - (WKWebProcessPlugInHitTestResult *)hitTest:(CGPoint)point;
</span><span class="cx"> - (JSValue *)jsNodeForNodeHandle:(WKWebProcessPlugInNodeHandle *)nodeHandle inWorld:(WKWebProcessPlugInScriptWorld *)world;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm (163628 => 163629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm 2014-02-07 18:31:29 UTC (rev 163628)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm 2014-02-07 18:32:04 UTC (rev 163629)
</span><span class="lines">@@ -28,11 +28,13 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+#import "WKFrameHandleInternal.h"
</ins><span class="cx"> #import "WKNSArray.h"
</span><span class="cx"> #import "WKNSURLExtras.h"
</span><span class="cx"> #import "WKWebProcessPlugInHitTestResultInternal.h"
</span><span class="cx"> #import "WKWebProcessPlugInNodeHandleInternal.h"
</span><span class="cx"> #import "WKWebProcessPlugInScriptWorldInternal.h"
</span><ins>+#import "WebProcess.h"
</ins><span class="cx"> #import <JavaScriptCore/JSValue.h>
</span><span class="cx"> #import <WebCore/IntPoint.h>
</span><span class="cx">
</span><span class="lines">@@ -42,6 +44,15 @@
</span><span class="cx"> API::ObjectStorage<WebFrame> _frame;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>++ (instancetype)lookUpFrameFromHandle:(WKFrameHandle *)handle
+{
+ WebFrame* webFrame = WebProcess::shared().webFrame(handle._frameID);
+ if (!webFrame)
+ return nil;
+
+ return wrapper(*webFrame);
+}
+
</ins><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><span class="cx"> _frame->~WebFrame();
</span><span class="lines">@@ -80,6 +91,11 @@
</span><span class="cx"> return !!_frame->containsAnyFormElements();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (WKFrameHandle *)handle
+{
+ return [wrapper(*API::FrameHandle::create(_frame->frameID()).leakRef()) autorelease];
+}
+
</ins><span class="cx"> #pragma mark WKObject protocol implementation
</span><span class="cx">
</span><span class="cx"> - (API::Object&)_apiObject
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInFrameInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrameInternal.h (163628 => 163629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrameInternal.h 2014-02-07 18:31:29 UTC (rev 163628)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrameInternal.h 2014-02-07 18:32:04 UTC (rev 163629)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import "WKWebProcessPlugInFrame.h"
</del><ins>+#import "WKWebProcessPlugInFramePrivate.h"
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInFramePrivateh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFramePrivate.h (0 => 163629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFramePrivate.h (rev 0)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFramePrivate.h 2014-02-07 18:32:04 UTC (rev 163629)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+/*
+ * 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 "WKWebProcessPlugInFrame.h"
+
+#if WK_API_ENABLED
+
+@interface WKWebProcessPlugInFrame (WKPrivate)
+
++ (instancetype)lookUpFrameFromHandle:(WKFrameHandle *)handle;
+
+@end
+
+#endif // WK_API_ENABLED
</ins></span></pre>
</div>
</div>
</body>
</html>