<!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>[192177] 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/192177">192177</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-11-09 14:00:31 -0800 (Mon, 09 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introspect reply block types as well
https://bugs.webkit.org/show_bug.cgi?id=151048
Reviewed by Tim Horton.
Source/WebKit2:
* Shared/API/Cocoa/_WKRemoteObjectInterface.mm:
(initializeMethod):
(initializeMethods):
(-[_WKRemoteObjectInterface debugDescription]):
Source/WTF:
Fix operator-> implementation.
* wtf/Optional.h:
(WTF::Optional::operator->):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfOptionalh">trunk/Source/WTF/wtf/Optional.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPICocoa_WKRemoteObjectInterfacemm">trunk/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectInterface.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (192176 => 192177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-11-09 21:50:46 UTC (rev 192176)
+++ trunk/Source/WTF/ChangeLog 2015-11-09 22:00:31 UTC (rev 192177)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-11-09 Anders Carlsson <andersca@apple.com>
+
+ Introspect reply block types as well
+ https://bugs.webkit.org/show_bug.cgi?id=151048
+
+ Reviewed by Tim Horton.
+
+ Fix operator-> implementation.
+
+ * wtf/Optional.h:
+ (WTF::Optional::operator->):
+
</ins><span class="cx"> 2015-11-05 Nikos Andronikos <nikos.andronikos-webkit@cisra.canon.com.au>
</span><span class="cx">
</span><span class="cx"> Add runtime and compile time flags for enabling Web Animations API and model.
</span></span></pre></div>
<a id="trunkSourceWTFwtfOptionalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Optional.h (192176 => 192177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Optional.h 2015-11-09 21:50:46 UTC (rev 192176)
+++ trunk/Source/WTF/wtf/Optional.h 2015-11-09 22:00:31 UTC (rev 192177)
</span><span class="lines">@@ -136,13 +136,13 @@
</span><span class="cx"> const T* operator->() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_isEngaged);
</span><del>- return asPtr()->operator->();
</del><ins>+ return asPtr();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> T* operator->()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_isEngaged);
</span><del>- return asPtr()->operator->();
</del><ins>+ return asPtr();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const T& operator*() const { return value(); }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (192176 => 192177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-11-09 21:50:46 UTC (rev 192176)
+++ trunk/Source/WebKit2/ChangeLog 2015-11-09 22:00:31 UTC (rev 192177)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2015-11-09 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Introspect reply block types as well
+ https://bugs.webkit.org/show_bug.cgi?id=151048
+
+ Reviewed by Tim Horton.
+
+ * Shared/API/Cocoa/_WKRemoteObjectInterface.mm:
+ (initializeMethod):
+ (initializeMethods):
+ (-[_WKRemoteObjectInterface debugDescription]):
+
+2015-11-09 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Implement -[_WKRemoteObjectInterface debugDescription] and have it look like the NSXPCInterface equivalent
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151044
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoa_WKRemoteObjectInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectInterface.mm (192176 => 192177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectInterface.mm 2015-11-09 21:50:46 UTC (rev 192176)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectInterface.mm 2015-11-09 22:00:31 UTC (rev 192177)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #import <objc/runtime.h>
</span><span class="cx"> #import <wtf/HashMap.h>
</span><span class="cx"> #import <wtf/NeverDestroyed.h>
</span><ins>+#import <wtf/Optional.h>
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> #import <wtf/Vector.h>
</span><span class="cx"> #import <wtf/text/CString.h>
</span><span class="lines">@@ -39,13 +40,20 @@
</span><span class="cx"> const char *_protocol_getMethodTypeEncoding(Protocol *p, SEL sel, BOOL isRequiredMethod, BOOL isInstanceMethod);
</span><span class="cx">
</span><span class="cx"> @interface NSMethodSignature ()
</span><ins>+- (NSMethodSignature *)_signatureForBlockAtArgumentIndex:(NSInteger)idx;
</ins><span class="cx"> - (Class)_classForObjectAtArgumentIndex:(NSInteger)idx;
</span><ins>+- (NSString *)_typeString;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> struct MethodInfo {
</span><span class="cx"> Vector<HashSet<Class>> allowedArgumentClasses;
</span><span class="cx">
</span><del>- // FIXME: This should have allowed reply argument classes too.
</del><ins>+ struct ReplyInfo {
+ NSUInteger replyPosition;
+ CString replySignature;
+ Vector<HashSet<Class>> allowedReplyClasses;
+ };
+ Optional<ReplyInfo> replyInfo;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> @implementation _WKRemoteObjectInterface {
</span><span class="lines">@@ -77,13 +85,14 @@
</span><span class="cx"> return propertyListClasses;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void initializeMethod(MethodInfo& methodInfo, NSMethodSignature *methodSignature, bool forReplyBlock)
</del><ins>+static void initializeMethod(MethodInfo& methodInfo, Protocol *protocol, SEL selector, NSMethodSignature *methodSignature, bool forReplyBlock)
</ins><span class="cx"> {
</span><span class="cx"> Vector<HashSet<Class>> allowedClasses;
</span><span class="cx">
</span><span class="cx"> NSUInteger firstArgument = forReplyBlock ? 1 : 2;
</span><span class="cx"> NSUInteger argumentCount = methodSignature.numberOfArguments;
</span><span class="cx">
</span><ins>+ bool foundBlock = false;
</ins><span class="cx"> for (NSUInteger i = firstArgument; i < argumentCount; ++i) {
</span><span class="cx"> const char* argumentType = [methodSignature getArgumentTypeAtIndex:i];
</span><span class="cx">
</span><span class="lines">@@ -93,6 +102,23 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (*(argumentType + 1) == '?') {
+ if (forReplyBlock)
+ [NSException raise:NSInvalidArgumentException format:@"Blocks as arguments to the reply block of method (%s / %s) are not allowed", protocol_getName(protocol), sel_getName(selector)];
+
+ if (foundBlock)
+ [NSException raise:NSInvalidArgumentException format:@"Only one reply block is allowed per method (%s / %s)", protocol_getName(protocol), sel_getName(selector)];
+ foundBlock = true;
+ NSMethodSignature *blockSignature = [methodSignature _signatureForBlockAtArgumentIndex:i];
+ ASSERT(blockSignature._typeString);
+
+ methodInfo.replyInfo = MethodInfo::ReplyInfo();
+ methodInfo.replyInfo->replyPosition = i;
+ methodInfo.replyInfo->replySignature = blockSignature._typeString.UTF8String;
+
+ initializeMethod(methodInfo, protocol, selector, blockSignature, true);
+ }
+
</ins><span class="cx"> Class objectClass = [methodSignature _classForObjectAtArgumentIndex:i];
</span><span class="cx"> if (!objectClass) {
</span><span class="cx"> allowedClasses.append({ });
</span><span class="lines">@@ -108,7 +134,10 @@
</span><span class="cx"> allowedClasses.append({ objectClass });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- methodInfo.allowedArgumentClasses = WTF::move(allowedClasses);
</del><ins>+ if (forReplyBlock)
+ methodInfo.replyInfo->allowedReplyClasses = WTF::move(allowedClasses);
+ else
+ methodInfo.allowedArgumentClasses = WTF::move(allowedClasses);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void initializeMethods(_WKRemoteObjectInterface *interface, Protocol *protocol, bool requiredMethods)
</span><span class="lines">@@ -128,7 +157,7 @@
</span><span class="cx">
</span><span class="cx"> NSMethodSignature *methodSignature = [NSMethodSignature signatureWithObjCTypes:methodTypeEncoding];
</span><span class="cx">
</span><del>- initializeMethod(methodInfo, methodSignature, false);
</del><ins>+ initializeMethod(methodInfo, protocol, selector, methodSignature, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> free(methods);
</span><span class="lines">@@ -220,9 +249,13 @@
</span><span class="cx"> return result.autorelease();
</span><span class="cx"> };
</span><span class="cx">
</span><del>- for (auto& selectorAndMethod : _methods)
</del><ins>+ for (auto& selectorAndMethod : _methods) {
</ins><span class="cx"> [result appendFormat:@" selector = %s\n argument classes = %@\n", sel_getName(selectorAndMethod.key), descriptionForClasses(selectorAndMethod.value.allowedArgumentClasses)];
</span><span class="cx">
</span><ins>+ if (auto replyInfo = selectorAndMethod.value.replyInfo)
+ [result appendFormat:@" reply block = (argument #%lu '%s') %@\n", static_cast<unsigned long>(replyInfo->replyPosition), replyInfo->replySignature.data(), descriptionForClasses(replyInfo->allowedReplyClasses)];
+ }
+
</ins><span class="cx"> [result appendString:@">\n"];
</span><span class="cx"> return result.autorelease();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>