Title: [175420] trunk/Source/WebKit2
- Revision
- 175420
- Author
- [email protected]
- Date
- 2014-10-31 13:41:57 -0700 (Fri, 31 Oct 2014)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (175419 => 175420)
--- trunk/Source/WebKit2/ChangeLog 2014-10-31 20:39:20 UTC (rev 175419)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-31 20:41:57 UTC (rev 175420)
@@ -1,5 +1,18 @@
2014-10-31 Timothy Horton <[email protected]>
+ 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 <[email protected]>
+
Remove "Add to iPhoto" from the action menu's sharing menu
https://bugs.webkit.org/show_bug.cgi?id=138251
<rdar://problem/18837197>
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (175419 => 175420)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-10-31 20:39:20 UTC (rev 175419)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-10-31 20:41:57 UTC (rev 175420)
@@ -251,13 +251,12 @@
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
BOOL _automaticallyAdjustsContentInsets;
+ RetainPtr<WKActionMenuController> _actionMenuController;
#endif
#if WK_API_ENABLED
_WKThumbnailView *_thumbnailView;
#endif
-
- RetainPtr<WKActionMenuController> _actionMenuController;
}
@end
@@ -304,7 +303,9 @@
- (void)dealloc
{
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
[_data->_actionMenuController willDestroyView:self];
+#endif
_data->_page->close();
@@ -3534,12 +3535,14 @@
[[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]);
self.actionMenu = menu.get();
_data->_actionMenuController = adoptNS([[WKActionMenuController alloc] initWithPage:*_data->_page view:self]);
self.actionMenu.delegate = _data->_actionMenuController.get();
}
+#endif
return self;
}
@@ -3638,6 +3641,8 @@
_data->_gestureController->removeSwipeSnapshot();
}
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+
- (void)prepareForMenu:(NSMenu *)menu withEvent:(NSEvent *)event
{
[_data->_actionMenuController prepareForMenu:menu withEvent:event];
@@ -3658,6 +3663,8 @@
[_data->_actionMenuController didPerformActionMenuHitTest:hitTestResult];
}
+#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+
@end
@implementation WKView (Private)
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h (175419 => 175420)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2014-10-31 20:39:20 UTC (rev 175419)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2014-10-31 20:41:57 UTC (rev 175420)
@@ -125,6 +125,8 @@
@property (readonly) WKFullScreenWindowController *_fullScreenWindowController;
- (void)_closeFullScreenWindowController;
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
- (void)_didPerformActionMenuHitTest:(const WebKit::ActionMenuHitTestResult&)hitTestResult;
+#endif
@end
Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (175419 => 175420)
--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2014-10-31 20:39:20 UTC (rev 175419)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2014-10-31 20:41:57 UTC (rev 175420)
@@ -755,7 +755,9 @@
void PageClientImpl::didPerformActionMenuHitTest(const ActionMenuHitTestResult& result)
{
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
[m_wkView _didPerformActionMenuHitTest:result];
+#endif
}
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.h (175419 => 175420)
--- trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.h 2014-10-31 20:39:20 UTC (rev 175419)
+++ trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.h 2014-10-31 20:41:57 UTC (rev 175420)
@@ -26,6 +26,8 @@
#ifndef WKActionMenuController_h
#define WKActionMenuController_h
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+
#import "ActionMenuHitTestResult.h"
#import "WKActionMenuItemTypes.h"
#import "WKActionMenuTypes.h"
@@ -66,4 +68,6 @@
@end
+#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+
#endif // WKActionMenuController_h
Modified: trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (175419 => 175420)
--- trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-10-31 20:39:20 UTC (rev 175419)
+++ trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-10-31 20:41:57 UTC (rev 175420)
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKActionMenuController.h"
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
#import "WKNSURLExtras.h"
#import "WKViewInternal.h"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
