Source/WebCore:

Speculative build fix. * platform/spi/mac/NSViewSPI.h: Source/WebKit/mac: Speculative build fix. * WebView/WebView.mm: (-[WebView _commonInitializationWithFrameName:groupName:]): Source/WebKit2: Speculative build fix. * UIProcess/API/mac/WKView.mm: (-[WKView initWithFrame:processPool:configuration:webView:]): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@178681 268f45cc-cd09-0410-ab3c-d52691b4dbfc
juguanhui · Jan 20, 2015 · 8cb90a3 · 8cb90a3
1 parent c61de69
commit 8cb90a3
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 3 deletions.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-19  Beth Dakin  <bdakin@apple.com>
+
+        Speculative build fix.
+
+        * platform/spi/mac/NSViewSPI.h:
+
 2015-01-19  Timothy Horton  <timothy_horton@apple.com>
 
         Adjust naming of action menu SPI

diff --git a/Source/WebCore/platform/spi/mac/NSViewSPI.h b/Source/WebCore/platform/spi/mac/NSViewSPI.h
@@ -28,5 +28,5 @@
 #import <AppKit/NSView.h>
 
 @interface NSView (Private)
-@property (strong) NSMenu *_actionMenu;
+@property (strong, setter=_setActionMenu:) NSMenu *_actionMenu;
 @end
diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-19  Beth Dakin  <bdakin@apple.com>
+
+        Speculative build fix.
+
+        * WebView/WebView.mm:
+        (-[WebView _commonInitializationWithFrameName:groupName:]):
+
 2015-01-19  Beth Dakin  <bdakin@apple.com>
 
         Speculative build fix.

diff --git a/Source/WebKit/mac/WebView/WebView.mm b/Source/WebKit/mac/WebView/WebView.mm
@@ -889,7 +889,7 @@ - (void)_commonInitializationWithFrameName:(NSString *)frameName groupName:(NSSt
     [frameView release];
 
 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
-    if ([self respondsToSelector:@selector(setActionMenu:)]) {
+    if ([self respondsToSelector:@selector(_setActionMenu:)]) {
         RetainPtr<NSMenu> actionMenu = adoptNS([[NSMenu alloc] init]);
         self._actionMenu = actionMenu.get();
         _private->actionMenuController = [[WebActionMenuController alloc] initWithWebView:self];

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-19  Beth Dakin  <bdakin@apple.com>
+
+         Speculative build fix.
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView initWithFrame:processPool:configuration:webView:]):
+
 2015-01-19  Timothy Horton  <timothy_horton@apple.com>
 
         Adjust naming of action menu SPI

diff --git a/Source/WebKit2/UIProcess/API/mac/WKView.mm b/Source/WebKit2/UIProcess/API/mac/WKView.mm
@@ -3613,7 +3613,7 @@ - (instancetype)initWithFrame:(NSRect)frame processPool:(WebProcessPool&)process
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_dictionaryLookupPopoverWillClose:) name:getLUNotificationPopoverWillClose() object:nil];
 
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
-    if ([self respondsToSelector:@selector(setActionMenu:)]) {
+    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]);