Title: [176745] branches/safari-600.3-branch/Source/WebCore
- Revision
- 176745
- Author
- [email protected]
- Date
- 2014-12-03 12:36:26 -0800 (Wed, 03 Dec 2014)
Log Message
Merged r176692. rdar://problems/18944696
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (176744 => 176745)
--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-12-03 20:36:14 UTC (rev 176744)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-12-03 20:36:26 UTC (rev 176745)
@@ -1,5 +1,16 @@
2014-12-03 Dana Burkart <[email protected]>
+ Merge r176692. <rdar://problem/18944696>
+
+ 2014-12-02 Beth Dakin <[email protected]>
+
+ Another build fix.
+
+ * platform/spi/mac/NSMenuSPI.h:
+
+
+2014-12-03 Dana Burkart <[email protected]>
+
Merge r176689. <rdar://problem/18944696>
2014-12-02 Beth Dakin <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/NSMenuSPI.h (176744 => 176745)
--- branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/NSMenuSPI.h 2014-12-03 20:36:14 UTC (rev 176744)
+++ branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/NSMenuSPI.h 2014-12-03 20:36:26 UTC (rev 176745)
@@ -25,16 +25,8 @@
#import "QuickLookMacSPI.h"
-#if USE(APPLE_INTERNAL_SDK) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101002
+// FIXME: We should just include the appropriate internal headers.
-#import <AppKit/NSMenu_Private.h>
-
-#else
-
-#import <AppKit/NSMenu.h>
-
@interface NSMenuItem (Private)
+ (QLPreviewMenuItem *)standardQuickLookMenuItem;
@end
-
-#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
