Changeset 181742 in webkit

Timestamp:

Mar 19, 2015, 1:58:48 AM (11 years ago)

Author:

bshafiei@apple.com

Message:

Merged r181674. rdar://problem/20032670

Location:

tags/Safari-601.1.23.3/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebHTMLView.mm (modified) (2 diffs)

tags/Safari-601.1.23.3/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2015-03-19  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r181674.
+
+    2015-03-17  Tim Horton  <timothy_horton@apple.com>
+
+            Fix the iOS build
+
+            * WebView/WebHTMLView.mm:
+
 2015-03-19  Babak Shafiei  <bshafiei@apple.com>
 

tags/Safari-601.1.23.3/Source/WebKit/mac/WebView/WebHTMLView.mm

@@ -107 +107 @@
 #import <WebCore/MIMETypeRegistry.h>
 #import <WebCore/MainFrame.h>
-#import <WebCore/NSMenuSPI.h>
 #import <WebCore/NSURLFileTypeMappingsSPI.h>
 #import <WebCore/Page.h>
@@ -138 +137 @@
 #import <AppKit/NSAccessibility.h>
 #import <ApplicationServices/ApplicationServices.h>
+#import <WebCore/NSMenuSPI.h>
+#import <WebCore/PlatformEventFactoryMac.h>
 #import "WebNSEventExtras.h"
 #import "WebNSPasteboardExtras.h"
-#import <WebCore/PlatformEventFactoryMac.h>
 #endif