1 files changed, 38 insertions, 12 deletions

diff --git a/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.h b/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.h
index 2c061c4e6..545c5ab68 100644
--- a/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.h
+++ b/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.h
@@ -22,6 +22,7 @@
 #define EwkViewImpl_h
 
 #include "EwkViewCallbacks.h"
+#include "ImmutableDictionary.h"
 #include "RefPtrEfl.h"
 #include "WKEinaSharedString.h"
 #include "WKGeometry.h"
@@ -46,6 +47,7 @@
 #endif
 
 namespace WebKit {
+class ContextMenuClientEfl;
 class FindClientEfl;
 class FormClientEfl;
 class InputMethodContextEfl;
@@ -54,6 +56,8 @@ class PageLoadClientEfl;
 class PagePolicyClientEfl;
 class PageUIClientEfl;
 class ResourceLoadClientEfl;
+class WebContextMenuItemData;
+class WebContextMenuProxyEfl;
 class WebPageGroup;
 class WebPageProxy;
 class WebPopupItem;
@@ -62,6 +66,10 @@ class WebPopupMenuProxyEfl;
 #if ENABLE(VIBRATION)
 class VibrationClientEfl;
 #endif
+
+#if USE(COORDINATED_GRAPHICS)
+class LayerTreeRenderer;
+#endif
 }
 
 namespace WebCore {
@@ -72,10 +80,12 @@ class IntSize;
 }
 
 class EwkContext;
-class Ewk_Back_Forward_List;
-class Ewk_Color_Picker;
-class Ewk_Popup_Menu;
-class Ewk_Settings;
+class EwkBackForwardList;
+class EwkColorPicker;
+class EwkContextMenu;
+class EwkPopupMenu;
+class EwkSettings;
+class EwkWindowFeatures;
 
 #if USE(ACCELERATED_COMPOSITING)
 typedef struct _Evas_GL_Context Evas_GL_Context;
@@ -100,8 +110,9 @@ public:
     WKPageRef wkPage();
     WebKit::WebPageProxy* page() { return m_pageProxy.get(); }
     EwkContext* ewkContext() { return m_context.get(); }
-    Ewk_Settings* settings() { return m_settings.get(); }
-    Ewk_Back_Forward_List* backForwardList() { return m_backForwardList.get(); }
+    EwkSettings* settings() { return m_settings.get(); }
+    EwkBackForwardList* backForwardList() { return m_backForwardList.get(); }
+    EwkWindowFeatures* windowFeatures();
 
     WebCore::IntSize size() const;
     bool isFocused() const;
@@ -156,11 +167,14 @@ public:
     void dismissColorPicker();
 #endif
 
-    WKPageRef createNewPage();
+    WKPageRef createNewPage(WebKit::ImmutableDictionary* windowFeatures);
     void closePage();
 
     void requestPopupMenu(WebKit::WebPopupMenuProxyEfl*, const WebCore::IntRect&, WebCore::TextDirection, double pageScaleFactor, const Vector<WebKit::WebPopupItem>& items, int32_t selectedIndex);
     void closePopupMenu();
+    
+    void showContextMenu(WebKit::WebContextMenuProxyEfl*, const WebCore::IntPoint& position, const Vector<WebKit::WebContextMenuItemData>& items);
+    void hideContextMenu();
 
     void updateTextInputState();
 
@@ -199,10 +213,17 @@ public:
     // FIXME: needs refactoring (split callback invoke)
     void informURLChange();
 
+    bool isHardwareAccelerated() const { return m_isHardwareAccelerated; }
+    void setDrawsBackground(bool enable) { m_setDrawsBackground = enable; }
+
 private:
     inline Ewk_View_Smart_Data* smartData() const;
     void displayTimerFired(WebCore::Timer<EwkViewImpl>*);
 
+#if USE(COORDINATED_GRAPHICS)
+    WebKit::LayerTreeRenderer* layerTreeRenderer();
+#endif
+
     void informIconChange();
 
     static void onMouseDown(void* data, Evas*, Evas_Object*, void* eventInfo);
@@ -230,18 +251,20 @@ private:
     OwnPtr<WebKit::PagePolicyClientEfl> m_pagePolicyClient;
     OwnPtr<WebKit::PageUIClientEfl> m_pageUIClient;
     OwnPtr<WebKit::ResourceLoadClientEfl> m_resourceLoadClient;
+    OwnPtr<WebKit::ContextMenuClientEfl> m_contextMenuClient;
     OwnPtr<WebKit::FindClientEfl> m_findClient;
     OwnPtr<WebKit::FormClientEfl> m_formClient;
 #if ENABLE(VIBRATION)
     OwnPtr<WebKit::VibrationClientEfl> m_vibrationClient;
 #endif
-    OwnPtr<Ewk_Back_Forward_List> m_backForwardList;
+    OwnPtr<EwkBackForwardList> m_backForwardList;
 #if USE(TILED_BACKING_STORE)
     float m_scaleFactor;
     WebCore::IntPoint m_scrollPosition;
 #endif
-    OwnPtr<Ewk_Settings> m_settings;
-    const char* m_cursorGroup; // This is an address, do not free it or use WKEinaSharedString.
+    OwnPtr<EwkSettings> m_settings;
+    RefPtr<EwkWindowFeatures> m_windowFeatures;
+    const void* m_cursorIdentifier; // This is an address, do not free it.
     WKEinaSharedString m_faviconURL;
     WKEinaSharedString m_url;
     mutable WKEinaSharedString m_title;
@@ -252,9 +275,12 @@ private:
     bool m_touchEventsEnabled;
 #endif
     WebCore::Timer<EwkViewImpl> m_displayTimer;
-    OwnPtr<Ewk_Popup_Menu> m_popupMenu;
+    OwnPtr<EwkContextMenu> m_contextMenu;
+    OwnPtr<EwkPopupMenu> m_popupMenu;
     OwnPtr<WebKit::InputMethodContextEfl> m_inputMethodContext;
-    OwnPtr<Ewk_Color_Picker> m_colorPicker;
+    OwnPtr<EwkColorPicker> m_colorPicker;
+    bool m_isHardwareAccelerated;
+    bool m_setDrawsBackground;
 };
 
 #endif // EwkViewImpl_h