1 files changed, 15 insertions, 15 deletions
diff --git a/Tools/WebKitTestRunner/PlatformWebView.h b/Tools/WebKitTestRunner/PlatformWebView.h
index 14b660cf0..fa8d1236c 100644
--- a/Tools/WebKitTestRunner/PlatformWebView.h
+++ b/Tools/WebKitTestRunner/PlatformWebView.h
@@ -26,8 +26,7 @@
 #ifndef PlatformWebView_h
 #define PlatformWebView_h
 
-#include "ViewOptions.h"
-#include <WebKit/WKRetainPtr.h>
+#include <WebKit2/WKRetainPtr.h>
 
 #if defined(__APPLE__) && __APPLE__
 #ifdef __OBJC__
@@ -44,6 +43,12 @@ typedef struct _GtkWidget GtkWidget;
 typedef WKViewRef PlatformWKView;
 typedef GtkWidget* PlatformWindow;
 #elif PLATFORM(EFL)
+typedef struct _Ecore_Evas Ecore_Evas;
+#if USE(EO)
+typedef struct _Eo_Opaque Evas_Object;
+#else
+typedef struct _Evas_Object Evas_Object;
+#endif
 typedef Evas_Object* PlatformWKView;
 typedef Ecore_Evas* PlatformWindow;
 #endif
@@ -52,7 +57,7 @@ namespace WTR {
 
 class PlatformWebView {
 public:
-    PlatformWebView(WKContextRef, WKPageGroupRef, WKPageRef relatedPage, const ViewOptions&);
+    PlatformWebView(WKContextRef, WKPageGroupRef, WKPageRef relatedPage, WKDictionaryRef options = 0);
     ~PlatformWebView();
 
     WKPageRef page();
@@ -75,25 +80,20 @@ public:
     void setWindowIsKey(bool isKey) { m_windowIsKey = isKey; }
     bool windowIsKey() const { return m_windowIsKey; }
 
-    bool viewSupportsOptions(const ViewOptions&) const;
+#if PLATFORM(MAC) || PLATFORM(EFL)
+    bool viewSupportsOptions(WKDictionaryRef) const;
+#else
+    bool viewSupportsOptions(WKDictionaryRef) const { return true; }
+#endif
 
     WKRetainPtr<WKImageRef> windowSnapshotImage();
-    const ViewOptions& options() const { return m_options; }
-
-    void changeWindowScaleIfNeeded(float newScale);
-
-#if PLATFORM(GTK)
-    void dismissAllPopupMenus();
-#endif
+    WKDictionaryRef options() const { return m_options.get(); }
 
 private:
-    void forceWindowFramesChanged();
-
     PlatformWKView m_view;
     PlatformWindow m_window;
     bool m_windowIsKey;
-    const ViewOptions m_options;
-
+    WKRetainPtr<WKDictionaryRef> m_options;
 #if PLATFORM(EFL)
     bool m_usingFixedLayout;
 #endif