<!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>[166859] trunk/Source</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/166859">166859</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2014-04-06 16:41:10 -0700 (Sun, 06 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebKit/mac: Document user content related APIs
Reviewed by Anders Carlsson.
* MigrateHeaders.make:
Source/WebKit2: Document user content related APIs..
Reviewed by Anders Carlsson.
- Also demote WKScriptWorld to SPI.
* UIProcess/API/Cocoa/WKScriptMessage.h:
* UIProcess/API/Cocoa/WKScriptMessage.mm:
(-[WKScriptMessage _scriptWorld]):
(-[WKScriptMessage scriptWorld]): Deleted.
* UIProcess/API/Cocoa/WKScriptMessageHandler.h:
* UIProcess/API/Cocoa/WKScriptMessagePrivate.h: Added.
* UIProcess/API/Cocoa/WKScriptWorld.h: Removed.
* UIProcess/API/Cocoa/WKScriptWorld.mm: Removed.
* UIProcess/API/Cocoa/WKUserContentController.h:
* UIProcess/API/Cocoa/WKUserContentController.mm:
(-[WKUserContentController addScriptMessageHandler:name:]):
(-[WKUserContentController removeScriptMessageHandlerForName:]):
(-[WKUserContentController _addScriptMessageHandler:name:world:]):
(-[WKUserContentController _removeScriptMessageHandlerForName:world:]):
(-[WKUserContentController addScriptMessageHandler:name:world:]): Deleted.
(-[WKUserContentController removeScriptMessageHandlerForName:world:]): Deleted.
* UIProcess/API/Cocoa/WKUserContentControllerPrivate.h: Added.
* UIProcess/API/Cocoa/_WKScriptWorld.h: Copied from WebKit2/UIProcess/API/Cocoa/WKScriptWorld.h.
* UIProcess/API/Cocoa/_WKScriptWorld.mm: Copied from WebKit2/UIProcess/API/Cocoa/WKScriptWorld.mm.
(+[_WKScriptWorld defaultWorld]):
(+[WKScriptWorld defaultWorld]): Deleted.
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMigrateHeadersmake">trunk/Source/WebKit/mac/MigrateHeaders.make</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKScriptMessageh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKScriptMessagemm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKScriptMessageHandlerh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessageHandler.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllerh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllermm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKScriptMessagePrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessagePrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllerPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKScriptWorldh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKScriptWorldmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKScriptWorldh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptWorld.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKScriptWorldmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptWorld.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (166858 => 166859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-04-06 23:21:46 UTC (rev 166858)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-04-06 23:41:10 UTC (rev 166859)
</span><span class="lines">@@ -1,3 +1,11 @@
</span><ins>+2014-04-06 Sam Weinig <sam@webkit.org>
+
+ Document user content related APIs
+
+ Reviewed by Anders Carlsson.
+
+ * MigrateHeaders.make:
+
</ins><span class="cx"> 2014-04-06 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Refactor post-attach and HTMLObjectElement-related code
</span></span></pre></div>
<a id="trunkSourceWebKitmacMigrateHeadersmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/MigrateHeaders.make (166858 => 166859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/MigrateHeaders.make 2014-04-06 23:21:46 UTC (rev 166858)
+++ trunk/Source/WebKit/mac/MigrateHeaders.make 2014-04-06 23:41:10 UTC (rev 166859)
</span><span class="lines">@@ -276,10 +276,11 @@
</span><span class="cx"> WKProcessPoolPrivate.h \
</span><span class="cx"> WKScriptMessage.h \
</span><span class="cx"> WKScriptMessageHandler.h \
</span><del>- WKScriptWorld.h \
</del><ins>+ WKScriptMessagePrivate.h \
</ins><span class="cx"> WKUIDelegate.h \
</span><span class="cx"> WKUIDelegatePrivate.h \
</span><span class="cx"> WKUserContentController.h \
</span><ins>+ WKUserContentControllerPrivate.h \
</ins><span class="cx"> WKWebView.h \
</span><span class="cx"> WKWebViewConfiguration.h \
</span><span class="cx"> WKWebViewConfigurationPrivate.h \
</span><span class="lines">@@ -287,6 +288,7 @@
</span><span class="cx"> _WKActivatedElementInfo.h \
</span><span class="cx"> _WKElementAction.h \
</span><span class="cx"> _WKProcessPoolConfiguration.h \
</span><ins>+ _WKScriptWorld.h \
</ins><span class="cx"> _WKThumbnailView.h \
</span><span class="cx"> _WKVisitedLinkProvider.h \
</span><span class="cx"> _WKVisitedLinkProviderPrivate.h \
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (166858 => 166859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-06 23:21:46 UTC (rev 166858)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-06 23:41:10 UTC (rev 166859)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-04-06 Sam Weinig <sam@webkit.org>
+
+ Document user content related APIs..
+
+ Reviewed by Anders Carlsson.
+
+ - Also demote WKScriptWorld to SPI.
+
+ * UIProcess/API/Cocoa/WKScriptMessage.h:
+ * UIProcess/API/Cocoa/WKScriptMessage.mm:
+ (-[WKScriptMessage _scriptWorld]):
+ (-[WKScriptMessage scriptWorld]): Deleted.
+ * UIProcess/API/Cocoa/WKScriptMessageHandler.h:
+ * UIProcess/API/Cocoa/WKScriptMessagePrivate.h: Added.
+ * UIProcess/API/Cocoa/WKScriptWorld.h: Removed.
+ * UIProcess/API/Cocoa/WKScriptWorld.mm: Removed.
+ * UIProcess/API/Cocoa/WKUserContentController.h:
+ * UIProcess/API/Cocoa/WKUserContentController.mm:
+ (-[WKUserContentController addScriptMessageHandler:name:]):
+ (-[WKUserContentController removeScriptMessageHandlerForName:]):
+ (-[WKUserContentController _addScriptMessageHandler:name:world:]):
+ (-[WKUserContentController _removeScriptMessageHandlerForName:world:]):
+ (-[WKUserContentController addScriptMessageHandler:name:world:]): Deleted.
+ (-[WKUserContentController removeScriptMessageHandlerForName:world:]): Deleted.
+ * UIProcess/API/Cocoa/WKUserContentControllerPrivate.h: Added.
+ * UIProcess/API/Cocoa/_WKScriptWorld.h: Copied from WebKit2/UIProcess/API/Cocoa/WKScriptWorld.h.
+ * UIProcess/API/Cocoa/_WKScriptWorld.mm: Copied from WebKit2/UIProcess/API/Cocoa/WKScriptWorld.mm.
+ (+[_WKScriptWorld defaultWorld]):
+ (+[WKScriptWorld defaultWorld]): Deleted.
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2014-04-04 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Enable WEB_REPLAY for PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKScriptMessageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.h (166858 => 166859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.h 2014-04-06 23:21:46 UTC (rev 166858)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.h 2014-04-06 23:41:10 UTC (rev 166859)
</span><span class="lines">@@ -29,19 +29,21 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> @class WKWebView;
</span><del>-@class WKScriptWorld;
</del><span class="cx">
</span><ins>+/*! A @link WKScriptMessage @/link object contains information about a message being sent from a web page.
+ */
</ins><span class="cx"> WK_API_CLASS
</span><span class="cx"> @interface WKScriptMessage : NSObject
</span><span class="cx">
</span><ins>+/*! @abstract The body of the message. Allowed types are NSDictionary, NSArray, NSNumber, NSNull, NSString, and NSDate. */
</ins><span class="cx"> @property (nonatomic, readonly) id body;
</span><span class="cx">
</span><ins>+/*! @abstract The web view the message is coming from. */
</ins><span class="cx"> @property (nonatomic, readonly, weak) WKWebView *webView;
</span><ins>+
+/*! @abstract The name of the message handler this message is being sent to. */
</ins><span class="cx"> @property (nonatomic, readonly) NSString *name;
</span><del>-@property (nonatomic, readonly) WKScriptWorld *scriptWorld;
</del><span class="cx">
</span><del>-// FIXME: Consider adding the navigation as well.
-
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKScriptMessagemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.mm (166858 => 166859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.mm 2014-04-06 23:21:46 UTC (rev 166858)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.mm 2014-04-06 23:41:10 UTC (rev 166859)
</span><span class="lines">@@ -24,10 +24,12 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import "config.h"
</span><del>-#import "WKScriptMessage.h"
</del><ins>+#import "WKScriptMessagePrivate.h"
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+// FIXME: Consider adding the navigation as well.
+
</ins><span class="cx"> @implementation WKScriptMessage
</span><span class="cx">
</span><span class="cx"> - (id)body
</span><span class="lines">@@ -48,8 +50,13 @@
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (WKScriptWorld *)scriptWorld
</del><ins>+@end
+
+@implementation WKScriptMessage (WKPrivate)
+
+- (_WKScriptWorld *)_scriptWorld
</ins><span class="cx"> {
</span><ins>+ // FIXME: Implement.
</ins><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKScriptMessageHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessageHandler.h (166858 => 166859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessageHandler.h 2014-04-06 23:21:46 UTC (rev 166858)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessageHandler.h 2014-04-06 23:41:10 UTC (rev 166859)
</span><span class="lines">@@ -32,10 +32,16 @@
</span><span class="cx"> @class WKScriptMessage;
</span><span class="cx"> @class WKUserContentController;
</span><span class="cx">
</span><ins>+/*! A class that conforms to WKScriptMessageHandler provides a method for recieving messages from JavaScript running in a web page.
+ */
</ins><span class="cx"> @protocol WKScriptMessageHandler <NSObject>
</span><span class="cx">
</span><span class="cx"> @required
</span><span class="cx">
</span><ins>+/*! @abstract Invoked when a script message is recieved from a web page.
+ @param userContentController The WKUserContentController invoking the delegate method.
+ @param message The script message being received.
+ */
</ins><span class="cx"> - (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message;
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKScriptMessagePrivateh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessagePrivate.h (0 => 166859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessagePrivate.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessagePrivate.h 2014-04-06 23:41:10 UTC (rev 166859)
</span><span class="lines">@@ -0,0 +1,38 @@
</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/WKScriptMessage.h>
+
+#if WK_API_ENABLED
+
+@class _WKScriptWorld;
+
+@interface WKScriptMessage (WKPrivate)
+
+@property (nonatomic, readonly) _WKScriptWorld *_scriptWorld;
+
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKScriptWorldh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptWorld.h (166858 => 166859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptWorld.h 2014-04-06 23:21:46 UTC (rev 166858)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptWorld.h 2014-04-06 23:41:10 UTC (rev 166859)
</span><span class="lines">@@ -1,38 +0,0 @@
</span><del>-/*
- * 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 <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
-
-#if WK_API_ENABLED
-
-WK_API_CLASS
-@interface WKScriptWorld : NSObject
-
-+ (instancetype)defaultWorld;
-
-@end
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKScriptWorldmm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptWorld.mm (166858 => 166859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptWorld.mm 2014-04-06 23:21:46 UTC (rev 166858)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptWorld.mm 2014-04-06 23:41:10 UTC (rev 166859)
</span><span class="lines">@@ -1,70 +0,0 @@
</span><del>-/*
- * 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 "WKScriptWorld.h"
-
-#if WK_API_ENABLED
-
-@implementation WKScriptWorld {
- uint64_t _worldID;
-}
-
-static uint64_t generateWorldID()
-{
- std::atomic<uint64_t> worldID;
-
- return ++worldID;
-}
-
-+ (instancetype)defaultWorld
-{
- static dispatch_once_t onceToken;
- static WKScriptWorld *defaultWorld;
-
- dispatch_once(&onceToken, ^{
- defaultWorld = [[WKScriptWorld alloc] _initWithWorldID:0];
- });
-
- return defaultWorld;
-}
-
-- (instancetype)init
-{
- return [self _initWithWorldID:generateWorldID()];
-}
-
-- (instancetype)_initWithWorldID:(uint64_t)worldID
-{
- if (!(self = [super init]))
- return nil;
-
- _worldID = worldID;
- return self;
-}
-
-@end
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.h (166858 => 166859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.h 2014-04-06 23:21:46 UTC (rev 166858)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.h 2014-04-06 23:41:10 UTC (rev 166859)
</span><span class="lines">@@ -28,15 +28,26 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-@class WKScriptWorld;
</del><span class="cx"> @protocol WKScriptMessageHandler;
</span><span class="cx">
</span><ins>+/*! WKUserContentController provides a way for JavaScript to post messages to the @link WKWebView @/link.
+ A @link WKWebView @/link can specify which WKUserContentController object it uses through its @link WKWebViewConfiguration @/link.
+ */
</ins><span class="cx"> WK_API_CLASS
</span><span class="cx"> @interface WKUserContentController : NSObject
</span><span class="cx">
</span><del>-- (void)addScriptMessageHandler:(id <WKScriptMessageHandler>)scriptMessageHandler name:(NSString *)name world:(WKScriptWorld *)world;
-- (void)removeScriptMessageHandlerForName:(NSString *)name world:(WKScriptWorld *)world;
</del><ins>+/*! @abstract Adds a script message handler.
+ @param scriptMessageHandler The message handler where the messages should be delivered.
+ @param name The name of the message handler.
+ @discussion Adding a scriptMessageHandler adds a function window.webkit.messaging.<name>.postMessage(<messageBody>) for all frames.
+ */
+- (void)addScriptMessageHandler:(id <WKScriptMessageHandler>)scriptMessageHandler name:(NSString *)name;
</ins><span class="cx">
</span><ins>+/*! @abstract Removes a script message handler.
+ @param name The name of the message handler to remove.
+ */
+- (void)removeScriptMessageHandlerForName:(NSString *)name;
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm (166858 => 166859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm 2014-04-06 23:21:46 UTC (rev 166858)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm 2014-04-06 23:41:10 UTC (rev 166859)
</span><span class="lines">@@ -23,19 +23,35 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#include "config.h"
-#include "WKUserContentController.h"
</del><ins>+#import "config.h"
+#import "WKUserContentControllerPrivate.h"
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+#import "_WKScriptWorld.h"
+
</ins><span class="cx"> @implementation WKUserContentController
</span><span class="cx">
</span><del>-- (void)addScriptMessageHandler:(id <WKScriptMessageHandler>)scriptMessageHandler name:(NSString *)name world:(WKScriptWorld *)world
</del><ins>+- (void)addScriptMessageHandler:(id <WKScriptMessageHandler>)scriptMessageHandler name:(NSString *)name
</ins><span class="cx"> {
</span><ins>+ [self _addScriptMessageHandler:scriptMessageHandler name:name world:[_WKScriptWorld defaultWorld]];
+}
+
+- (void)removeScriptMessageHandlerForName:(NSString *)name
+{
+ [self _removeScriptMessageHandlerForName:name world:[_WKScriptWorld defaultWorld]];
+}
+
+@end
+
+@implementation WKUserContentController (WKPrivate)
+
+- (void)_addScriptMessageHandler:(id <WKScriptMessageHandler>)scriptMessageHandler name:(NSString *)name world:(_WKScriptWorld *)world
+{
</ins><span class="cx"> // FIXME: Implement.
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)removeScriptMessageHandlerForName:(NSString *)name world:(WKScriptWorld *)world
</del><ins>+- (void)_removeScriptMessageHandlerForName:(NSString *)name world:(_WKScriptWorld *)world
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Implement.
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllerPrivateh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h (0 => 166859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h 2014-04-06 23:41:10 UTC (rev 166859)
</span><span class="lines">@@ -0,0 +1,41 @@
</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/WKUserContentController.h>
+
+#if WK_API_ENABLED
+
+@class _WKScriptWorld;
+
+@interface WKUserContentController (WKPrivate)
+
+- (void)_addScriptMessageHandler:(id <WKScriptMessageHandler>)scriptMessageHandler name:(NSString *)name world:(_WKScriptWorld *)world;
+- (void)_removeScriptMessageHandlerForName:(NSString *)name world:(_WKScriptWorld *)world;
+
+@end
+
+#endif
+
+
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKScriptWorldhfromrev166808trunkSourceWebKit2UIProcessAPICocoaWKScriptWorldh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.h (from rev 166808, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptWorld.h) (0 => 166859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.h 2014-04-06 23:41:10 UTC (rev 166859)
</span><span class="lines">@@ -0,0 +1,38 @@
</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 <Foundation/Foundation.h>
+#import <WebKit2/WKFoundation.h>
+
+#if WK_API_ENABLED
+
+WK_API_CLASS
+@interface _WKScriptWorld : NSObject
+
++ (instancetype)defaultWorld;
+
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKScriptWorldmmfromrev166808trunkSourceWebKit2UIProcessAPICocoaWKScriptWorldmm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.mm (from rev 166808, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptWorld.mm) (0 => 166859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.mm 2014-04-06 23:41:10 UTC (rev 166859)
</span><span class="lines">@@ -0,0 +1,70 @@
</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 "_WKScriptWorld.h"
+
+#if WK_API_ENABLED
+
+@implementation _WKScriptWorld {
+ uint64_t _worldID;
+}
+
+static uint64_t generateWorldID()
+{
+ std::atomic<uint64_t> worldID;
+
+ return ++worldID;
+}
+
++ (instancetype)defaultWorld
+{
+ static dispatch_once_t onceToken;
+ static _WKScriptWorld *defaultWorld;
+
+ dispatch_once(&onceToken, ^{
+ defaultWorld = [[_WKScriptWorld alloc] _initWithWorldID:0];
+ });
+
+ return defaultWorld;
+}
+
+- (instancetype)init
+{
+ return [self _initWithWorldID:generateWorldID()];
+}
+
+- (instancetype)_initWithWorldID:(uint64_t)worldID
+{
+ if (!(self = [super init]))
+ return nil;
+
+ _worldID = worldID;
+ return self;
+}
+
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (166858 => 166859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-04-06 23:21:46 UTC (rev 166858)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-04-06 23:41:10 UTC (rev 166859)
</span><span class="lines">@@ -258,8 +258,8 @@
</span><span class="cx"> 1A79D9F218EB5EF100914CC5 /* WKBackForwardListPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A79D9F118EB5EF100914CC5 /* WKBackForwardListPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1A7C6CDA1378950800B9C04D /* EnvironmentVariables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A7C6CD81378950800B9C04D /* EnvironmentVariables.cpp */; };
</span><span class="cx"> 1A7C6CDB1378950800B9C04D /* EnvironmentVariables.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7C6CD91378950800B9C04D /* EnvironmentVariables.h */; };
</span><del>- 1A7E376D18E3CA57003D0FFF /* WKScriptWorld.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A7E376B18E3CA57003D0FFF /* WKScriptWorld.mm */; };
- 1A7E376E18E3CA57003D0FFF /* WKScriptWorld.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7E376C18E3CA57003D0FFF /* WKScriptWorld.h */; settings = {ATTRIBUTES = (Public, ); }; };
</del><ins>+ 1A7E376D18E3CA57003D0FFF /* _WKScriptWorld.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A7E376B18E3CA57003D0FFF /* _WKScriptWorld.mm */; };
+ 1A7E376E18E3CA57003D0FFF /* _WKScriptWorld.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7E376C18E3CA57003D0FFF /* _WKScriptWorld.h */; settings = {ATTRIBUTES = (Public, ); }; };
</ins><span class="cx"> 1A7E377518E4A33A003D0FFF /* WKScriptMessageHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7E377418E4A33A003D0FFF /* WKScriptMessageHandler.h */; settings = {ATTRIBUTES = (Public, ); }; };
</span><span class="cx"> 1A7E377818E4A4FE003D0FFF /* WKScriptMessage.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A7E377618E4A4FE003D0FFF /* WKScriptMessage.mm */; };
</span><span class="cx"> 1A7E377918E4A4FE003D0FFF /* WKScriptMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7E377718E4A4FE003D0FFF /* WKScriptMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
</span><span class="lines">@@ -972,6 +972,8 @@
</span><span class="cx"> 7CB16FF21724BA28007A0A95 /* com.macromedia.Flash Player.plugin.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 7CB16FE51724B9B5007A0A95 /* com.macromedia.Flash Player.plugin.sb */; };
</span><span class="cx"> 7CB16FF31724BA2F007A0A95 /* com.microsoft.SilverlightPlugin.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 7CB16FE61724B9B5007A0A95 /* com.microsoft.SilverlightPlugin.sb */; };
</span><span class="cx"> 7CB16FF41724BA30007A0A95 /* com.oracle.java.JavaAppletPlugin.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 7CB16FE71724B9B5007A0A95 /* com.oracle.java.JavaAppletPlugin.sb */; };
</span><ins>+ 7CC99A3418EF7B120048C8B4 /* WKUserContentControllerPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CC99A3318EF7B120048C8B4 /* WKUserContentControllerPrivate.h */; };
+ 7CC99A3618EF7CBC0048C8B4 /* WKScriptMessagePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CC99A3518EF7CBC0048C8B4 /* WKScriptMessagePrivate.h */; };
</ins><span class="cx"> 7CD102DA1866770600ED429D /* AutoCorrectionCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD102D91866770600ED429D /* AutoCorrectionCallback.h */; };
</span><span class="cx"> 7CD5EBB81746A15B000C1C45 /* WKObjCTypeWrapperRef.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CD5EBB61746A15B000C1C45 /* WKObjCTypeWrapperRef.mm */; };
</span><span class="cx"> 7CD5EBB91746A15B000C1C45 /* WKObjCTypeWrapperRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD5EBB71746A15B000C1C45 /* WKObjCTypeWrapperRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -2029,8 +2031,8 @@
</span><span class="cx"> 1A79D9F118EB5EF100914CC5 /* WKBackForwardListPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBackForwardListPrivate.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A7C6CD81378950800B9C04D /* EnvironmentVariables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EnvironmentVariables.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A7C6CD91378950800B9C04D /* EnvironmentVariables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EnvironmentVariables.h; sourceTree = "<group>"; };
</span><del>- 1A7E376B18E3CA57003D0FFF /* WKScriptWorld.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKScriptWorld.mm; sourceTree = "<group>"; };
- 1A7E376C18E3CA57003D0FFF /* WKScriptWorld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKScriptWorld.h; sourceTree = "<group>"; };
</del><ins>+ 1A7E376B18E3CA57003D0FFF /* _WKScriptWorld.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKScriptWorld.mm; sourceTree = "<group>"; };
+ 1A7E376C18E3CA57003D0FFF /* _WKScriptWorld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKScriptWorld.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1A7E377418E4A33A003D0FFF /* WKScriptMessageHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKScriptMessageHandler.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A7E377618E4A4FE003D0FFF /* WKScriptMessage.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKScriptMessage.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1A7E377718E4A4FE003D0FFF /* WKScriptMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKScriptMessage.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -2825,6 +2827,8 @@
</span><span class="cx"> 7CB16FE51724B9B5007A0A95 /* com.macromedia.Flash Player.plugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "com.macromedia.Flash Player.plugin.sb"; sourceTree = "<group>"; };
</span><span class="cx"> 7CB16FE61724B9B5007A0A95 /* com.microsoft.SilverlightPlugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.microsoft.SilverlightPlugin.sb; sourceTree = "<group>"; };
</span><span class="cx"> 7CB16FE71724B9B5007A0A95 /* com.oracle.java.JavaAppletPlugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.oracle.java.JavaAppletPlugin.sb; sourceTree = "<group>"; };
</span><ins>+ 7CC99A3318EF7B120048C8B4 /* WKUserContentControllerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserContentControllerPrivate.h; sourceTree = "<group>"; };
+ 7CC99A3518EF7CBC0048C8B4 /* WKScriptMessagePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKScriptMessagePrivate.h; sourceTree = "<group>"; };
</ins><span class="cx"> 7CD102D91866770600ED429D /* AutoCorrectionCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AutoCorrectionCallback.h; sourceTree = "<group>"; };
</span><span class="cx"> 7CD5EBB61746A15B000C1C45 /* WKObjCTypeWrapperRef.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKObjCTypeWrapperRef.mm; sourceTree = "<group>"; };
</span><span class="cx"> 7CD5EBB71746A15B000C1C45 /* WKObjCTypeWrapperRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKObjCTypeWrapperRef.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4652,6 +4656,8 @@
</span><span class="cx"> 005D158E18E4C4EB00734619 /* _WKFindDelegate.h */,
</span><span class="cx"> 1A43E828188F3CDC009E4D30 /* _WKProcessPoolConfiguration.h */,
</span><span class="cx"> 1A43E827188F3CDC009E4D30 /* _WKProcessPoolConfiguration.mm */,
</span><ins>+ 1A7E376C18E3CA57003D0FFF /* _WKScriptWorld.h */,
+ 1A7E376B18E3CA57003D0FFF /* _WKScriptWorld.mm */,
</ins><span class="cx"> 2D6B371918A967AD0042AE80 /* _WKThumbnailView.h */,
</span><span class="cx"> 2D6B371A18A967AD0042AE80 /* _WKThumbnailView.mm */,
</span><span class="cx"> 2DACE64D18ADBFF000E4CA76 /* _WKThumbnailViewInternal.h */,
</span><span class="lines">@@ -4692,12 +4698,12 @@
</span><span class="cx"> 1A7E377718E4A4FE003D0FFF /* WKScriptMessage.h */,
</span><span class="cx"> 1A7E377618E4A4FE003D0FFF /* WKScriptMessage.mm */,
</span><span class="cx"> 1A7E377418E4A33A003D0FFF /* WKScriptMessageHandler.h */,
</span><del>- 1A7E376C18E3CA57003D0FFF /* WKScriptWorld.h */,
- 1A7E376B18E3CA57003D0FFF /* WKScriptWorld.mm */,
</del><ins>+ 7CC99A3518EF7CBC0048C8B4 /* WKScriptMessagePrivate.h */,
</ins><span class="cx"> 1AD8790918B6C38A006CAFD7 /* WKUIDelegate.h */,
</span><span class="cx"> 3743925718BC4C60001C8675 /* WKUIDelegatePrivate.h */,
</span><span class="cx"> 1AFA3AC718E61C61003CCBAE /* WKUserContentController.h */,
</span><span class="cx"> 1AFA3AC618E61C61003CCBAE /* WKUserContentController.mm */,
</span><ins>+ 7CC99A3318EF7B120048C8B4 /* WKUserContentControllerPrivate.h */,
</ins><span class="cx"> 1A3CC16518906ACF001E6ED8 /* WKWebView.h */,
</span><span class="cx"> 1A3CC16418906ACF001E6ED8 /* WKWebView.mm */,
</span><span class="cx"> 1ADF59191890528E0043C145 /* WKWebViewConfiguration.h */,
</span><span class="lines">@@ -6677,7 +6683,7 @@
</span><span class="cx"> 371B32DE184D67490013E2B2 /* WKNSURLProtectionSpace.h in Headers */,
</span><span class="cx"> 2984F589164BA095004BC0C6 /* CustomProtocolManagerMessages.h in Headers */,
</span><span class="cx"> C5FA1ED318E1062200B3F402 /* WKAirPlayRoutePicker.h in Headers */,
</span><del>- 1A7E376E18E3CA57003D0FFF /* WKScriptWorld.h in Headers */,
</del><ins>+ 1A7E376E18E3CA57003D0FFF /* _WKScriptWorld.h in Headers */,
</ins><span class="cx"> 29AD3093164B4C5D0072DEA9 /* CustomProtocolManagerProxy.h in Headers */,
</span><span class="cx"> 2984F57D164B915F004BC0C6 /* CustomProtocolManagerProxyMessages.h in Headers */,
</span><span class="cx"> 518353DF1887128B00D9FE44 /* KeyedDecoder.h in Headers */,
</span><span class="lines">@@ -6776,6 +6782,7 @@
</span><span class="cx"> 1A2328FF162C866A00D82F7A /* MessageEncoder.h in Headers */,
</span><span class="cx"> 1AC4C82916B876A90069DCCD /* MessageFlags.h in Headers */,
</span><span class="cx"> 1AE00D6C18327C1200087DD7 /* StringReference.h in Headers */,
</span><ins>+ 7CC99A3618EF7CBC0048C8B4 /* WKScriptMessagePrivate.h in Headers */,
</ins><span class="cx"> 1A3EED12161A53D600AEB4F5 /* MessageReceiver.h in Headers */,
</span><span class="cx"> 1A3EED0F161A535400AEB4F5 /* MessageReceiverMap.h in Headers */,
</span><span class="cx"> C0E3AA7C1209E83C00A49D01 /* Module.h in Headers */,
</span><span class="lines">@@ -7151,6 +7158,7 @@
</span><span class="cx"> BCE2315D122C30CA00D5C35A /* APIURLRequest.h in Headers */,
</span><span class="cx"> BC90A1D2122DD55E00CC8C50 /* APIURLResponse.h in Headers */,
</span><span class="cx"> F6113E25126CE1820057D0A7 /* WebUserContentURLPattern.h in Headers */,
</span><ins>+ 7CC99A3418EF7B120048C8B4 /* WKUserContentControllerPrivate.h in Headers */,
</ins><span class="cx"> 29CD55AA128E294F00133C85 /* WKAccessibilityWebPageObjectBase.h in Headers */,
</span><span class="cx"> BCDDB32D124EC2E10048D13C /* WKAPICast.h in Headers */,
</span><span class="cx"> 512E34E5130B4D0500ABD19A /* WKApplicationCacheManager.h in Headers */,
</span><span class="lines">@@ -8647,7 +8655,7 @@
</span><span class="cx"> BC407628124FF0400068F20A /* WKCertificateInfoMac.mm in Sources */,
</span><span class="cx"> 515E7727183DD6F60007203F /* AsyncRequest.cpp in Sources */,
</span><span class="cx"> BCA284D61492F2C7001F9042 /* WKConnection.mm in Sources */,
</span><del>- 1A7E376D18E3CA57003D0FFF /* WKScriptWorld.mm in Sources */,
</del><ins>+ 1A7E376D18E3CA57003D0FFF /* _WKScriptWorld.mm in Sources */,
</ins><span class="cx"> 0F0C365818C051BA00F607D7 /* RemoteLayerTreeHostIOS.mm in Sources */,
</span><span class="cx"> 0F0C365C18C05CA100F607D7 /* RemoteScrollingCoordinatorProxyIOS.mm in Sources */,
</span><span class="cx"> BC4A6296147313A0006C681A /* WKConnectionRef.cpp in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>