webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 24 insertions, 7 deletions

diff --git a/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.h b/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.h
index 93a78a4d7..cfcc6c7dc 100644
--- a/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.h
+++ b/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.h
@@ -31,10 +31,14 @@ public:
     WebViewTest();
     virtual ~WebViewTest();
 
+    static bool shouldInitializeWebViewInConstructor;
+    void initializeWebView();
+
     virtual void loadURI(const char* uri);
     virtual void loadHtml(const char* html, const char* baseURI);
     virtual void loadPlainText(const char* plainText);
     virtual void loadRequest(WebKitURIRequest*);
+    virtual void loadBytes(GBytes*, const char* mimeType, const char* encoding, const char* baseURI);
     void loadAlternateHTML(const char* html, const char* contentURI, const char* baseURI);
     void goBack();
     void goForward();
@@ -52,10 +56,15 @@ public:
     void selectAll();
     const char* mainResourceData(size_t& mainResourceDataSize);
 
+    bool isEditable();
+    void setEditable(bool);
+
     void mouseMoveTo(int x, int y, unsigned mouseModifiers = 0);
     void clickMouseButton(int x, int y, unsigned button = 1, unsigned mouseModifiers = 0);
     void keyStroke(unsigned keyVal, unsigned keyModifiers = 0);
 
+    void emitPopupMenuSignal();
+
     WebKitJavascriptResult* runJavaScriptAndWaitUntilFinished(const char* javascript, GError**);
     WebKitJavascriptResult* runJavaScriptFromGResourceAndWaitUntilFinished(const char* resource, GError**);
 
@@ -70,16 +79,24 @@ public:
 
     bool runWebProcessTest(const char* suiteName, const char* testName);
 
-    WebKitWebView* m_webView;
+    // Prohibit overrides because this is called when the web view is created
+    // in our constructor, before a derived class's vtable is ready.
+    void initializeWebExtensions() final { Test::initializeWebExtensions(); }
+
+    static gboolean webProcessCrashed(WebKitWebView*, WebViewTest*);
+
+    GRefPtr<WebKitUserContentManager> m_userContentManager;
+    WebKitWebView* m_webView { nullptr };
     GMainLoop* m_mainLoop;
     CString m_activeURI;
-    GtkWidget* m_parentWindow;
+    GtkWidget* m_parentWindow { nullptr };
     CString m_expectedTitle;
-    WebKitJavascriptResult* m_javascriptResult;
-    GError** m_javascriptError;
-    GUniquePtr<char> m_resourceData;
-    size_t m_resourceDataSize;
-    cairo_surface_t* m_surface;
+    WebKitJavascriptResult* m_javascriptResult { nullptr };
+    GError** m_javascriptError { nullptr };
+    GUniquePtr<char> m_resourceData { nullptr };
+    size_t m_resourceDataSize { 0 };
+    cairo_surface_t* m_surface { nullptr };
+    bool m_expectedWebProcessCrash { false };
 
 private:
     void doMouseButtonEvent(GdkEventType, int, int, unsigned, unsigned);