Send screenshots back to the client for debugging

chrome/browser/automation/testing_automation_provider.cc

 // Copyright (c) 2011 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 "chrome/browser/automation/testing_automation_provider.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
+#include "base/file_path.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/json/string_escape.h"
 #include "base/path_service.h"
 #include "base/process.h"
 #include "base/process_util.h"
 #include "base/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
@@ skipping 1964 matching lines @@
       }
   }
 }
 
 void TestingAutomationProvider::CaptureEntirePageAsPNG(
     int tab_handle, const FilePath& path, IPC::Message* reply_message) {
   RenderViewHost* render_view = GetViewForTab(tab_handle);
   if (render_view) {
     // This will delete itself when finished.
     PageSnapshotTaker* snapshot_taker = new PageSnapshotTaker(
-        this, reply_message, render_view, path);
+        this, reply_message, render_view, path, false);
     snapshot_taker->Start();
   } else {
     LOG(ERROR) << "Could not get render view for tab handle";
     AutomationMsg_CaptureEntirePageAsPNG::WriteReplyParams(reply_message,
                                                            false);
     Send(reply_message);
   }
 }
 
 void TestingAutomationProvider::SendJSONRequest(int handle,
@@ skipping 36 matching lines @@
   handler_map["GoForward"] =
       &TestingAutomationProvider::GoForward;
   handler_map["GoBack"] =
       &TestingAutomationProvider::GoBack;
   handler_map["Reload"] =
       &TestingAutomationProvider::ReloadJSON;
   handler_map["GetTabURL"] =
       &TestingAutomationProvider::GetTabURLJSON;
   handler_map["GetTabTitle"] =
       &TestingAutomationProvider::GetTabTitleJSON;
+  handler_map["GetScreenShot"] =

[kkania, 2011/03/16 18:19:10]

change name here too

[Joe, 2011/03/17 00:15:25]

Done.

+      &TestingAutomationProvider::GetScreenShotJSON;
   handler_map["GetCookies"] =
       &TestingAutomationProvider::GetCookiesJSON;
   handler_map["DeleteCookie"] =
       &TestingAutomationProvider::DeleteCookieJSON;
   handler_map["SetCookie"] =
       &TestingAutomationProvider::SetCookieJSON;
   handler_map["GetTabIds"] =
       &TestingAutomationProvider::GetTabIds;
   handler_map["IsTabIdValid"] =
       &TestingAutomationProvider::IsTabIdValid;
@@ skipping 2882 matching lines @@
   std::string error;
   if (!GetTabFromJSONArgs(args, &tab_contents, &error)) {
     reply.SendError(error);
     return;
   }
   DictionaryValue dict;
   dict.SetString("title", tab_contents->GetTitle());
   reply.SendSuccess(&dict);
 }
 
+void TestingAutomationProvider::GetScreenShotJSON(
+    DictionaryValue* args,
+    IPC::Message* reply_message) {
+  TabContents* tab_contents;
+  std::string error;
+
+  if (!GetTabFromJSONArgs(args, &tab_contents, &error)) {
+    AutomationJSONReply(this, reply_message).SendError(error);
+    return;
+  }
+
+#if defined(OS_WIN)
+  string16 path_str;
+#elif defined(OS_POSIX)
+  std::string path_str;
+#else

[kkania, 2011/03/16 18:19:10]

I think you can get rid of the #else part; as you have it it wouldn't compile
anyways for the unknown platform, because path_str isn't defined

[Joe, 2011/03/17 00:15:25]

Done.

+  NOTREACHED();
+#endif

[kkania, 2011/03/16 18:19:10]

actually, I think you should be able to replace all the defines with:

FilePath::StringType path_str;

[Joe, 2011/03/17 00:15:25]

Done.

+
+  if (!args->GetString("path", &path_str)) {
+    AutomationJSONReply(this, reply_message)
+        .SendError("'path' missing or invalid");
+    return;
+  }
+
+  FilePath path(path_str);
+  RenderViewHost* render_view = tab_contents->render_view_host();
+  if (render_view) {
+    // This will delete itself when finished.
+    PageSnapshotTaker* snapshot_taker = new PageSnapshotTaker(
+        this, reply_message, render_view, path, true);

[kkania, 2011/03/16 18:19:10]

just make the FilePath(path_str) here and get rid of it above

[Joe, 2011/03/17 00:15:25]

Done.

+    snapshot_taker->Start();
+  } else {
+    LOG(ERROR) << "Could not get render view for tab handle";

[kkania, 2011/03/16 18:19:10]

this should be replaced with a AutomationJSONRelpy(this,
reply_message).SendError("Tab contents has no renderer host")

[Joe, 2011/03/17 00:15:25]

Done.

+    AutomationMsg_CaptureEntirePageAsPNG::WriteReplyParams(reply_message,
+                                                           false);
+    Send(reply_message);
+  }
+}
+
 void TestingAutomationProvider::GetCookiesJSON(
     DictionaryValue* args, IPC::Message* reply_message) {
   automation_util::GetCookiesJSON(this, args, reply_message);
 }
 
 void TestingAutomationProvider::DeleteCookieJSON(
     DictionaryValue* args, IPC::Message* reply_message) {
   automation_util::DeleteCookieJSON(this, args, reply_message);
 }
 
@@ skipping 231 matching lines @@
     // If you change this, update Observer for NotificationType::SESSION_END
     // below.
     MessageLoop::current()->PostTask(FROM_HERE,
         NewRunnableMethod(this, &TestingAutomationProvider::OnRemoveProvider));
   }
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   AutomationProviderList::GetInstance()->RemoveProvider(this);
 }