diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h')
| -rw-r--r-- | Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h b/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h index 85339d6..788fd20 100644 --- a/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h +++ b/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h @@ -29,13 +29,8 @@ #include "WebPopupMenuProxy.h" #include <wtf/RetainPtr.h> -#ifdef __OBJC__ -@class NSPopUpButtonCell; -@class WKView; -#else -class NSPopUpButtonCell; -class WKView; -#endif +OBJC_CLASS NSPopUpButtonCell; +OBJC_CLASS WKView; namespace WebKit { @@ -49,13 +44,13 @@ public: } ~WebPopupMenuProxyMac(); - virtual void showPopupMenu(const WebCore::IntRect&, const Vector<WebPopupItem>&, const PlatformPopupMenuData&, int32_t selectedIndex); + virtual void showPopupMenu(const WebCore::IntRect&, WebCore::TextDirection, const Vector<WebPopupItem>&, const PlatformPopupMenuData&, int32_t selectedIndex); virtual void hidePopupMenu(); private: WebPopupMenuProxyMac(WKView*, WebPopupMenuProxy::Client* client); - void populate(const Vector<WebPopupItem>&); + void populate(const Vector<WebPopupItem>&, WebCore::TextDirection); RetainPtr<NSPopUpButtonCell> m_popup; WKView* m_webView; |