Merge webkit.org at r55033 : Initial merge by git

Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5

1 files changed, 4 insertions, 4 deletions

diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
index 39430cf..a2fc79b 100644
--- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -94,8 +94,6 @@ GSList* webViewList = 0;
 // current b/f item at the end of the previous test
 static WebKitWebHistoryItem* prevTestBFItem = NULL;
 
-const unsigned maxViewHeight = 600;
-const unsigned maxViewWidth = 800;
 const unsigned historyItemIndent = 8;
 
 static gchar* autocorrectURL(const gchar* url)
@@ -335,6 +333,8 @@ static void resetDefaultsToConsistentValues()
                  "minimum-font-size", 1,
                  "enable-caret-browsing", FALSE,
                  "enable-page-cache", FALSE,
+                 "auto-resize-window", TRUE,
+                 "enable-java-applet", FALSE,
                  NULL);
 
     webkit_web_frame_clear_main_frame_name(mainFrame);
@@ -477,8 +477,8 @@ static void runTest(const string& testPathOrURL)
     bool isSVGW3CTest = (gLayoutTestController->testPathOrURL().find("svg/W3C-SVG-1.1") != string::npos);
     GtkAllocation size;
     size.x = size.y = 0;
-    size.width = isSVGW3CTest ? 480 : maxViewWidth;
-    size.height = isSVGW3CTest ? 360 : maxViewHeight;
+    size.width = isSVGW3CTest ? 480 : LayoutTestController::maxViewWidth;
+    size.height = isSVGW3CTest ? 360 : LayoutTestController::maxViewHeight;
     gtk_window_resize(GTK_WINDOW(window), size.width, size.height);
     gtk_widget_size_allocate(container, &size);