Merge WebKit at r71558: Initial merge by git.

Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c

6 files changed, 60 insertions, 20 deletions

diff --git a/WebKit/gtk/webkit/webkitprivate.h b/WebKit/gtk/webkit/webkitprivate.h
index 261c437..3ac3563 100644
--- a/WebKit/gtk/webkit/webkitprivate.h
+++ b/WebKit/gtk/webkit/webkitprivate.h
@@ -278,6 +278,9 @@ extern "C" {
     void
     webkit_web_view_add_resource(WebKitWebView*, const char*, WebKitWebResource*);
 
+    void
+    webkit_web_view_remove_resource(WebKitWebView*, const char*);
+
     WebKitWebResource*
     webkit_web_view_get_resource(WebKitWebView*, char*);
 
diff --git a/WebKit/gtk/webkit/webkitwebbackforwardlist.cpp b/WebKit/gtk/webkit/webkitwebbackforwardlist.cpp
index c5913fd..9b5bf8b 100644
--- a/WebKit/gtk/webkit/webkitwebbackforwardlist.cpp
+++ b/WebKit/gtk/webkit/webkitwebbackforwardlist.cpp
@@ -19,17 +19,15 @@
  */
 
 #include "config.h"
-
 #include "webkitwebbackforwardlist.h"
+
+#include "BackForwardListImpl.h"
+#include "HistoryItem.h"
 #include "webkitprivate.h"
 #include "webkitwebhistoryitem.h"
 #include "webkitwebview.h"
-
 #include <glib.h>
 
-#include "BackForwardListImpl.h"
-#include "HistoryItem.h"
-
 /**
  * SECTION:webkitwebbackforwardlist
  * @short_description: The history of a #WebKitWebView
@@ -115,7 +113,7 @@ WebKitWebBackForwardList* webkit_web_back_forward_list_new_with_web_view(WebKitW
     webBackForwardList = WEBKIT_WEB_BACK_FORWARD_LIST(g_object_new(WEBKIT_TYPE_WEB_BACK_FORWARD_LIST, NULL));
     WebKitWebBackForwardListPrivate* priv = webBackForwardList->priv;
 
-    priv->backForwardList = static_cast<BackForwardListImpl*>(core(webView)->backForwardList());
+    priv->backForwardList = static_cast<WebCore::BackForwardListImpl*>(core(webView)->backForwardList());
     priv->backForwardList->setEnabled(TRUE);
 
     return webBackForwardList;
diff --git a/WebKit/gtk/webkit/webkitwebframe.cpp b/WebKit/gtk/webkit/webkitwebframe.cpp
index c581ce6..63a2413 100644
--- a/WebKit/gtk/webkit/webkitwebframe.cpp
+++ b/WebKit/gtk/webkit/webkitwebframe.cpp
@@ -480,7 +480,7 @@ G_CONST_RETURN gchar* webkit_web_frame_get_name(WebKitWebFrame* frame)
     if (!coreFrame)
         return "";
 
-    String string = coreFrame->tree()->name();
+    String string = coreFrame->tree()->uniqueName();
     priv->name = g_strdup(string.utf8().data());
     return priv->name;
 }
@@ -1059,11 +1059,7 @@ void webkit_web_frame_suspend_animations(WebKitWebFrame* frame)
     if (!coreFrame)
         return;
 
-    AnimationController* controller = coreFrame->animation();
-    if (!controller)
-        return;
-
-    controller->suspendAnimations(coreFrame->document());
+    coreFrame->animation()->suspendAnimations();
 }
 
 void webkit_web_frame_resume_animations(WebKitWebFrame* frame)
@@ -1072,11 +1068,7 @@ void webkit_web_frame_resume_animations(WebKitWebFrame* frame)
     if (!coreFrame)
         return;
 
-    AnimationController* controller = coreFrame->animation();
-    if (!controller)
-        return;
-
-    controller->resumeAnimations(coreFrame->document());
+    coreFrame->animation()->resumeAnimations();
 }
 
 gchar* webkit_web_frame_get_response_mime_type(WebKitWebFrame* frame)
diff --git a/WebKit/gtk/webkit/webkitwebsettings.cpp b/WebKit/gtk/webkit/webkitwebsettings.cpp
index cd59bdb..2661b82 100644
--- a/WebKit/gtk/webkit/webkitwebsettings.cpp
+++ b/WebKit/gtk/webkit/webkitwebsettings.cpp
@@ -689,6 +689,7 @@ static void webkit_web_settings_class_init(WebKitWebSettingsClass* klass)
 
     COMPILE_ASSERT(static_cast<int>(WEBKIT_EDITING_BEHAVIOR_MAC) == static_cast<int>(WebCore::EditingMacBehavior), editing_behavior_type_mac_match);
     COMPILE_ASSERT(static_cast<int>(WEBKIT_EDITING_BEHAVIOR_WINDOWS) == static_cast<int>(WebCore::EditingWindowsBehavior), editing_behavior_type_windows_match);
+    COMPILE_ASSERT(static_cast<int>(WEBKIT_EDITING_BEHAVIOR_UNIX) == static_cast<int>(WebCore::EditingUnixBehavior), editing_behavior_type_unix_match);
 
     /**
     * WebKitWebSettings:editing-behavior
@@ -713,7 +714,7 @@ static void webkit_web_settings_class_init(WebKitWebSettingsClass* klass)
                                                       _("Editing behavior"),
                                                       _("The behavior mode to use in editing mode"),
                                                       WEBKIT_TYPE_EDITING_BEHAVIOR,
-                                                      WEBKIT_EDITING_BEHAVIOR_MAC,
+                                                      WEBKIT_EDITING_BEHAVIOR_UNIX,
                                                       flags));
 
     /**
diff --git a/WebKit/gtk/webkit/webkitwebsettings.h b/WebKit/gtk/webkit/webkitwebsettings.h
index d8dafd9..eee0d04 100644
--- a/WebKit/gtk/webkit/webkitwebsettings.h
+++ b/WebKit/gtk/webkit/webkitwebsettings.h
@@ -36,7 +36,8 @@ G_BEGIN_DECLS
 
 typedef enum {
     WEBKIT_EDITING_BEHAVIOR_MAC,
-    WEBKIT_EDITING_BEHAVIOR_WINDOWS
+    WEBKIT_EDITING_BEHAVIOR_WINDOWS,
+    WEBKIT_EDITING_BEHAVIOR_UNIX
 } WebKitEditingBehavior;
 
 typedef struct _WebKitWebSettingsPrivate WebKitWebSettingsPrivate;
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index a295fce..314da16 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -43,7 +43,7 @@
 #include "AXObjectCache.h"
 #include "AbstractDatabase.h"
 #include "BackForwardListImpl.h"
-#include "Cache.h"
+#include "MemoryCache.h"
 #include "ChromeClientGtk.h"
 #include "ClipboardUtilitiesGtk.h"
 #include "ContextMenuClientGtk.h"
@@ -868,6 +868,7 @@ static gboolean webkit_web_view_scroll_event(GtkWidget* widget, GdkEventScroll*
     return frame->eventHandler()->handleWheelEvent(wheelEvent);
 }
 
+#ifdef GTK_API_VERSION_2
 static void webkit_web_view_size_request(GtkWidget* widget, GtkRequisition* requisition)
 {
     WebKitWebView* web_view = WEBKIT_WEB_VIEW(widget);
@@ -882,6 +883,35 @@ static void webkit_web_view_size_request(GtkWidget* widget, GtkRequisition* requ
     requisition->width = view->contentsWidth();
     requisition->height = view->contentsHeight();
 }
+#else
+static void webkit_web_view_get_preferred_width(GtkWidget* widget, gint* minimum, gint* natural)
+{
+    WebKitWebView* web_view = WEBKIT_WEB_VIEW(widget);
+    Frame* coreFrame = core(webkit_web_view_get_main_frame(web_view));
+    if (!coreFrame)
+        return;
+
+    FrameView* view = coreFrame->view();
+    if (!view)
+        return;
+
+    *minimum = *natural = view->contentsWidth();
+}
+
+static void webkit_web_view_get_preferred_height(GtkWidget* widget, gint* minimum, gint* natural)
+{
+    WebKitWebView* web_view = WEBKIT_WEB_VIEW(widget);
+    Frame* coreFrame = core(webkit_web_view_get_main_frame(web_view));
+    if (!coreFrame)
+        return;
+
+    FrameView* view = coreFrame->view();
+    if (!view)
+        return;
+
+    *minimum = *natural = view->contentsHeight();
+}
+#endif
 
 static void webkit_web_view_size_allocate(GtkWidget* widget, GtkAllocation* allocation)
 {
@@ -2602,7 +2632,12 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass)
     widgetClass->motion_notify_event = webkit_web_view_motion_event;
     widgetClass->scroll_event = webkit_web_view_scroll_event;
     widgetClass->size_allocate = webkit_web_view_size_allocate;
+#ifdef GTK_API_VERSION_2
     widgetClass->size_request = webkit_web_view_size_request;
+#else
+    widgetClass->get_preferred_width = webkit_web_view_get_preferred_width;
+    widgetClass->get_preferred_height = webkit_web_view_get_preferred_height;
+#endif
     widgetClass->popup_menu = webkit_web_view_popup_menu_handler;
     widgetClass->grab_focus = webkit_web_view_grab_focus;
     widgetClass->focus_in_event = webkit_web_view_focus_in_event;
@@ -4612,6 +4647,16 @@ void webkit_web_view_add_resource(WebKitWebView* webView, const char* identifier
     g_hash_table_insert(priv->subResources.get(), g_strdup(identifier), webResource);
 }
 
+void webkit_web_view_remove_resource(WebKitWebView* webView, const char* identifier)
+{
+    WebKitWebViewPrivate* priv = webView->priv;
+    if (g_str_equal(identifier, priv->mainResourceIdentifier.data())) {
+        priv->mainResourceIdentifier = "";
+        priv->mainResource = 0;
+    } else
+      g_hash_table_remove(priv->subResources.get(), identifier);
+}
+
 WebKitWebResource* webkit_web_view_get_resource(WebKitWebView* webView, char* identifier)
 {
     WebKitWebViewPrivate* priv = webView->priv;