diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h')
| -rw-r--r-- | Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h | 10 |
1 files changed, 5 insertions, 5 deletions
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<WebPopupMenuProxyMac> create(WKView* webView, WebPopupMenuProxy::Client* client) + static PassRefPtr<WebPopupMenuProxyMac> create(WKView *webView, WebPopupMenuProxy::Client* client) { return adoptRef(new WebPopupMenuProxyMac(webView, client)); } ~WebPopupMenuProxyMac(); - virtual void showPopupMenu(const WebCore::IntRect&, WebCore::TextDirection, const Vector<WebPopupItem>&, const PlatformPopupMenuData&, int32_t selectedIndex); + virtual void showPopupMenu(const WebCore::IntRect&, WebCore::TextDirection, double scaleFactor, const Vector<WebPopupItem>&, const PlatformPopupMenuData&, int32_t selectedIndex); virtual void hidePopupMenu(); private: - WebPopupMenuProxyMac(WKView*, WebPopupMenuProxy::Client* client); + WebPopupMenuProxyMac(WKView *, WebPopupMenuProxy::Client*); - void populate(const Vector<WebPopupItem>&, WebCore::TextDirection); + void populate(const Vector<WebPopupItem>&, NSFont *, WebCore::TextDirection); RetainPtr<NSPopUpButtonCell> m_popup; - WKView* m_webView; + WKView *m_webView; }; } // namespace WebKit |