Changeset 176745 in webkit

Timestamp:

Dec 3, 2014, 12:36:26 PM (12 years ago)

Author:

dburkart@apple.com

Message:

Merged r176692. rdar://problems/18944696

Location:

branches/safari-600.3-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/spi/mac/NSMenuSPI.h (modified) (1 diff)

branches/safari-600.3-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2014-12-03  Dana Burkart  <dburkart@apple.com>
+
+        Merge r176692. <rdar://problem/18944696>
+
+    2014-12-02  Beth Dakin  <bdakin@apple.com>
+
+            Another build fix.
+
+            * platform/spi/mac/NSMenuSPI.h:
+
+
 2014-12-03  Dana Burkart  <dburkart@apple.com>
 

branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/NSMenuSPI.h

@@ -26 +26 @@
 #import "QuickLookMacSPI.h"
 
-#if USE(APPLE_INTERNAL_SDK) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101002
-
-#import <AppKit/NSMenu_Private.h>
-
-#else
-
-#import <AppKit/NSMenu.h>
+// FIXME: We should just include the appropriate internal headers.
 
 @interface NSMenuItem (Private)
 + (QLPreviewMenuItem *)standardQuickLookMenuItem;
 @end
-
-#endif