<!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>[164300] 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/164300">164300</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-02-18 11:36:41 -0800 (Tue, 18 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] Implement -description in some API objects
https://bugs.webkit.org/show_bug.cgi?id=128956
Reviewed by Anders Carlsson.
* Shared/API/Cocoa/WKRemoteObjectInterface.mm:
Changed category name to have the framework’s prefix.
(-[WKRemoteObjectInterface description]): Added.
* UIProcess/API/Cocoa/WKFrameInfo.mm:
(-[WKFrameInfo description]): Added.
* UIProcess/API/Cocoa/WKNavigationAction.mm:
(-[WKNavigationAction description]): Added.
* UIProcess/API/Cocoa/WKNavigationResponse.mm:
(-[WKNavigationResponse description]): Added.
* UIProcess/API/Cocoa/WKProcessClass.mm:
(-[WKProcessClass description]): Added.
* UIProcess/API/Cocoa/WKProcessClassConfiguration.mm:
(-[WKProcessClassConfiguration description]): Added.
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration description]): Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPICocoaWKRemoteObjectInterfacemm">trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectInterface.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKFrameInfomm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKNavigationActionmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKNavigationResponsemm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessClassmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClass.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessClassConfigurationmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassConfiguration.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164299 => 164300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-18 19:32:54 UTC (rev 164299)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-18 19:36:41 UTC (rev 164300)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-02-18 Dan Bernstein <mitz@apple.com>
+
+ [Cocoa] Implement -description in some API objects
+ https://bugs.webkit.org/show_bug.cgi?id=128956
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/API/Cocoa/WKRemoteObjectInterface.mm:
+ Changed category name to have the framework’s prefix.
+ (-[WKRemoteObjectInterface description]): Added.
+ * UIProcess/API/Cocoa/WKFrameInfo.mm:
+ (-[WKFrameInfo description]): Added.
+ * UIProcess/API/Cocoa/WKNavigationAction.mm:
+ (-[WKNavigationAction description]): Added.
+ * UIProcess/API/Cocoa/WKNavigationResponse.mm:
+ (-[WKNavigationResponse description]): Added.
+ * UIProcess/API/Cocoa/WKProcessClass.mm:
+ (-[WKProcessClass description]): Added.
+ * UIProcess/API/Cocoa/WKProcessClassConfiguration.mm:
+ (-[WKProcessClassConfiguration description]): Added.
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration description]): Added.
+
</ins><span class="cx"> 2014-02-17 ChangSeok Oh <changseok.oh@collabora.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed gtk build fix.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoaWKRemoteObjectInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectInterface.mm (164299 => 164300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectInterface.mm 2014-02-18 19:32:54 UTC (rev 164299)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectInterface.mm 2014-02-18 19:36:41 UTC (rev 164300)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> extern "C"
</span><span class="cx"> const char *_protocol_getMethodTypeEncoding(Protocol *p, SEL sel, BOOL isRequiredMethod, BOOL isInstanceMethod);
</span><span class="cx">
</span><del>-@interface NSMethodSignature (Details)
</del><ins>+@interface NSMethodSignature (WKDetails)
</ins><span class="cx"> - (Class)_classForObjectAtArgumentIndex:(NSInteger)idx;
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -141,6 +141,11 @@
</span><span class="cx"> return [[[self alloc] initWithProtocol:protocol identifier:NSStringFromProtocol(protocol)] autorelease];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSString *)description
+{
+ return [NSString stringWithFormat:@"<%@: %p; protocol = \"%@\"; identifier = \"%@\">", NSStringFromClass(self.class), self, _identifier, NSStringFromProtocol(_protocol)];
+}
+
</ins><span class="cx"> static RetainPtr<NSSet>& classesForSelectorArgument(WKRemoteObjectInterface *interface, SEL selector, NSUInteger argumentIndex)
</span><span class="cx"> {
</span><span class="cx"> auto it = interface->_allowedArgumentClasses.find(selector);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKFrameInfomm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.mm (164299 => 164300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.mm 2014-02-18 19:32:54 UTC (rev 164299)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.mm 2014-02-18 19:36:41 UTC (rev 164300)
</span><span class="lines">@@ -48,6 +48,11 @@
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSString *)description
+{
+ return [NSString stringWithFormat:@"<%@: %p; isMainFrame = %s; request = %@>", NSStringFromClass(self.class), self, _mainFrame ? "YES" : "NO", _request.get()];
+}
+
</ins><span class="cx"> - (NSURLRequest *)request
</span><span class="cx"> {
</span><span class="cx"> return _request.get();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKNavigationActionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm (164299 => 164300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm 2014-02-18 19:32:54 UTC (rev 164299)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm 2014-02-18 19:36:41 UTC (rev 164300)
</span><span class="lines">@@ -36,6 +36,12 @@
</span><span class="cx"> RetainPtr<NSURLRequest> _request;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSString *)description
+{
+ return [NSString stringWithFormat:@"<%@: %p; navigationType = %ld; request = %@; sourceFrame = %@; destinationFrame = %@>", NSStringFromClass(self.class), self,
+ (long)_navigationType, _request.get(), _sourceFrame.get(), _destinationFrame.get()];
+}
+
</ins><span class="cx"> - (WKFrameInfo *)sourceFrame
</span><span class="cx"> {
</span><span class="cx"> return _sourceFrame.get();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKNavigationResponsemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.mm (164299 => 164300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.mm 2014-02-18 19:32:54 UTC (rev 164299)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.mm 2014-02-18 19:36:41 UTC (rev 164300)
</span><span class="lines">@@ -35,6 +35,11 @@
</span><span class="cx"> RetainPtr<NSURLResponse> _response;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSString *)description
+{
+ return [NSString stringWithFormat:@"<%@: %p; frame = %@; response = %@>", NSStringFromClass(self.class), self, _frame.get(), _response.get()];
+}
+
</ins><span class="cx"> - (WKFrameInfo *)frame
</span><span class="cx"> {
</span><span class="cx"> return _frame.get();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessClassmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClass.mm (164299 => 164300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClass.mm 2014-02-18 19:32:54 UTC (rev 164299)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClass.mm 2014-02-18 19:36:41 UTC (rev 164300)
</span><span class="lines">@@ -78,6 +78,11 @@
</span><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSString *)description
+{
+ return [NSString stringWithFormat:@"<%@: %p; configuration = %@>", NSStringFromClass(self.class), self, _configuration.get()];
+}
+
</ins><span class="cx"> - (WKProcessClassConfiguration *)configuration
</span><span class="cx"> {
</span><span class="cx"> return [[_configuration copy] autorelease];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessClassConfigurationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassConfiguration.mm (164299 => 164300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassConfiguration.mm 2014-02-18 19:32:54 UTC (rev 164299)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassConfiguration.mm 2014-02-18 19:36:41 UTC (rev 164300)
</span><span class="lines">@@ -44,6 +44,15 @@
</span><span class="cx"> _injectedBundleURL = adoptNS([injectedBundleURL copy]);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSString *)description
+{
+ NSString *description = [NSString stringWithFormat:@"<%@: %p; maximumProcessCount = %ld", NSStringFromClass(self.class), self, _maximumProcessCount];
+ if (_injectedBundleURL)
+ return [description stringByAppendingFormat:@"; injectedBundleURL: \"%@\">", _injectedBundleURL.get()];
+
+ return [description stringByAppendingString:@">"];
+}
+
</ins><span class="cx"> - (id)copyWithZone:(NSZone *)zone
</span><span class="cx"> {
</span><span class="cx"> WKProcessClassConfiguration *configuration = [[[self class] allocWithZone:zone] init];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (164299 => 164300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2014-02-18 19:32:54 UTC (rev 164299)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2014-02-18 19:36:41 UTC (rev 164300)
</span><span class="lines">@@ -37,6 +37,11 @@
</span><span class="cx"> WebKit::WeakObjCPtr<WKWebView> _relatedWebView;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSString *)description
+{
+ return [NSString stringWithFormat:@"<%@: %p; processClass = %@; preferences = %@>", NSStringFromClass(self.class), self, _processClass.get(), _preferences.get()];
+}
+
</ins><span class="cx"> - (id)copyWithZone:(NSZone *)zone
</span><span class="cx"> {
</span><span class="cx"> WKWebViewConfiguration *configuration = [[[self class] allocWithZone:zone] init];
</span></span></pre>
</div>
</div>
</body>
</html>