<!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>[160803] 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/160803">160803</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-18 15:50:19 -0800 (Wed, 18 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>https://bugs.webkit.org/show_bug.cgi?id=125941
Add Obj C API for injected bundle PageGroup class.
Patch by Yongjun Zhang <yongjun_zhang@apple.com> on 2013-12-18
Reviewed by Dan Bernstein.
Add Obj C API (WKWebProcessPlugInPageGroup) for injected bundle PageGroup class. And add APIs to
expose the main frame and page group from WKWebProcessPlugInBrowsingContextController.
* Shared/Cocoa/APIObject.mm:
(API::Object::newObject): Create wrapper object for InjectedPageGroup object.
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.h: Added.
* WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.mm: Added.
(-[WKWebProcessPlugInPageGroup identifier]):
(-[WKWebProcessPlugInPageGroup dealloc]):
(-[WKWebProcessPlugInPageGroup API::]):
* WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroupInternal.h: Added.
(WebKit::wrapper):
* WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h: Add API to expose the main frame and page group
for WKWebPocessPlugInBrowserContextController.
* WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:
(-[WKWebProcessPlugInBrowserContextController mainFrame]):
(-[WKWebProcessPlugInBrowserContextController pageGroup]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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="#trunkSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInBrowserContextControllerh">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInBrowserContextControllermm">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInPageGrouph">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInPageGroupmm">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInPageGroupInternalh">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroupInternal.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160802 => 160803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-18 23:33:59 UTC (rev 160802)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-18 23:50:19 UTC (rev 160803)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2013-12-18 Yongjun Zhang <yongjun_zhang@apple.com>
+
+ https://bugs.webkit.org/show_bug.cgi?id=125941
+ Add Obj C API for injected bundle PageGroup class.
+
+ Reviewed by Dan Bernstein.
+
+ Add Obj C API (WKWebProcessPlugInPageGroup) for injected bundle PageGroup class. And add APIs to
+ expose the main frame and page group from WKWebProcessPlugInBrowsingContextController.
+
+ * Shared/Cocoa/APIObject.mm:
+ (API::Object::newObject): Create wrapper object for InjectedPageGroup object.
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.h: Added.
+ * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.mm: Added.
+ (-[WKWebProcessPlugInPageGroup identifier]):
+ (-[WKWebProcessPlugInPageGroup dealloc]):
+ (-[WKWebProcessPlugInPageGroup API::]):
+ * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroupInternal.h: Added.
+ (WebKit::wrapper):
+ * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h: Add API to expose the main frame and page group
+ for WKWebPocessPlugInBrowserContextController.
+ * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:
+ (-[WKWebProcessPlugInBrowserContextController mainFrame]):
+ (-[WKWebProcessPlugInBrowserContextController pageGroup]):
+
</ins><span class="cx"> 2013-12-18 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> PDFPlugin: Never make a NSEventType = 0
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaAPIObjectmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm (160802 => 160803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2013-12-18 23:33:59 UTC (rev 160802)
+++ trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2013-12-18 23:50:19 UTC (rev 160803)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> #import "WKWebProcessPlugInHitTestResultInternal.h"
</span><span class="cx"> #import "WKWebProcessPlugInInternal.h"
</span><span class="cx"> #import "WKWebProcessPlugInNodeHandleInternal.h"
</span><ins>+#import "WKWebProcessPlugInPageGroupInternal.h"
</ins><span class="cx"> #import "WKWebProcessPlugInScriptWorldInternal.h"
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="lines">@@ -151,6 +152,10 @@
</span><span class="cx"> wrapper = [WKWebProcessPlugInNodeHandle alloc];
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case Type::BundlePageGroup:
+ wrapper = [WKWebProcessPlugInPageGroup alloc];
+ break;
+
</ins><span class="cx"> case Type::BundleScriptWorld:
</span><span class="cx"> wrapper = [WKWebProcessPlugInScriptWorld 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 (160802 => 160803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-18 23:33:59 UTC (rev 160802)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-18 23:50:19 UTC (rev 160803)
</span><span class="lines">@@ -349,6 +349,9 @@
</span><span class="cx"> 1F7506B61859165700EC0FF7 /* WKWebProcessPlugInNodeHandleInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F0181711858DC1600F92884 /* WKWebProcessPlugInNodeHandleInternal.h */; };
</span><span class="cx"> 1F7506B71859165A00EC0FF7 /* WKWebProcessPlugInHitTestResultInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F01816E1858DC1600F92884 /* WKWebProcessPlugInHitTestResultInternal.h */; };
</span><span class="cx"> 1F7506B81859165D00EC0FF7 /* WKWebProcessPlugInFrameInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F01816B1858DC1500F92884 /* WKWebProcessPlugInFrameInternal.h */; };
</span><ins>+ 1FB00AC7185F76460019142E /* WKWebProcessPlugInPageGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FB00AC4185F76460019142E /* WKWebProcessPlugInPageGroup.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 1FB00AC8185F76460019142E /* WKWebProcessPlugInPageGroup.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1FB00AC5185F76460019142E /* WKWebProcessPlugInPageGroup.mm */; };
+ 1FB00AC9185F76460019142E /* WKWebProcessPlugInPageGroupInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FB00AC6185F76460019142E /* WKWebProcessPlugInPageGroupInternal.h */; };
</ins><span class="cx"> 1QQ417CB12C00CCA002BE67B /* TextCheckerCompletion.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CC417C912C00CCA002BE67B /* TextCheckerCompletion.h */; };
</span><span class="cx"> 1ZZ417EF12C00D87002BE67B /* TextCheckerCompletion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1BB417C912C00CCA002BE67B /* TextCheckerCompletion.cpp */; };
</span><span class="cx"> 290F4272172A0C7400939FF0 /* ChildProcessSupplement.h in Headers */ = {isa = PBXBuildFile; fileRef = 290F4271172A0C7400939FF0 /* ChildProcessSupplement.h */; };
</span><span class="lines">@@ -1916,6 +1919,9 @@
</span><span class="cx"> 1F0181731858DC1600F92884 /* WKWebProcessPlugInScriptWorld.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebProcessPlugInScriptWorld.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1F0181741858DC1600F92884 /* WKWebProcessPlugInScriptWorldInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInScriptWorldInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> 1F335BBF185B84D8001A201A /* WKWebProcessPlugInLoadDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInLoadDelegate.h; sourceTree = "<group>"; };
</span><ins>+ 1FB00AC4185F76460019142E /* WKWebProcessPlugInPageGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInPageGroup.h; sourceTree = "<group>"; };
+ 1FB00AC5185F76460019142E /* WKWebProcessPlugInPageGroup.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebProcessPlugInPageGroup.mm; sourceTree = "<group>"; };
+ 1FB00AC6185F76460019142E /* WKWebProcessPlugInPageGroupInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInPageGroupInternal.h; sourceTree = "<group>"; };
</ins><span class="cx"> 26659AA0185FAAED004303DD /* Info-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-iOS.plist"; sourceTree = "<group>"; };
</span><span class="cx"> 290F4271172A0C7400939FF0 /* ChildProcessSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChildProcessSupplement.h; sourceTree = "<group>"; };
</span><span class="cx"> 293EBEA91627D9C9005F89F1 /* WKDOMText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDOMText.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3770,6 +3776,9 @@
</span><span class="cx"> 1F01816F1858DC1600F92884 /* WKWebProcessPlugInNodeHandle.h */,
</span><span class="cx"> 1F0181701858DC1600F92884 /* WKWebProcessPlugInNodeHandle.mm */,
</span><span class="cx"> 1F0181711858DC1600F92884 /* WKWebProcessPlugInNodeHandleInternal.h */,
</span><ins>+ 1FB00AC4185F76460019142E /* WKWebProcessPlugInPageGroup.h */,
+ 1FB00AC5185F76460019142E /* WKWebProcessPlugInPageGroup.mm */,
+ 1FB00AC6185F76460019142E /* WKWebProcessPlugInPageGroupInternal.h */,
</ins><span class="cx"> 1F0181721858DC1600F92884 /* WKWebProcessPlugInScriptWorld.h */,
</span><span class="cx"> 1F0181731858DC1600F92884 /* WKWebProcessPlugInScriptWorld.mm */,
</span><span class="cx"> 1F0181741858DC1600F92884 /* WKWebProcessPlugInScriptWorldInternal.h */,
</span><span class="lines">@@ -5947,6 +5956,7 @@
</span><span class="cx"> 511F8A7B138B460900A95F44 /* SecItemShimLibrary.h in Headers */,
</span><span class="cx"> 757AF978184D131400E6316E /* IteratorPair.h in Headers */,
</span><span class="cx"> E1790891169BAA82006904C7 /* SecItemShimMessages.h in Headers */,
</span><ins>+ 1FB00AC7185F76460019142E /* WKWebProcessPlugInPageGroup.h in Headers */,
</ins><span class="cx"> E18E690C169B563F009B6670 /* SecItemShimProxy.h in Headers */,
</span><span class="cx"> E18E6918169B667B009B6670 /* SecItemShimProxyMessages.h in Headers */,
</span><span class="cx"> 33152976130D0CB200ED2483 /* SecurityOriginData.h in Headers */,
</span><span class="lines">@@ -6149,6 +6159,7 @@
</span><span class="cx"> 510AFFBA16542048001BA05E /* WebResourceLoader.h in Headers */,
</span><span class="cx"> 51F060E01654317F00F3281B /* WebResourceLoaderMessages.h in Headers */,
</span><span class="cx"> D3B9484911FF4B6500032B39 /* WebSearchPopupMenu.h in Headers */,
</span><ins>+ 1FB00AC9185F76460019142E /* WKWebProcessPlugInPageGroupInternal.h in Headers */,
</ins><span class="cx"> F634445612A885C8000612D8 /* WebSecurityOrigin.h in Headers */,
</span><span class="cx"> 37D0B5C61845218400F6CE7D /* WKErrorRecoveryAttempting.h in Headers */,
</span><span class="cx"> BCC5715B115ADAEF001CCAF9 /* WebSystemInterface.h in Headers */,
</span><span class="lines">@@ -7416,6 +7427,7 @@
</span><span class="cx"> CD73BA53131B645B00EEDED2 /* WebFullScreenManager.cpp in Sources */,
</span><span class="cx"> 755422BD18062BB20046F6A8 /* WKOriginDataManager.cpp in Sources */,
</span><span class="cx"> CD73BA4E131ACDB700EEDED2 /* WebFullScreenManagerMessageReceiver.cpp in Sources */,
</span><ins>+ 1FB00AC8185F76460019142E /* WKWebProcessPlugInPageGroup.mm in Sources */,
</ins><span class="cx"> CD6F75F4131B66D000D6B21E /* WebFullScreenManagerProxy.cpp in Sources */,
</span><span class="cx"> CD73BA47131ACC9A00EEDED2 /* WebFullScreenManagerProxyMessageReceiver.cpp in Sources */,
</span><span class="cx"> BC1BE1E112D54A410004A228 /* WebGeolocationClient.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInPageGrouphfromrev160802trunkSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInBrowserContextControllerh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.h (from rev 160802, trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h) (0 => 160803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.h (rev 0)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.h 2013-12-18 23:50:19 UTC (rev 160803)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+/*
+ * Copyright (C) 2013 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 WKWebProcessPlugInPageGroup : NSObject
+
+@property (readonly) NSString *identifier;
+
+@end
+
+#endif // WK_API_ENABLED
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInPageGroupmmfromrev160802trunkSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInBrowserContextControllerh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.mm (from rev 160802, trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h) (0 => 160803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.mm (rev 0)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.mm 2013-12-18 23:50:19 UTC (rev 160803)
</span><span class="lines">@@ -0,0 +1,63 @@
</span><ins>+/*
+ * Copyright (C) 2013 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 "WKWebProcessPlugInPageGroupInternal.h"
+
+#if WK_API_ENABLED
+
+#import "WKBundlePageGroup.h"
+#import "WKAPICast.h"
+#import "WKNSString.h"
+#import "WKRetainPtr.h"
+#import "WebPageGroupProxy.h"
+
+using namespace WebKit;
+
+@implementation WKWebProcessPlugInPageGroup {
+ API::ObjectStorage<WebPageGroupProxy> _bundlePageGroup;
+}
+
+- (NSString *)identifier
+{
+ return _bundlePageGroup->identifier();
+}
+
+- (void)dealloc
+{
+ _bundlePageGroup->~WebPageGroupProxy();
+ [super dealloc];
+}
+
+#pragma mark WKObject protocol implementation
+
+- (API::Object&)_apiObject
+{
+ return *_bundlePageGroup;
+}
+
+@end
+
+#endif // WK_API_ENABLED
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInPageGroupInternalhfromrev160802trunkSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInBrowserContextControllerh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroupInternal.h (from rev 160802, trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h) (0 => 160803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroupInternal.h (rev 0)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroupInternal.h 2013-12-18 23:50:19 UTC (rev 160803)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+/*
+ * Copyright (C) 2013 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 "WKWebProcessPlugInPageGroup.h"
+
+#if WK_API_ENABLED
+
+#import "WKBase.h"
+#import "WebPageGroupProxy.h"
+
+namespace WebKit {
+
+inline WKWebProcessPlugInPageGroup *wrapper(WebPageGroupProxy& pageGroup)
+{
+ ASSERT([pageGroup.wrapper() isKindOfClass:[WKWebProcessPlugInPageGroup class]]);
+ return (WKWebProcessPlugInPageGroup *)pageGroup.wrapper();
+}
+
+}
+
+@interface WKWebProcessPlugInPageGroup () <WKObject>
+@end
+
+#endif // WK_API_ENABLED
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInBrowserContextControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h (160802 => 160803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h 2013-12-18 23:33:59 UTC (rev 160802)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h 2013-12-18 23:50:19 UTC (rev 160803)
</span><span class="lines">@@ -31,15 +31,21 @@
</span><span class="cx">
</span><span class="cx"> @class WKDOMDocument;
</span><span class="cx"> @class WKDOMRange;
</span><ins>+@class WKWebProcessPlugInFrame;
+@class WKWebProcessPlugInPageGroup;
</ins><span class="cx"> @protocol WKWebProcessPlugInLoadDelegate;
</span><span class="cx">
</span><span class="cx"> WK_API_CLASS
</span><span class="cx"> @interface WKWebProcessPlugInBrowserContextController : NSObject
</span><span class="cx">
</span><del>-@property(readonly) WKDOMDocument *mainFrameDocument;
</del><ins>+@property (readonly) WKDOMDocument *mainFrameDocument;
</ins><span class="cx">
</span><del>-@property(readonly) WKDOMRange *selectedRange;
</del><ins>+@property (readonly) WKDOMRange *selectedRange;
</ins><span class="cx">
</span><ins>+@property (readonly) WKWebProcessPlugInFrame *mainFrame;
+
+@property (readonly) WKWebProcessPlugInPageGroup *pageGroup;
+
</ins><span class="cx"> @property (weak) id <WKWebProcessPlugInLoadDelegate> loadDelegate;
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInBrowserContextControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm (160802 => 160803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm 2013-12-18 23:33:59 UTC (rev 160802)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm 2013-12-18 23:50:19 UTC (rev 160803)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> #import "WKWebProcessPluginFrameInternal.h"
</span><span class="cx"> #import "WKWebProcessPlugInInternal.h"
</span><span class="cx"> #import "WKWebProcessPlugInLoadDelegate.h"
</span><ins>+#import "WKWebProcessPlugInPageGroupInternal.h"
</ins><span class="cx"> #import "WKWebProcessPlugInScriptWorldInternal.h"
</span><span class="cx"> #import "WeakObjCPtr.h"
</span><span class="cx"> #import "WebPage.h"
</span><span class="lines">@@ -138,6 +139,20 @@
</span><span class="cx"> return toWKDOMRange(range.get());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (WKWebProcessPlugInFrame *)mainFrame
+{
+ WebFrame *webKitMainFrame = _page->mainWebFrame();
+ if (!webKitMainFrame)
+ return nil;
+
+ return wrapper(*webKitMainFrame);
+}
+
+- (WKWebProcessPlugInPageGroup *)pageGroup
+{
+ return wrapper(*_page->pageGroup());
+}
+
</ins><span class="cx"> #pragma mark WKObject protocol implementation
</span><span class="cx">
</span><span class="cx"> - (API::Object&)_apiObject
</span></span></pre>
</div>
</div>
</body>
</html>