Title: [181742] tags/Safari-601.1.23.3/Source/WebKit/mac
- Revision
- 181742
- Author
- [email protected]
- Date
- 2015-03-19 01:58:48 -0700 (Thu, 19 Mar 2015)
Log Message
Merged r181674. rdar://problem/20032670
Modified Paths
Diff
Modified: tags/Safari-601.1.23.3/Source/WebKit/mac/ChangeLog (181741 => 181742)
--- tags/Safari-601.1.23.3/Source/WebKit/mac/ChangeLog 2015-03-19 08:57:43 UTC (rev 181741)
+++ tags/Safari-601.1.23.3/Source/WebKit/mac/ChangeLog 2015-03-19 08:58:48 UTC (rev 181742)
@@ -1,5 +1,15 @@
2015-03-19 Babak Shafiei <[email protected]>
+ Merge r181674.
+
+ 2015-03-17 Tim Horton <[email protected]>
+
+ Fix the iOS build
+
+ * WebView/WebHTMLView.mm:
+
+2015-03-19 Babak Shafiei <[email protected]>
+
Merge r181668.
2015-03-17 Tim Horton <[email protected]>
Modified: tags/Safari-601.1.23.3/Source/WebKit/mac/WebView/WebHTMLView.mm (181741 => 181742)
--- tags/Safari-601.1.23.3/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-03-19 08:57:43 UTC (rev 181741)
+++ tags/Safari-601.1.23.3/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-03-19 08:58:48 UTC (rev 181742)
@@ -106,7 +106,6 @@
#import <WebCore/LegacyWebArchive.h>
#import <WebCore/MIMETypeRegistry.h>
#import <WebCore/MainFrame.h>
-#import <WebCore/NSMenuSPI.h>
#import <WebCore/NSURLFileTypeMappingsSPI.h>
#import <WebCore/Page.h>
#import <WebCore/Range.h>
@@ -137,9 +136,10 @@
#if !PLATFORM(IOS)
#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
#import <QuartzCore/QuartzCore.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
