From 2fc2651226baac27029e38c9d6ef883fa32084db Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Wed, 18 May 2011 13:36:51 +0100
Subject: Merge WebKit at r78450: Initial merge by git.

Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
---
 Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h | 13 ++++---------
 1 file changed, 4 insertions(+), 9 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 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;
-- 
cgit v1.1