Add the filename to the loaded trace file information.

content/browser/tracing/tracing_ui.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/browser/tracing/tracing_ui.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
+#include "base/json/string_escape.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/trace_controller.h"
@@ skipping 57 matching lines @@
   // Messages.
   void OnTracingControllerInitialized(const base::ListValue* list);
   void OnBeginTracing(const base::ListValue* list);
   void OnEndTracingAsync(const base::ListValue* list);
   void OnBeginRequestBufferPercentFull(const base::ListValue* list);
   void OnLoadTraceFile(const base::ListValue* list);
   void OnSaveTraceFile(const base::ListValue* list);
   void OnGetKnownCategories(const base::ListValue* list);
 
   // Callbacks.
-  void LoadTraceFileComplete(string16* file_contents);
+  void LoadTraceFileComplete(string16* file_contents,
+                             const base::FilePath &path);
   void SaveTraceFileComplete();
 
  private:
   // The file dialog to select a file for loading or saving traces.
   scoped_refptr<ui::SelectFileDialog> select_trace_file_dialog_;
 
   // The type of the file dialog as the same one is used for loading or saving
   // traces.
   ui::SelectFileDialog::Type select_trace_file_dialog_type_;
 
@@ skipping 11 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(TracingMessageHandler);
 };
 
 // A proxy passed to the Read and Write tasks used when loading or saving trace
 // data.
 class TaskProxy : public base::RefCountedThreadSafe<TaskProxy> {
  public:
   explicit TaskProxy(const base::WeakPtr<TracingMessageHandler>& handler)
       : handler_(handler) {}
-  void LoadTraceFileCompleteProxy(string16* file_contents) {
+  void LoadTraceFileCompleteProxy(string16* file_contents,
+                                  const base::FilePath& path) {
     if (handler_)
-      handler_->LoadTraceFileComplete(file_contents);
+      handler_->LoadTraceFileComplete(file_contents, path);
     delete file_contents;
   }
 
   void SaveTraceFileCompleteProxy() {
     if (handler_)
       handler_->SaveTraceFileComplete();
   }
 
  private:
   friend class base::RefCountedThreadSafe<TaskProxy>;
@@ skipping 114 matching lines @@
     escaped_contents.push_back(c);
   }
   file_contents.clear();
 
   scoped_ptr<string16> contents16(new string16);
   UTF8ToUTF16(escaped_contents).swap(*contents16);
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&TaskProxy::LoadTraceFileCompleteProxy, proxy,
-                 contents16.release()));
+                 contents16.release(),
+                 path));
 }
 
 // A callback used for asynchronously writing a file from a string. Calls the
 // TaskProxy callback when writing is complete.
 void WriteTraceFileCallback(TaskProxy* proxy,
                             const base::FilePath& path,
                             std::string* contents) {
   if (!file_util::WriteFile(path, contents->c_str(), contents->size()))
     return;
 
@@ skipping 46 matching lines @@
       ui::SelectFileDialog::SELECT_OPEN_FILE,
       string16(),
       base::FilePath(),
       NULL,
       0,
       base::FilePath::StringType(),
       web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow(),
       NULL);
 }
 
-void TracingMessageHandler::LoadTraceFileComplete(string16* contents) {
+void TracingMessageHandler::LoadTraceFileComplete(string16* contents,
+                                                  const base::FilePath& path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // We need to pass contents to tracingController.onLoadTraceFileComplete, but
   // that may be arbitrarily big, and IPCs messages are limited in size. So we
   // need to cut it into pieces and rebuild the string in Javascript.
   // |contents| has already been escaped in ReadTraceFileCallback.
   // IPC::Channel::kMaximumMessageSize is in bytes, and we need to account for
   // overhead.
   const size_t kMaxSize = IPC::Channel::kMaximumMessageSize / 2 - 128;
   string16 first_prefix = UTF8ToUTF16("window.traceData = '");
   string16 prefix = UTF8ToUTF16("window.traceData += '");
   string16 suffix = UTF8ToUTF16("';");
 
   RenderViewHost* rvh = web_ui()->GetWebContents()->GetRenderViewHost();
   for (size_t i = 0; i < contents->size(); i += kMaxSize) {
     string16 javascript = i == 0 ? first_prefix : prefix;
     javascript += contents->substr(i, kMaxSize) + suffix;
     rvh->ExecuteJavascriptInWebFrame(string16(), javascript);
   }
+
+  // The CallJavascriptFunction is not used because we need to pass
+  // the first param |window.traceData| through as an un-quoted string.
   rvh->ExecuteJavascriptInWebFrame(string16(), UTF8ToUTF16(
-      "tracingController.onLoadTraceFileComplete(window.traceData);"
+      "tracingController.onLoadTraceFileComplete(window.traceData," +
+      base::GetDoubleQuotedJson(path.value()) + ");" +

[nduca, 2013/05/17 23:15:12]

do you have to call path.reserve(path.lenght*2) like nick did in his patch?

       "delete window.traceData;"));
 }
 
 void TracingMessageHandler::OnSaveTraceFile(const base::ListValue* list) {
   // Only allow a single dialog at a time.
   if (select_trace_file_dialog_)
     return;
 
   DCHECK(list->GetSize() == 1);
 
@@ skipping 185 matching lines @@
 TracingUI::TracingUI(WebUI* web_ui) : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new TracingMessageHandler());
 
   // Set up the chrome://tracing/ source.
   BrowserContext* browser_context =
       web_ui->GetWebContents()->GetBrowserContext();
   WebUIDataSource::Add(browser_context, CreateTracingHTMLSource());
 }
 
 }  // namespace content