Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)

1 files changed, 52 insertions, 23 deletions

diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h b/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h
index fb4c48a2d..c56205b96 100644
--- a/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h
+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h
@@ -28,17 +28,21 @@
 #ifndef WebKitWebView_h
 #define WebKitWebView_h
 
+#include <JavaScriptCore/JSBase.h>
 #include <webkit2/WebKitBackForwardList.h>
 #include <webkit2/WebKitDefines.h>
+#include <webkit2/WebKitFileChooserRequest.h>
 #include <webkit2/WebKitFindController.h>
 #include <webkit2/WebKitHitTestResult.h>
+#include <webkit2/WebKitJavascriptResult.h>
+#include <webkit2/WebKitPolicyDecision.h>
 #include <webkit2/WebKitScriptDialog.h>
 #include <webkit2/WebKitSettings.h>
 #include <webkit2/WebKitURIRequest.h>
 #include <webkit2/WebKitWebContext.h>
+#include <webkit2/WebKitWebResource.h>
 #include <webkit2/WebKitWebViewBase.h>
 #include <webkit2/WebKitWindowProperties.h>
-#include <webkit2/WebKitPolicyDecision.h>
 
 G_BEGIN_DECLS
 
@@ -121,28 +125,35 @@ struct _WebKitWebView {
 struct _WebKitWebViewClass {
     WebKitWebViewBaseClass parent;
 
-    void       (* load_changed)         (WebKitWebView             *web_view,
-                                         WebKitLoadEvent            load_event);
-    gboolean   (* load_failed)          (WebKitWebView             *web_view,
-                                         WebKitLoadEvent            load_event,
-                                         const gchar               *failing_uri,
-                                         GError                    *error);
-
-    GtkWidget *(* create)               (WebKitWebView             *web_view);
-    void       (* ready_to_show)        (WebKitWebView             *web_view);
-    void       (* close)                (WebKitWebView             *web_view);
-
-    gboolean   (* script_dialog)        (WebKitWebView             *web_view,
-                                         WebKitScriptDialog        *dialog);
-
-    gboolean   (* decide_policy)        (WebKitWebView             *web_view,
-                                         WebKitPolicyDecision      *decision,
-                                         WebKitPolicyDecisionType   type);
-    void       (* mouse_target_changed) (WebKitWebView             *web_view,
-                                         WebKitHitTestResult       *hit_test_result,
-                                         guint                      modifiers);
-    gboolean   (* print_requested)      (WebKitWebView             *web_view,
-                                         WebKitPrintOperation      *print_operation);
+    void       (* load_changed)          (WebKitWebView             *web_view,
+                                          WebKitLoadEvent            load_event);
+    gboolean   (* load_failed)           (WebKitWebView             *web_view,
+                                          WebKitLoadEvent            load_event,
+                                          const gchar               *failing_uri,
+                                          GError                    *error);
+
+    GtkWidget *(* create)                (WebKitWebView             *web_view);
+    void       (* ready_to_show)         (WebKitWebView             *web_view);
+    void       (* close)                 (WebKitWebView             *web_view);
+
+    gboolean   (* script_dialog)         (WebKitWebView             *web_view,
+                                          WebKitScriptDialog        *dialog);
+
+    gboolean   (* decide_policy)         (WebKitWebView             *web_view,
+                                          WebKitPolicyDecision      *decision,
+                                          WebKitPolicyDecisionType   type);
+    void       (* mouse_target_changed)  (WebKitWebView             *web_view,
+                                          WebKitHitTestResult       *hit_test_result,
+                                          guint                      modifiers);
+    gboolean   (* print_requested)       (WebKitWebView             *web_view,
+                                          WebKitPrintOperation      *print_operation);
+    void       (* resource_load_started) (WebKitWebView             *web_view,
+                                          WebKitWebResource         *resource,
+                                          WebKitURIRequest          *request);
+    gboolean   (* enter_fullscreen)      (WebKitWebView             *web_view);
+    gboolean   (* leave_fullscreen)      (WebKitWebView             *web_view);
+    gboolean   (* run_file_chooser)      (WebKitWebView             *web_view,
+                                          WebKitFileChooserRequest  *request);
 
     /* Padding for future expansion */
     void (*_webkit_reserved0) (void);
@@ -267,6 +278,24 @@ webkit_web_view_execute_editing_command            (WebKitWebView             *w
 WEBKIT_API WebKitFindController *
 webkit_web_view_get_find_controller                (WebKitWebView             *web_view);
 
+WEBKIT_API JSGlobalContextRef
+webkit_web_view_get_javascript_global_context      (WebKitWebView             *web_view);
+
+WEBKIT_API void
+webkit_web_view_run_javascript                     (WebKitWebView             *web_view,
+                                                    const gchar               *script,
+                                                    GAsyncReadyCallback        callback,
+                                                    gpointer                   user_data);
+WEBKIT_API WebKitJavascriptResult *
+webkit_web_view_run_javascript_finish              (WebKitWebView             *web_view,
+                                                    GAsyncResult              *result,
+                                                    GError                   **error);
+
+WEBKIT_API WebKitWebResource *
+webkit_web_view_get_main_resource                  (WebKitWebView             *web_view);
+
+WEBKIT_API GList *
+webkit_web_view_get_subresources                   (WebKitWebView             *web_view);
 G_END_DECLS
 
 #endif