Title: [175821] trunk/Source/WebKit/mac
- Revision
- 175821
- Author
- [email protected]
- Date
- 2014-11-10 12:25:13 -0800 (Mon, 10 Nov 2014)
Log Message
Action menu initialization should be moved to _commonInitializationWithFrameName
https://bugs.webkit.org/show_bug.cgi?id=138572
-and corresponding-
rdar://problem/18929733
Reviewed by Tim Horton.
* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:]):
(-[WebView _initWithFrame:frameName:groupName:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (175820 => 175821)
--- trunk/Source/WebKit/mac/ChangeLog 2014-11-10 20:18:32 UTC (rev 175820)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-11-10 20:25:13 UTC (rev 175821)
@@ -1,5 +1,18 @@
2014-11-10 Beth Dakin <[email protected]>
+ Action menu initialization should be moved to _commonInitializationWithFrameName
+ https://bugs.webkit.org/show_bug.cgi?id=138572
+ -and corresponding-
+ rdar://problem/18929733
+
+ Reviewed by Tim Horton.
+
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+ (-[WebView _initWithFrame:frameName:groupName:]):
+
+2014-11-10 Beth Dakin <[email protected]>
+
WK1: Support default actions for read-only text
https://bugs.webkit.org/show_bug.cgi?id=138552
-and corresponding-
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (175820 => 175821)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-11-10 20:18:32 UTC (rev 175820)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-11-10 20:25:13 UTC (rev 175821)
@@ -869,6 +869,12 @@
[frameView release];
#if !PLATFORM(IOS)
+ if ([self respondsToSelector:@selector(setActionMenu:)]) {
+ RetainPtr<NSMenu> actionMenu = adoptNS([[NSMenu alloc] init]);
+ self.actionMenu = actionMenu.get();
+ _private->actionMenuController = [[WebActionMenuController alloc] initWithWebView:self];
+ }
+
static bool didOneTimeInitialization = false;
#endif
if (!didOneTimeInitialization) {
@@ -1063,12 +1069,6 @@
[self setMaintainsBackForwardList: YES];
#if !PLATFORM(IOS)
_private->page->setDeviceScaleFactor([self _deviceScaleFactor]);
-
- if ([self respondsToSelector:@selector(setActionMenu:)]) {
- RetainPtr<NSMenu> actionMenu = adoptNS([[NSMenu alloc] init]);
- self.actionMenu = actionMenu.get();
- _private->actionMenuController = [[WebActionMenuController alloc] initWithWebView:self];
- }
#endif
return self;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
