Title: [169137] branches/safari-538.34-branch/Source/WebKit2
Diff
Modified: branches/safari-538.34-branch/Source/WebKit2/ChangeLog (169136 => 169137)
--- branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-20 22:14:31 UTC (rev 169136)
+++ branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-20 22:22:08 UTC (rev 169137)
@@ -1,3 +1,17 @@
+2014-05-20 Matthew Hanson <[email protected]>
+
+ Merge r169114.
+
+ 2014-05-20 Anders Carlsson <[email protected]>
+
+ Fix a header comment
+ https://bugs.webkit.org/show_bug.cgi?id=133123
+ <rdar://problem/16973783>
+
+ Reviewed by Geoffrey Garen.
+
+ * UIProcess/API/Cocoa/WKUserContentController.h:
+
2014-05-19 Matthew Hanson <[email protected]>
Merge r169039.
Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.h (169136 => 169137)
--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.h 2014-05-20 22:14:31 UTC (rev 169136)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.h 2014-05-20 22:22:08 UTC (rev 169137)
@@ -54,7 +54,7 @@
/*! @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.
+ @discussion Adding a scriptMessageHandler adds a function window.webkit.messageHandlers.<name>.postMessage(<messageBody>) for all frames.
*/
- (void)addScriptMessageHandler:(id <WKScriptMessageHandler>)scriptMessageHandler name:(NSString *)name;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
