Changeset 169073 in webkit

Timestamp:

May 19, 2014, 2:59:25 PM (12 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r169039.

Location:

branches/safari-538.34-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/API/Cocoa/WebKitPrivate.h (modified) (1 diff)

branches/safari-538.34-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-05-19  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r169039.
+
+    2014-05-19  Mark Rowe  <mrowe@apple.com>
+
+            Build fix after r169023.
+
+            * Shared/API/Cocoa/WebKitPrivate.h: Stop including headers that no longer exist.
+            I hope for weinig's sake that no-one was relying on them.
+
 2014-05-19  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WebKitPrivate.h

@@ -27 +27 @@
 #import <WebKit/WKHistoryDelegatePrivate.h>
 #import <WebKit/WKProcessPoolPrivate.h>
-#import <WebKit/WKScriptMessagePrivate.h>
 #import <WebKit/WKUIDelegatePrivate.h>
-#import <WebKit/WKUserContentControllerPrivate.h>
 #import <WebKit/WKWebViewConfigurationPrivate.h>
 #import <WebKit/WKWebViewPrivate.h>