1 files changed, 12 insertions, 13 deletions

diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_window_features_private.h b/Source/WebKit2/UIProcess/API/efl/ewk_window_features_private.h
index c6bf89232..8ae6c90c1 100644
--- a/Source/WebKit2/UIProcess/API/efl/ewk_window_features_private.h
+++ b/Source/WebKit2/UIProcess/API/efl/ewk_window_features_private.h
@@ -26,26 +26,24 @@
 #ifndef ewk_window_features_private_h
 #define ewk_window_features_private_h
 
-#include "EwkViewImpl.h"
-#include "ImmutableDictionary.h"
-#include "WindowFeatures.h"
 #include "ewk_object_private.h"
-#include <WebCore/FloatRect.h>
+#include <Evas.h>
+#include <WebKit2/WKBase.h>
 #include <wtf/RefCounted.h>
 
-class EwkViewImpl;
+class EwkView;
 
 class EwkWindowFeatures : public EwkObject {
 public:
     EWK_OBJECT_DECLARE(EwkWindowFeatures)
 
-    static PassRefPtr<EwkWindowFeatures> create(WebKit::ImmutableDictionary* windowFeatures, EwkViewImpl* viewImpl)
+    static PassRefPtr<EwkWindowFeatures> create(WKDictionaryRef windowFeatures, EwkView* viewImpl)
     {
         return adoptRef(new EwkWindowFeatures(windowFeatures, viewImpl));
     }
 
-    WebCore::FloatRect geometry() const { return m_geometry; }
-    void setGeometry(WebCore::FloatRect& geometry) { m_geometry = geometry; }
+    const Evas_Coord_Rectangle& geometry() const { return m_geometry; }
+    void setGeometry(const Evas_Coord_Rectangle& geometry) { m_geometry = geometry; }
 
     bool toolbarVisible() const { return m_toolbarVisible; }
     void setToolbarVisible(bool toolbarVisible);
@@ -69,13 +67,14 @@ public:
     void setFullScreen(bool fullScreen) { m_fullScreen = fullScreen; }
 
 private:
-    EwkWindowFeatures(WebKit::ImmutableDictionary* windowFeatures, EwkViewImpl* viewImpl);
-    template <typename T1, typename T2>
-    static T1 getWindowFeatureValue(WebKit::ImmutableDictionary* windowFeatures, const String& featureName);
+    EwkWindowFeatures(WKDictionaryRef windowFeatures, EwkView* viewImpl);
 
-    EwkViewImpl* m_viewImpl;
+    static bool getWindowFeatureBoolValue(WKDictionaryRef windowFeatures, const char* featureName, bool defaultValue);
+    static double getWindowFeatureDoubleValue(WKDictionaryRef windowFeatures, const char* featureName, double defaultValue);
 
-    WebCore::FloatRect m_geometry;
+    EwkView* m_view;
+
+    Evas_Coord_Rectangle m_geometry;
     bool m_toolbarVisible;
     bool m_statusBarVisible;
     bool m_scrollbarsVisible;