Merge webkit.org at r55033 : Initial merge by git

Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5

1 files changed, 23 insertions, 0 deletions

diff --git a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
index 8ea8991..74f5e07 100644
--- a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
@@ -88,6 +88,23 @@ void ChromeClient::setWindowRect(const FloatRect& rect)
                  "width", intrect.width(),
                  "height", intrect.height(),
                  NULL);
+
+    gboolean autoResizeWindow;
+    WebKitWebSettings* settings = webkit_web_view_get_settings(m_webView);
+    g_object_get(settings, "auto-resize-window", &autoResizeWindow, NULL);
+
+    if (!autoResizeWindow)
+        return;
+
+    GtkWidget* window = gtk_widget_get_toplevel(GTK_WIDGET(m_webView));
+#if GTK_CHECK_VERSION(2, 18, 0)
+    if (gtk_widget_is_toplevel(window)) {
+#else
+    if (GTK_WIDGET_TOPLEVEL(window)) {
+#endif
+        gtk_window_move(GTK_WINDOW(window), intrect.x(), intrect.y());
+        gtk_window_resize(GTK_WINDOW(window), intrect.width(), intrect.height());
+    }
 }
 
 FloatRect ChromeClient::pageRect()
@@ -546,6 +563,12 @@ void ChromeClient::runOpenPanel(Frame*, PassRefPtr<FileChooser> prpFileChooser)
     gtk_widget_destroy(dialog);
 }
 
+void ChromeClient::iconForFiles(const Vector<WebCore::String>&, PassRefPtr<WebCore::FileChooser>)
+{
+    // FIXME: Move the code in Icon::createIconForFiles() here.
+    notImplemented();
+}
+
 bool ChromeClient::setCursor(PlatformCursorHandle)
 {
     notImplemented();