Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a (http://svn.webkit.org/repository/webkit/trunk@110422)

This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API.

4 files changed, 17 insertions, 35 deletions

diff --git a/Source/WebKit2/UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp b/Source/WebKit2/UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp
index 5b5bf0242..a136008cd 100644
--- a/Source/WebKit2/UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp
+++ b/Source/WebKit2/UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp
@@ -29,6 +29,8 @@
 
 #include <WebCore/NotImplemented.h>
 
+using namespace WebCore;
+
 namespace WebKit {
 
 void WebFullScreenManagerProxy::invalidate()
@@ -46,37 +48,12 @@ void WebFullScreenManagerProxy::exitFullScreen()
     notImplemented();
 }
 
-void WebFullScreenManagerProxy::beganEnterFullScreenAnimation()
-{
-    notImplemented();
-}
-
-void WebFullScreenManagerProxy::finishedEnterFullScreenAnimation(bool completed)
-{
-    notImplemented();
-}
-
-void WebFullScreenManagerProxy::beganExitFullScreenAnimation()
-{
-    notImplemented();
-}
-
-void WebFullScreenManagerProxy::finishedExitFullScreenAnimation(bool completed)
-{
-    notImplemented();
-}
-
-void WebFullScreenManagerProxy::enterAcceleratedCompositingMode(const LayerTreeContext& context)
-{
-    notImplemented();
-}
-
-void WebFullScreenManagerProxy::exitAcceleratedCompositingMode()
+void WebFullScreenManagerProxy::beganEnterFullScreen(const IntRect& initialFrame, const IntRect& finalFrame)
 {
     notImplemented();
 }
 
-void WebFullScreenManagerProxy::getFullScreenRect(WebCore::IntRect& rect)
+void WebFullScreenManagerProxy::beganExitFullScreen(const IntRect& initialFrame, const IntRect& finalFrame)
 {
     notImplemented();
 }
diff --git a/Source/WebKit2/UIProcess/gtk/WebInspectorGtk.cpp b/Source/WebKit2/UIProcess/gtk/WebInspectorGtk.cpp
index 1be2a0000..3aaab77e2 100644
--- a/Source/WebKit2/UIProcess/gtk/WebInspectorGtk.cpp
+++ b/Source/WebKit2/UIProcess/gtk/WebInspectorGtk.cpp
@@ -110,6 +110,12 @@ void WebInspectorProxy::platformBringToFront()
     notImplemented();
 }
 
+bool WebInspectorProxy::platformIsFront()
+{
+    notImplemented();
+    return false;
+}
+
 void WebInspectorProxy::platformInspectedURLChanged(const String& url)
 {
     GOwnPtr<gchar> title(g_strdup_printf("%s - %s", _("Web Inspector"), url.utf8().data()));
diff --git a/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp b/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp
index 521cf5320..db94d6f33 100644
--- a/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp
+++ b/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp
@@ -41,7 +41,6 @@ WebPopupMenuProxyGtk::WebPopupMenuProxyGtk(GtkWidget* webView, WebPopupMenuProxy
     : WebPopupMenuProxy(client)
     , m_webView(webView)
     , m_activeItem(-1)
-    , m_runLoop(0)
 {
 }
 
@@ -96,14 +95,13 @@ void WebPopupMenuProxyGtk::showPopupMenu(const IntRect& rect, TextDirection text
 
     // WebPageProxy expects the menu to run in a nested run loop, since it invalidates the
     // menu right after calling WebPopupMenuProxy::showPopupMenu().
-    m_runLoop = g_main_loop_new(0, FALSE);
+    m_runLoop = adoptGRef(g_main_loop_new(0, FALSE));
 
     GDK_THREADS_LEAVE();
-    g_main_loop_run(m_runLoop);
+    g_main_loop_run(m_runLoop.get());
     GDK_THREADS_ENTER();
 
-    g_main_loop_unref(m_runLoop);
-    m_runLoop = 0;
+    m_runLoop.clear();
 
     g_signal_handler_disconnect(m_popup->platformMenu(), unmapHandler);
 
@@ -120,8 +118,8 @@ void WebPopupMenuProxyGtk::hidePopupMenu()
 
 void WebPopupMenuProxyGtk::shutdownRunLoop()
 {
-    if (g_main_loop_is_running(m_runLoop))
-        g_main_loop_quit(m_runLoop);
+    if (g_main_loop_is_running(m_runLoop.get()))
+        g_main_loop_quit(m_runLoop.get());
 }
 
 void WebPopupMenuProxyGtk::menuItemActivated(GtkAction* action, WebPopupMenuProxyGtk* popupMenu)
diff --git a/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.h b/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.h
index 9399ec11f..4b335bcde 100644
--- a/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.h
+++ b/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.h
@@ -23,6 +23,7 @@
 #include "WebPopupMenuProxy.h"
 #include <WebCore/GtkPopupMenu.h>
 #include <WebCore/IntRect.h>
+#include <wtf/gobject/GRefPtr.h>
 
 typedef struct _GMainLoop GMainLoop;
 
@@ -53,7 +54,7 @@ private:
     GtkWidget* m_webView;
     OwnPtr<WebCore::GtkPopupMenu> m_popup;
     int m_activeItem;
-    GMainLoop* m_runLoop;
+    GRefPtr<GMainLoop> m_runLoop;
 };
 
 } // namespace WebKit