Diff
Modified: trunk/Source/WebKit2/ChangeLog (164299 => 164300)
--- 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)
@@ -1,3 +1,26 @@
+2014-02-18 Dan Bernstein <m...@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.
+
2014-02-17 ChangSeok Oh <changseok...@collabora.com>
Unreviewed gtk build fix.
Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectInterface.mm (164299 => 164300)
--- 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)
@@ -36,7 +36,7 @@
extern "C"
const char *_protocol_getMethodTypeEncoding(Protocol *p, SEL sel, BOOL isRequiredMethod, BOOL isInstanceMethod);
-@interface NSMethodSignature (Details)
+@interface NSMethodSignature (WKDetails)
- (Class)_classForObjectAtArgumentIndex:(NSInteger)idx;
@end
@@ -141,6 +141,11 @@
return [[[self alloc] initWithProtocol:protocol identifier:NSStringFromProtocol(protocol)] autorelease];
}
+- (NSString *)description
+{
+ return [NSString stringWithFormat:@"<%@: %p; protocol = \"%@\"; identifier = \"%@\">", NSStringFromClass(self.class), self, _identifier, NSStringFromProtocol(_protocol)];
+}
+
static RetainPtr<NSSet>& classesForSelectorArgument(WKRemoteObjectInterface *interface, SEL selector, NSUInteger argumentIndex)
{
auto it = interface->_allowedArgumentClasses.find(selector);
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.mm (164299 => 164300)
--- 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)
@@ -48,6 +48,11 @@
return self;
}
+- (NSString *)description
+{
+ return [NSString stringWithFormat:@"<%@: %p; isMainFrame = %s; request = %@>", NSStringFromClass(self.class), self, _mainFrame ? "YES" : "NO", _request.get()];
+}
+
- (NSURLRequest *)request
{
return _request.get();
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm (164299 => 164300)
--- 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)
@@ -36,6 +36,12 @@
RetainPtr<NSURLRequest> _request;
}
+- (NSString *)description
+{
+ return [NSString stringWithFormat:@"<%@: %p; navigationType = %ld; request = %@; sourceFrame = %@; destinationFrame = %@>", NSStringFromClass(self.class), self,
+ (long)_navigationType, _request.get(), _sourceFrame.get(), _destinationFrame.get()];
+}
+
- (WKFrameInfo *)sourceFrame
{
return _sourceFrame.get();
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.mm (164299 => 164300)
--- 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)
@@ -35,6 +35,11 @@
RetainPtr<NSURLResponse> _response;
}
+- (NSString *)description
+{
+ return [NSString stringWithFormat:@"<%@: %p; frame = %@; response = %@>", NSStringFromClass(self.class), self, _frame.get(), _response.get()];
+}
+
- (WKFrameInfo *)frame
{
return _frame.get();
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClass.mm (164299 => 164300)
--- 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)
@@ -78,6 +78,11 @@
[super dealloc];
}
+- (NSString *)description
+{
+ return [NSString stringWithFormat:@"<%@: %p; configuration = %@>", NSStringFromClass(self.class), self, _configuration.get()];
+}
+
- (WKProcessClassConfiguration *)configuration
{
return [[_configuration copy] autorelease];
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassConfiguration.mm (164299 => 164300)
--- 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)
@@ -44,6 +44,15 @@
_injectedBundleURL = adoptNS([injectedBundleURL copy]);
}
+- (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:@">"];
+}
+
- (id)copyWithZone:(NSZone *)zone
{
WKProcessClassConfiguration *configuration = [[[self class] allocWithZone:zone] init];
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (164299 => 164300)
--- 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)
@@ -37,6 +37,11 @@
WebKit::WeakObjCPtr<WKWebView> _relatedWebView;
}
+- (NSString *)description
+{
+ return [NSString stringWithFormat:@"<%@: %p; processClass = %@; preferences = %@>", NSStringFromClass(self.class), self, _processClass.get(), _preferences.get()];
+}
+
- (id)copyWithZone:(NSZone *)zone
{
WKWebViewConfiguration *configuration = [[[self class] allocWithZone:zone] init];
