Add testRunner callbacks for better handling of view-source frames

content/shell/renderer/test_runner/web_test_proxy.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/renderer/test_runner/web_test_proxy.h"
 
 #include <cctype>
 
 #include "base/callback_helpers.h"
 #include "base/debug/trace_event.h"
@@ skipping 187 matching lines @@
     case blink::WebNavigationTypeReload:
       return kReloadString;
     case blink::WebNavigationTypeFormResubmitted:
       return kFormResubmittedString;
     case blink::WebNavigationTypeOther:
       return kOtherString;
   }
   return kIllegalString;
 }
 
+std::string DumpFrameHeaderIfNeeded(blink::WebFrame* frame) {
+  std::string result;
+
+  // Add header for all but the main frame. Skip empty frames.
+  if (frame->parent() && !frame->document().documentElement().isNull()) {
+    result.append("\n--------\nFrame: '");
+    result.append(frame->uniqueName().utf8().data());
+    result.append("'\n--------\n");
+  }
+
+  return result;
+}
+
+std::string DumpFramesAsMarkup(blink::WebFrame* frame, bool recursive) {
+  std::string result = DumpFrameHeaderIfNeeded(frame);
+  result.append(frame->contentAsMarkup().utf8());
+  result.append("\n");
+
+  if (recursive) {
+    for (blink::WebFrame* child = frame->firstChild(); child;
+         child = child->nextSibling())
+      result.append(DumpFramesAsMarkup(child, recursive));
+  }
+
+  return result;
+}
+
 std::string DumpDocumentText(blink::WebFrame* frame) {
   // We use the document element's text instead of the body text here because
   // not all documents have a body, such as XML documents.
   blink::WebElement document_element = frame->document().documentElement();
   if (document_element.isNull())
     return std::string();
   return document_element.innerText().utf8();
 }
 
 std::string DumpFramesAsText(blink::WebFrame* frame, bool recursive) {
-  std::string result;
-
-  // Add header for all but the main frame. Skip empty frames.
-  if (frame->parent() && !frame->document().documentElement().isNull()) {
-    result.append("\n--------\nFrame: '");
-    result.append(frame->uniqueName().utf8().data());
-    result.append("'\n--------\n");
-  }
-
+  std::string result = DumpFrameHeaderIfNeeded(frame);
   result.append(DumpDocumentText(frame));
   result.append("\n");
 
   if (recursive) {
     for (blink::WebFrame* child = frame->firstChild(); child;
          child = child->nextSibling())
       result.append(DumpFramesAsText(child, recursive));
   }
 
   return result;
 }
 
 std::string DumpFramesAsPrintedText(blink::WebFrame* frame, bool recursive) {
-  std::string result;
-
   // Cannot do printed format for anything other than HTML
   if (!frame->document().isHTMLDocument())
     return std::string();
 
-  // Add header for all but the main frame. Skip empty frames.
-  if (frame->parent() && !frame->document().documentElement().isNull()) {
-    result.append("\n--------\nFrame: '");
-    result.append(frame->uniqueName().utf8().data());
-    result.append("'\n--------\n");
-  }
-
+  std::string result = DumpFrameHeaderIfNeeded(frame);
   result.append(
       frame->renderTreeAsText(blink::WebFrame::RenderAsTextPrinting).utf8());
   result.append("\n");
 
   if (recursive) {
     for (blink::WebFrame* child = frame->firstChild(); child;
          child = child->nextSibling())
       result.append(DumpFramesAsPrintedText(child, recursive));
   }
 
@@ skipping 112 matching lines @@
       test_interfaces_->testRunner()->shouldDumpAsMarkup();
   bool should_dump_as_printed = test_interfaces_->testRunner()->isPrinting();
   blink::WebFrame* frame = GetWebView()->mainFrame();
   std::string data_utf8;
   if (should_dump_custom_text) {
     // Append a newline for the test driver.
     data_utf8 = test_interfaces_->testRunner()->customDumpText() + "\n";
   } else if (should_dump_as_text) {
     bool recursive =
         test_interfaces_->testRunner()->shouldDumpChildFramesAsText();
-    data_utf8 = should_dump_as_printed
-                    ? DumpFramesAsPrintedText(frame, recursive)
-                    : DumpFramesAsText(frame, recursive);
+    data_utf8 = should_dump_as_printed ?
+        DumpFramesAsPrintedText(frame, recursive) :
+        DumpFramesAsText(frame, recursive);
   } else if (should_dump_as_markup) {
+    bool recursive =
+        test_interfaces_->testRunner()->shouldDumpChildFramesAsMarkup();
     // Append a newline for the test driver.
-    data_utf8 = frame->contentAsMarkup().utf8() + "\n";
+    data_utf8 = DumpFramesAsMarkup(frame, recursive);
   } else {
     bool recursive =
         test_interfaces_->testRunner()->shouldDumpChildFrameScrollPositions();
     blink::WebFrame::RenderAsTextControls render_text_behavior =
         blink::WebFrame::RenderAsTextNormal;
     if (should_dump_as_printed)
       render_text_behavior |= blink::WebFrame::RenderAsTextPrinting;
     if (debug_render_tree)
       render_text_behavior |= blink::WebFrame::RenderAsTextDebug;
     data_utf8 = frame->renderTreeAsText(render_text_behavior).utf8();
@@ skipping 794 matching lines @@
   // to cancel the input method's ongoing composition session.
   if (web_widget_)
     web_widget_->confirmComposition();
 }
 
 blink::WebString WebTestProxyBase::acceptLanguages() {
   return blink::WebString::fromUTF8(accept_languages_);
 }
 
 }  // namespace content