<!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>[169684] 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/169684">169684</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2014-06-08 16:21:31 -0700 (Sun, 08 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] WKScriptMessage should include the frame the message is from
<rdar://problem/17210226>
https://bugs.webkit.org/show_bug.cgi?id=133623
Reviewed by Dan Bernstein.
* UIProcess/API/Cocoa/WKScriptMessage.h:
Add WKFrameInfo property.
* UIProcess/API/Cocoa/WKScriptMessage.mm:
(-[WKScriptMessage _initWithBody:webView:frameInfo:name:]):
Add WKFrameInfo to the initializer.
(-[WKScriptMessage frameInfo]):
Implement frameInfo accessor.
* UIProcess/API/Cocoa/WKScriptMessageInternal.h:
Add WKFrameInfo to the initializer.
* UIProcess/API/Cocoa/WKUserContentController.mm:
Pass the WKFrameInfo to the WKScriptMessage initializer.</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebKit2UIProcessAPICocoaWKScriptMessageInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessageInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllermm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169683 => 169684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-08 22:58:38 UTC (rev 169683)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-08 23:21:31 UTC (rev 169684)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-06-08 Sam Weinig <sam@webkit.org>
+
+ [Cocoa] WKScriptMessage should include the frame the message is from
+ <rdar://problem/17210226>
+ https://bugs.webkit.org/show_bug.cgi?id=133623
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/Cocoa/WKScriptMessage.h:
+ Add WKFrameInfo property.
+
+ * UIProcess/API/Cocoa/WKScriptMessage.mm:
+ (-[WKScriptMessage _initWithBody:webView:frameInfo:name:]):
+ Add WKFrameInfo to the initializer.
+
+ (-[WKScriptMessage frameInfo]):
+ Implement frameInfo accessor.
+
+ * UIProcess/API/Cocoa/WKScriptMessageInternal.h:
+ Add WKFrameInfo to the initializer.
+
+ * UIProcess/API/Cocoa/WKUserContentController.mm:
+ Pass the WKFrameInfo to the WKScriptMessage initializer.
+
</ins><span class="cx"> 2014-06-08 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cococa] WKWindowFeatures.h is missing from WebKit.framework
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKScriptMessageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.h (169683 => 169684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.h 2014-06-08 22:58:38 UTC (rev 169683)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.h 2014-06-08 23:21:31 UTC (rev 169684)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><ins>+@class WKFrameInfo;
</ins><span class="cx"> @class WKWebView;
</span><span class="cx">
</span><span class="cx"> /*! A WKScriptMessage object contains information about a message sent from
</span><span class="lines">@@ -46,6 +47,9 @@
</span><span class="cx"> /*! @abstract The web view sending the message. */
</span><span class="cx"> @property (nonatomic, readonly, weak) WKWebView *webView;
</span><span class="cx">
</span><ins>+/*! @abstract The frame sending the message. */
+@property (nonatomic, readonly) WKFrameInfo *frameInfo;
+
</ins><span class="cx"> /*! @abstract The name of the message handler to which the message is sent.
</span><span class="cx"> */
</span><span class="cx"> @property (nonatomic, readonly) NSString *name;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKScriptMessagemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.mm (169683 => 169684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.mm 2014-06-08 22:58:38 UTC (rev 169683)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.mm 2014-06-08 23:21:31 UTC (rev 169684)
</span><span class="lines">@@ -28,22 +28,25 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+#import "WKFrameInfo.h"
</ins><span class="cx"> #import "WeakObjCPtr.h"
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> @implementation WKScriptMessage {
</span><span class="cx"> RetainPtr<id> _body;
</span><span class="cx"> WebKit::WeakObjCPtr<WKWebView> _webView;
</span><ins>+ RetainPtr<WKFrameInfo> _frameInfo;
</ins><span class="cx"> RetainPtr<NSString> _name;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (instancetype)_initWithBody:(id)body webView:(WKWebView *)webView name:(NSString *)name
</del><ins>+- (instancetype)_initWithBody:(id)body webView:(WKWebView *)webView frameInfo:(WKFrameInfo *)frameInfo name:(NSString *)name
</ins><span class="cx"> {
</span><span class="cx"> if (!(self = [super init]))
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> _body = [body copy];
</span><span class="cx"> _webView = webView;
</span><ins>+ _frameInfo = frameInfo;
</ins><span class="cx"> _name = adoptNS([name copy]);
</span><span class="cx">
</span><span class="cx"> return self;
</span><span class="lines">@@ -60,6 +63,11 @@
</span><span class="cx"> return _webView.getAutoreleased();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (WKFrameInfo *)frameInfo
+{
+ return _frameInfo.get();
+}
+
</ins><span class="cx"> - (NSString *)name
</span><span class="cx"> {
</span><span class="cx"> return _name.get();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKScriptMessageInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessageInternal.h (169683 => 169684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessageInternal.h 2014-06-08 22:58:38 UTC (rev 169683)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessageInternal.h 2014-06-08 23:21:31 UTC (rev 169684)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> @interface WKScriptMessage ()
</span><span class="cx">
</span><del>-- (instancetype)_initWithBody:(id)body webView:(WKWebView *)webView name:(NSString *)name;
</del><ins>+- (instancetype)_initWithBody:(id)body webView:(WKWebView *)webView frameInfo:(WKFrameInfo *)frameInfo name:(NSString *)name;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm (169683 => 169684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm 2014-06-08 22:58:38 UTC (rev 169683)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm 2014-06-08 23:21:31 UTC (rev 169684)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+#import "WKFrameInfoInternal.h"
</ins><span class="cx"> #import "WKScriptMessageHandler.h"
</span><span class="cx"> #import "WKScriptMessageInternal.h"
</span><span class="cx"> #import "WKUserScriptInternal.h"
</span><span class="lines">@@ -102,14 +103,16 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void didPostMessage(WebKit::WebPageProxy& page, WebKit::WebFrameProxy&, WebCore::SerializedScriptValue& serializedScriptValue)
</del><ins>+ virtual void didPostMessage(WebKit::WebPageProxy& page, WebKit::WebFrameProxy& frame, WebCore::SerializedScriptValue& serializedScriptValue)
</ins><span class="cx"> {
</span><ins>+ RetainPtr<WKFrameInfo> frameInfo = adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:frame]);
+
</ins><span class="cx"> RetainPtr<JSContext> context = adoptNS([[JSContext alloc] init]);
</span><span class="cx"> JSValueRef valueRef = serializedScriptValue.deserialize([context JSGlobalContextRef], 0);
</span><span class="cx"> JSValue *value = [JSValue valueWithJSValueRef:valueRef inContext:context.get()];
</span><span class="cx"> id body = [value toObject];
</span><span class="cx">
</span><del>- RetainPtr<WKScriptMessage> message = adoptNS([[WKScriptMessage alloc] _initWithBody:body webView:fromWebPageProxy(page) name:m_name.get()]);
</del><ins>+ RetainPtr<WKScriptMessage> message = adoptNS([[WKScriptMessage alloc] _initWithBody:body webView:fromWebPageProxy(page) frameInfo:frameInfo.get() name:m_name.get()]);
</ins><span class="cx">
</span><span class="cx"> [m_handler userContentController:m_controller.get() didReceiveScriptMessage:message.get()];
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>