Title: [176618] trunk/Source/WebKit/mac
- Revision
- 176618
- Author
- [email protected]
- Date
- 2014-12-01 17:49:49 -0800 (Mon, 01 Dec 2014)
Log Message
Try to fix the Mac build.
* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:]):
(-[WebView _close]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (176617 => 176618)
--- trunk/Source/WebKit/mac/ChangeLog 2014-12-02 01:29:43 UTC (rev 176617)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-12-02 01:49:49 UTC (rev 176618)
@@ -1,5 +1,13 @@
2014-12-01 Timothy Horton <[email protected]>
+ Try to fix the Mac build.
+
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+ (-[WebView _close]):
+
+2014-12-01 Timothy Horton <[email protected]>
+
Fix the iOS build.
* WebView/WebActionMenuController.h:
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (176617 => 176618)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-12-02 01:29:43 UTC (rev 176617)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-12-02 01:49:49 UTC (rev 176618)
@@ -873,13 +873,15 @@
[self addSubview:frameView];
[frameView release];
-#if !PLATFORM(IOS)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
if ([self respondsToSelector:@selector(setActionMenu:)]) {
RetainPtr<NSMenu> actionMenu = adoptNS([[NSMenu alloc] init]);
self.actionMenu = actionMenu.get();
_private->actionMenuController = [[WebActionMenuController alloc] initWithWebView:self];
}
+#endif
+#if !PLATFORM(IOS)
static bool didOneTimeInitialization = false;
#endif
if (!didOneTimeInitialization) {
@@ -1726,6 +1728,8 @@
[self setUIDelegate:nil];
[_private->inspector webViewClosed];
+#endif
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
[_private->actionMenuController webViewClosed];
#endif
@@ -8562,7 +8566,7 @@
return NSMakeRect(rect.origin.x, [self bounds].size.height - rect.origin.y - rect.size.height, rect.size.width, rect.size.height);
}
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
- (void)prepareForMenu:(NSMenu *)menu withEvent:(NSEvent *)event
{
if (menu != self.actionMenu)
@@ -8605,13 +8609,11 @@
[self _setTextIndicator:nullptr fadeOut:NO animationCompletionHandler:^ { }];
}
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
- (WebActionMenuController *)_actionMenuController
{
return _private->actionMenuController;
}
-#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
-#endif // PLATFORM(MAC)
+#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
@end
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
