Merge WebKit at r73109: Initial merge by git.

Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8

1 files changed, 7 insertions, 9 deletions

diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
index 5aa61e3..a1fcbc8 100644
--- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -33,6 +33,7 @@
 #include "DumpRenderTree.h"
 
 #include "AccessibilityController.h"
+#include "EditingCallbacks.h"
 #include "EventSender.h"
 #include "GCController.h"
 #include "GOwnPtr.h"
@@ -111,7 +112,7 @@ static bool shouldOpenWebInspector(const string& pathOrURL)
 
 static bool shouldEnableDeveloperExtras(const string& pathOrURL)
 {
-    return shouldOpenWebInspector(pathOrURL) || pathOrURL.find("inspector-enabled/") != string::npos;
+    return true;
 }
 
 void dumpFrameScrollPosition(WebKitWebFrame* frame)
@@ -494,20 +495,16 @@ void dump()
 {
     invalidateAnyPreviousWaitToDumpWatchdog();
 
-    bool dumpAsText = gLayoutTestController->dumpAsText();
     if (dumpTree) {
         char* result = 0;
         gchar* responseMimeType = webkit_web_frame_get_response_mime_type(mainFrame);
 
-        dumpAsText = g_str_equal(responseMimeType, "text/plain");
+        if (g_str_equal(responseMimeType, "text/plain")) {
+            gLayoutTestController->setDumpAsText(true);        
+            gLayoutTestController->setGeneratePixelResults(false);
+        }
         g_free(responseMimeType);
 
-        // Test can request controller to be dumped as text even
-        // while test's response mime type is not text/plain.
-        // Overriding this behavior with dumpAsText being false is a bad idea.
-        if (dumpAsText)
-            gLayoutTestController->setDumpAsText(dumpAsText);
-
         if (gLayoutTestController->dumpAsText())
             result = dumpFramesAsText(mainFrame);
         else {
@@ -1022,6 +1019,7 @@ static WebKitWebView* createWebView()
                      "signal::frame-created", frameCreatedCallback, 0,
 
                      NULL);
+    connectEditingCallbacks(view);
 
     WebKitWebInspector* inspector = webkit_web_view_get_inspector(view);
     g_object_connect(G_OBJECT(inspector),