Changeset 175420 in webkit

Timestamp:

Oct 31, 2014, 1:41:57 PM (12 years ago)

Author:

timothy_horton@apple.com

Message:

Fix the build for pre-Yosemite systems after r175417

• UIProcess/API/mac/WKView.mm:

(-[WKView dealloc]):
(-[WKView initWithFrame:context:configuration:webView:]):

• UIProcess/API/mac/WKViewInternal.h:
• UIProcess/mac/PageClientImpl.mm:

(WebKit::PageClientImpl::didPerformActionMenuHitTest):

• UIProcess/mac/WKActionMenuController.h:
• UIProcess/mac/WKActionMenuController.mm:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (7 diffs)
• UIProcess/API/mac/WKViewInternal.h (modified) (1 diff)
• UIProcess/mac/PageClientImpl.mm (modified) (1 diff)
• UIProcess/mac/WKActionMenuController.h (modified) (2 diffs)
• UIProcess/mac/WKActionMenuController.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-10-31  Timothy Horton  <timothy_horton@apple.com>
+
+        Fix the build for pre-Yosemite systems after r175417
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView dealloc]):
+        (-[WKView initWithFrame:context:configuration:webView:]):
+        * UIProcess/API/mac/WKViewInternal.h:
+        * UIProcess/mac/PageClientImpl.mm:
+        (WebKit::PageClientImpl::didPerformActionMenuHitTest):
+        * UIProcess/mac/WKActionMenuController.h:
+        * UIProcess/mac/WKActionMenuController.mm:
+
 2014-10-31  Timothy Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -252 +252 @@
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
     BOOL _automaticallyAdjustsContentInsets;
+    RetainPtr<WKActionMenuController> _actionMenuController;
 #endif
 
@@ -257 +258 @@
     _WKThumbnailView *_thumbnailView;
 #endif
-
-    RetainPtr<WKActionMenuController> _actionMenuController;
 }
 
@@ -305 +304 @@
 - (void)dealloc
 {
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
     [_data->_actionMenuController willDestroyView:self];
+#endif
 
     _data->_page->close();
@@ -3535 +3536 @@
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_applicationWillTerminate:) name:NSApplicationWillTerminateNotification object:NSApp];
 
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
     if ([self respondsToSelector:@selector(setActionMenu:)]) {
         RetainPtr<NSMenu> menu = adoptNS([[NSMenu alloc] init]);
@@ -3541 +3543 @@
         self.actionMenu.delegate = _data->_actionMenuController.get();
     }
+#endif
 
     return self;
@@ -3639 +3642 @@
 }
 
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+
 - (void)prepareForMenu:(NSMenu *)menu withEvent:(NSEvent *)event
 {
@@ -3658 +3663 @@
     [_data->_actionMenuController didPerformActionMenuHitTest:hitTestResult];
 }
+
+#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
 
 @end

trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h

@@ -126 +126 @@
 - (void)_closeFullScreenWindowController;
 
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
 - (void)_didPerformActionMenuHitTest:(const WebKit::ActionMenuHitTestResult&)hitTestResult;
+#endif
 
 @end

trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm

@@ -756 +756 @@
 void PageClientImpl::didPerformActionMenuHitTest(const ActionMenuHitTestResult& result)
 {
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
     [m_wkView _didPerformActionMenuHitTest:result];
+#endif
 }
 

trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.h

@@ -26 +26 @@
 #ifndef WKActionMenuController_h
 #define WKActionMenuController_h
+
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
 
 #import "ActionMenuHitTestResult.h"
@@ -67 +69 @@
 @end
 
+#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+
 #endif // WKActionMenuController_h

trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm

@@ -27 +27 @@
 #import "WKActionMenuController.h"
 
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
 
 #import "WKNSURLExtras.h"