From 81bc750723a18f21cd17d1b173cd2a4dda9cea6e Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 24 May 2011 11:24:40 +0100 Subject: Merge WebKit at r80534: Intial merge by Git Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61 --- Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h') diff --git a/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h b/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h index 788fd20..fda5219 100644 --- a/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h +++ b/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h @@ -38,22 +38,22 @@ class WebPageProxy; class WebPopupMenuProxyMac : public WebPopupMenuProxy { public: - static PassRefPtr create(WKView* webView, WebPopupMenuProxy::Client* client) + static PassRefPtr create(WKView *webView, WebPopupMenuProxy::Client* client) { return adoptRef(new WebPopupMenuProxyMac(webView, client)); } ~WebPopupMenuProxyMac(); - virtual void showPopupMenu(const WebCore::IntRect&, WebCore::TextDirection, const Vector&, const PlatformPopupMenuData&, int32_t selectedIndex); + virtual void showPopupMenu(const WebCore::IntRect&, WebCore::TextDirection, double scaleFactor, const Vector&, const PlatformPopupMenuData&, int32_t selectedIndex); virtual void hidePopupMenu(); private: - WebPopupMenuProxyMac(WKView*, WebPopupMenuProxy::Client* client); + WebPopupMenuProxyMac(WKView *, WebPopupMenuProxy::Client*); - void populate(const Vector&, WebCore::TextDirection); + void populate(const Vector&, NSFont *, WebCore::TextDirection); RetainPtr m_popup; - WKView* m_webView; + WKView *m_webView; }; } // namespace WebKit -- cgit v1.1