[content shell] when the test contains the path loading/ enable frame load callback dumping

content/shell/webkit_test_runner.cc

 // Copyright (c) 2012 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/webkit_test_runner.h"
 
 #include <cmath>
 
 #include "base/base64.h"
 #include "base/md5.h"
@@ skipping 136 matching lines @@
 #if !defined(OS_MACOSX)
   // Only the expected PNGs for Mac have a valid alpha channel.
   MakeBitmapOpaque(snapshot);
 #endif
 
 }
 
 }  // namespace
 
 WebKitTestRunner::WebKitTestRunner(RenderView* render_view)
-    : RenderViewObserver(render_view),
-      dump_editing_callbacks_(false),
-      dump_frame_load_callbacks_(false),
-      dump_user_gesture_in_frame_load_callbacks_(false),
-      stop_provisional_frame_loads_(false),
-      dump_title_changes_(false),
-      test_is_running_(true),
-      wait_until_done_(false) {
+    : RenderViewObserver(render_view) {
+  Reset();
 }
 
 WebKitTestRunner::~WebKitTestRunner() {
 }
 
 // WebTestDelegate  -----------------------------------------------------------
 
 void WebKitTestRunner::clearContextMenuData() {
   last_context_menu_data_.reset();
 }
@@ skipping 147 matching lines @@
 // RenderViewObserver  --------------------------------------------------------
 
 void WebKitTestRunner::DidClearWindowObject(WebFrame* frame) {
   ShellRenderProcessObserver::GetInstance()->BindTestRunnersToWindow(frame);
 }
 
 void WebKitTestRunner::DidFinishLoad(WebFrame* frame) {
   if (!frame->parent()) {
     if (!wait_until_done_)
       test_is_running_ = false;
+    load_finished_ = true;
     Send(new ShellViewHostMsg_DidFinishLoad(routing_id()));
   }
 }
 
 void WebKitTestRunner::DidRequestShowContextMenu(
     WebFrame* frame,
     const WebContextMenuData& data) {
   last_context_menu_data_.reset(new WebContextMenuData(data));
 }
 
@@ skipping 19 matching lines @@
   PaintInvalidatedRegion();
   DisplayRepaintMask();
 }
 
 void WebKitTestRunner::SetXSSAuditorEnabled(bool enabled) {
   prefs_.XSSAuditorEnabled = enabled;
   applyPreferences();
 }
 
 void WebKitTestRunner::NotifyDone() {
-  test_is_running_ = false;
+  if (load_finished_)
+    test_is_running_ = false;
+  else
+    wait_until_done_ = false;
   Send(new ShellViewHostMsg_NotifyDone(routing_id()));
 }
 
 void WebKitTestRunner::DumpAsText() {
   Send(new ShellViewHostMsg_DumpAsText(routing_id()));
 }
 
 void WebKitTestRunner::DumpChildFramesAsText() {
   Send(new ShellViewHostMsg_DumpChildFramesAsText(routing_id()));
 }
@@ skipping 121 matching lines @@
   prefs_.reset();
   webkit_glue::WebPreferences prefs = render_view()->GetWebkitPreferences();
   ExportLayoutTestSpecificPreferences(prefs_, &prefs);
   render_view()->SetWebkitPreferences(prefs);
   dump_editing_callbacks_ = false;
   dump_frame_load_callbacks_ = false;
   dump_user_gesture_in_frame_load_callbacks_ = false;
   stop_provisional_frame_loads_ = false;
   dump_title_changes_ = false;
   test_is_running_ = true;
+  load_finished_ = false;
   wait_until_done_ = false;
 }
 
 // Private methods  -----------------------------------------------------------
 
 void WebKitTestRunner::OnCaptureTextDump(bool as_text,
                                          bool printing,
                                          bool recursive) {
   WebFrame* frame = render_view()->GetWebView()->mainFrame();
   std::string dump;
@@ skipping 42 matching lines @@
         routing_id(), actual_pixel_hash, empty_image));
     return;
   }
   Send(new ShellViewHostMsg_ImageDump(
       routing_id(), actual_pixel_hash, snapshot));
 }
 
 void WebKitTestRunner::OnSetCurrentWorkingDirectory(
     const FilePath& current_working_directory) {
   current_working_directory_ = current_working_directory;
+  std::vector<FilePath::StringType> components;
+  current_working_directory_.GetComponents(&components);
+  for (unsigned i = 0; i < components.size(); ++i) {
+    if (components[i] == FILE_PATH_LITERAL("loading"))
+      dump_frame_load_callbacks_ = true;
+  }
 }
 
 SkCanvas* WebKitTestRunner::GetCanvas() {
   WebView* view = render_view()->GetWebView();
   const WebSize& size = view->size();
   float device_scale_factor = view->deviceScaleFactor();
   int width = std::ceil(device_scale_factor * size.width);
   int height = std::ceil(device_scale_factor * size.height);
 
   if (canvas_ &&
@@ skipping 48 matching lines @@
     PaintRect(rect);
   }
   CHECK(proxy_->paintRect().isEmpty());
 }
 
 void WebKitTestRunner::DisplayRepaintMask() {
   GetCanvas()->drawARGB(167, 0, 0, 0);
 }
 
 }  // namespace content