Title: [150044] trunk/Source
- Revision
- 150044
- Author
- [email protected]
- Date
- 2013-05-13 16:17:59 -0700 (Mon, 13 May 2013)
Log Message
Remove ChromeClient::willPopupMenu
https://bugs.webkit.org/show_bug.cgi?id=116063
Reviewed by Andreas Kling.
Source/WebCore:
Remove ChromeClient::willPopupMenu.
* page/ChromeClient.h:
Source/WebKit/mac:
ChromeClient::willPopupMenu is only called in one place from WebKit, so just move the function to the call site.
* WebCoreSupport/PopupMenuMac.mm:
(PopupMenuMac::show):
* WebCoreSupport/WebChromeClient.h:
* WebCoreSupport/WebChromeClient.mm:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (150043 => 150044)
--- trunk/Source/WebCore/ChangeLog 2013-05-13 23:16:01 UTC (rev 150043)
+++ trunk/Source/WebCore/ChangeLog 2013-05-13 23:17:59 UTC (rev 150044)
@@ -1,3 +1,14 @@
+2013-05-13 Anders Carlsson <[email protected]>
+
+ Remove ChromeClient::willPopupMenu
+ https://bugs.webkit.org/show_bug.cgi?id=116063
+
+ Reviewed by Andreas Kling.
+
+ Remove ChromeClient::willPopupMenu.
+
+ * page/ChromeClient.h:
+
2013-05-13 Beth Dakin <[email protected]>
Headers and footers should be pinned to the left edge of the window when scrolling
Modified: trunk/Source/WebCore/page/ChromeClient.h (150043 => 150044)
--- trunk/Source/WebCore/page/ChromeClient.h 2013-05-13 23:16:01 UTC (rev 150043)
+++ trunk/Source/WebCore/page/ChromeClient.h 2013-05-13 23:17:59 UTC (rev 150044)
@@ -44,10 +44,7 @@
#include "DatabaseDetails.h"
#endif
-#ifndef __OBJC__
-class NSMenu;
-class NSResponder;
-#endif
+OBJC_CLASS NSResponder;
namespace WebCore {
@@ -313,7 +310,6 @@
virtual void makeFirstResponder(NSResponder *) { }
// Focuses on the containing view associated with this page.
virtual void makeFirstResponder() { }
- virtual void willPopUpMenu(NSMenu *) { }
#endif
virtual void enableSuddenTermination() { }
Modified: trunk/Source/WebKit/mac/ChangeLog (150043 => 150044)
--- trunk/Source/WebKit/mac/ChangeLog 2013-05-13 23:16:01 UTC (rev 150043)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-05-13 23:17:59 UTC (rev 150044)
@@ -1,3 +1,17 @@
+2013-05-13 Anders Carlsson <[email protected]>
+
+ Remove ChromeClient::willPopupMenu
+ https://bugs.webkit.org/show_bug.cgi?id=116063
+
+ Reviewed by Andreas Kling.
+
+ ChromeClient::willPopupMenu is only called in one place from WebKit, so just move the function to the call site.
+
+ * WebCoreSupport/PopupMenuMac.mm:
+ (PopupMenuMac::show):
+ * WebCoreSupport/WebChromeClient.h:
+ * WebCoreSupport/WebChromeClient.mm:
+
2013-05-12 Timothy Hatcher <[email protected]>
Add support for updating the Web Inspector toolbar height.
Modified: trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm (150043 => 150044)
--- trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm 2013-05-13 23:16:01 UTC (rev 150043)
+++ trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm 2013-05-13 23:17:59 UTC (rev 150044)
@@ -20,8 +20,11 @@
#import "PopupMenuMac.h"
+#import "WebDelegateImplementationCaching.h"
+#import "WebFrameInternal.h"
#import <WebCore/IntRect.h>
#import <WebCore/AXObjectCache.h>
+#import <WebCore/BlockExceptions.h>
#import <WebCore/Chrome.h>
#import <WebCore/ChromeClient.h>
#import <WebCore/EventHandler.h>
@@ -178,8 +181,13 @@
[view addSubview:dummyView.get()];
location = [dummyView convertPoint:location fromView:view];
- if (Page* page = frame->page())
- page->chrome()->client()->willPopUpMenu(menu);
+ if (Page* page = frame->page()) {
+ WebView* webView = kit(page);
+ BEGIN_BLOCK_OBJC_EXCEPTIONS;
+ CallUIDelegate(webView, @selector(webView:willPopupMenu:), menu);
+ END_BLOCK_OBJC_EXCEPTIONS;
+ }
+
wkPopupMenu(menu, location, roundf(NSWidth(r)), dummyView.get(), index, font);
[m_popup dismissPopUp];
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h (150043 => 150044)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2013-05-13 23:16:01 UTC (rev 150043)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2013-05-13 23:17:59 UTC (rev 150044)
@@ -135,8 +135,6 @@
virtual NSResponder *firstResponder() OVERRIDE;
virtual void makeFirstResponder(NSResponder *) OVERRIDE;
- virtual void willPopUpMenu(NSMenu *) OVERRIDE;
-
virtual void enableSuddenTermination() OVERRIDE;
virtual void disableSuddenTermination() OVERRIDE;
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (150043 => 150044)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2013-05-13 23:16:01 UTC (rev 150043)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2013-05-13 23:17:59 UTC (rev 150044)
@@ -807,13 +807,6 @@
END_BLOCK_OBJC_EXCEPTIONS;
}
-void WebChromeClient::willPopUpMenu(NSMenu *menu)
-{
- BEGIN_BLOCK_OBJC_EXCEPTIONS;
- CallUIDelegate(m_webView, @selector(webView:willPopupMenu:), menu);
- END_BLOCK_OBJC_EXCEPTIONS;
-}
-
void WebChromeClient::enableSuddenTermination()
{
[[NSProcessInfo processInfo] enableSuddenTermination];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
