Switch the about:gpu implementation from an about handler to dom_ui....

chrome/browser/dom_ui/gpu_internals_ui.cc

Index: chrome/browser/dom_ui/gpu_internals_ui.cc
===================================================================
--- chrome/browser/dom_ui/gpu_internals_ui.cc	(revision 0)
+++ chrome/browser/dom_ui/gpu_internals_ui.cc	(revision 0)
@@ -0,0 +1,335 @@
+// Copyright (c) 2010 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/dom_ui/gpu_internals_ui.h"
+
+#include <algorithm>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "app/l10n_util.h"
+#include "app/resource_bundle.h"
+#include "base/command_line.h"
+#include "base/file_util.h"
+#include "base/message_loop.h"
+#include "base/path_service.h"
+#include "base/singleton.h"
+#include "base/string_number_conversions.h"
+#include "base/string_piece.h"
+#include "base/utf_string_conversions.h"
+#include "base/values.h"
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/browser_thread.h"
+#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
+#include "chrome/browser/gpu_process_host.h"
+#include "chrome/browser/gpu_process_host_ui_shim.h"
+#include "chrome/browser/io_thread.h"
+#include "chrome/browser/net/chrome_net_log.h"
+#include "chrome/browser/net/connection_tester.h"
+#include "chrome/browser/net/passive_log_collector.h"
+#include "chrome/browser/net/url_fixer_upper.h"
+#include "chrome/browser/platform_util.h"
+#include "chrome/browser/profile.h"
+#include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_version_info.h"
+#include "chrome/common/jstemplate_builder.h"
+#include "chrome/common/net/url_request_context_getter.h"
+#include "chrome/common/url_constants.h"
+#include "grit/browser_resources.h"
+#include "grit/generated_resources.h"
+#include "net/base/escape.h"
+
+
+namespace {
+
+class GpuHTMLSource : public ChromeURLDataManager::DataSource {

[arv (Not doing code reviews), 2010/12/06 19:45:57]

Should this be named GPUHTMLSource? It looks very strange to have Gpu and HTML
in the name like this. Same goes for GpuUI I guess.

[nduca, 2010/12/07 01:03:40]

I hear you. This is based on the rest of the Chrome GPU code, which uses Gpu
rather than GPU, on class names. GpuProcessHost or GpuThread, etc.

On 2010/12/06 19:45:57, arv wrote:

+ public:
+  GpuHTMLSource();
+
+  // Called when the network layer has requested a resource underneath
+  // the path we registered.
+  virtual void StartDataRequest(const std::string& path,
+                                bool is_off_the_record,
+                                int request_id);
+  virtual std::string GetMimeType(const std::string&) const;
+
+ private:
+  ~GpuHTMLSource() {}
+  DISALLOW_COPY_AND_ASSIGN(GpuHTMLSource);
+};
+
+// This class receives javascript messages from the renderer.
+// Note that the DOMUI infrastructure runs on the UI thread, therefore all of
+// this class's methods are expected to run on the UI thread.
+//
+// Since the network code we want to run lives on the IO thread, we proxy
+// everything over to GpuMessageHandler::IOThreadImpl, which runs
+// on the IO thread.
+//
+// TODO(eroman): Can we start on the IO thread to begin with?
+class GpuMessageHandler
+    : public DOMMessageHandler,
+      public base::SupportsWeakPtr<GpuMessageHandler> {
+ public:
+  GpuMessageHandler();
+  virtual ~GpuMessageHandler();
+
+  // DOMMessageHandler implementation.
+  virtual DOMMessageHandler* Attach(DOMUI* dom_ui);
+  virtual void RegisterMessages();
+
+  // Mesages
+  void OnCallAsync(const ListValue* list);
+
+  // Submessages dispatched from OnCallAsync
+  Value* OnRequestGpuInfo(const ListValue* list);
+  Value* OnRequestClientInfo(const ListValue* list);
+
+  // Executes the javascript function |function_name| in the renderer, passing
+  // it the argument |value|.
+  void CallJavascriptFunction(const std::wstring& function_name,
+                              const Value* value);
+
+ private:
+  bool collecting_graphics_info_;
+  DISALLOW_COPY_AND_ASSIGN(GpuMessageHandler);
+};
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// GpuHTMLSource
+//
+////////////////////////////////////////////////////////////////////////////////
+
+GpuHTMLSource::GpuHTMLSource()
+    : DataSource(chrome::kChromeUIGpuInternalsHost, MessageLoop::current()) {
+}
+
+void GpuHTMLSource::StartDataRequest(const std::string& path,
+                                              bool is_off_the_record,
+                                              int request_id) {
+  DictionaryValue* localized_strings = new DictionaryValue();
+  SetFontAndTextDirection(localized_strings);
+
+  static const base::StringPiece options_html(
+      ResourceBundle::GetSharedInstance().GetRawDataResource(
+          IDR_GPU_INTERNALS_HTML));
+  const std::string full_html = jstemplate_builder::GetI18nTemplateHtml(
+      options_html, localized_strings);
+
+  scoped_refptr<RefCountedBytes> html_bytes(new RefCountedBytes);
+  html_bytes->data.resize(full_html.size());
+  std::copy(full_html.begin(), full_html.end(), html_bytes->data.begin());
+
+  SendResponse(request_id, html_bytes);
+}
+
+std::string GpuHTMLSource::GetMimeType(const std::string&) const {
+  return "text/html";
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// GpuMessageHandler
+//
+////////////////////////////////////////////////////////////////////////////////
+
+GpuMessageHandler::GpuMessageHandler()
+    : collecting_graphics_info_(false) {
+}
+
+GpuMessageHandler::~GpuMessageHandler() {}
+
+DOMMessageHandler* GpuMessageHandler::Attach(DOMUI* dom_ui) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DOMMessageHandler* result = DOMMessageHandler::Attach(dom_ui);
+  return result;
+}
+
+/* BrowserBridge.callAsync prepends a requestID to these messages. */
+void GpuMessageHandler::RegisterMessages() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  dom_ui_->RegisterMessageCallback(
+      "callAsync",
+      NewCallback(this, &GpuMessageHandler::OnCallAsync));
+}
+
+void GpuMessageHandler::OnCallAsync(const ListValue* args) {
+  DCHECK(args->GetSize() >= 2);
+  // unpack args into requestId, submessage and submessageArgs
+  bool ok;
+  Value* requestId;
+  ok = args->Get(0, &requestId);
+  DCHECK(ok);
+
+  std::string submessage;
+  ok = args->GetString(1, &submessage);
+  DCHECK(ok);
+
+  ListValue* submessageArgs = new ListValue();
+  for (size_t i = 2; i < args->GetSize(); ++i) {
+    Value* arg;
+    ok = args->Get(i, &arg);
+    DCHECK(ok);
+
+    Value* argCopy = arg->DeepCopy();
+    submessageArgs->Append(argCopy);
+  }
+
+  // call the submessage handler
+  Value* ret = NULL;
+  if (submessage == "requestGpuInfo") {

[arv (Not doing code reviews), 2010/12/06 19:45:57]

I find this strange. DOMUI RegisterMessageCallback already does the forwarding
for you. I find it clearer (and more inline with exisiting code) to just
register more callbacks.

[nduca, 2010/12/07 01:03:40]

I'm fine doing that, but question though first.

I wrote this onCallAsync stuff to clean up js<->c++ interactions that are of the
form "asynchronously get me value X."

Without this code, you have to have the handler function statically know where
to send the reply. This leads to goo when you want to use one function in two
places, or when you want your callback to be a simple trampoline, such as is the
case in info_view.

Thoughts? I admit, this may be more an issue of me programming in a non-web-ish
way than anything else...


On 2010/12/06 19:45:57, arv wrote:

[arv (Not doing code reviews), 2010/12/08 17:55:19]

One option would be to extend chrome.send to take an optional callback function.

+    ret = OnRequestGpuInfo(submessageArgs);
+  } else if (submessage == "requestClientInfo") {
+    ret = OnRequestClientInfo(submessageArgs);
+  } else {  // unrecognized submessage
+    NOTREACHED();
+    delete submessageArgs;
+    return;
+  }
+  delete submessageArgs;
+
+  // call BrowserBridge.onCallAsyncReply with result
+  if (ret) {
+    dom_ui_->CallJavascriptFunction(L"browser.onCallAsyncReply",

[arv (Not doing code reviews), 2010/12/06 19:45:57]

Same goes for calling into js

+        *requestId,
+        *ret);
+    delete ret;
+  } else {
+    dom_ui_->CallJavascriptFunction(L"browser.onCallAsyncReply",
+        *requestId);
+  }
+}
+
+Value* GpuMessageHandler::OnRequestClientInfo(const ListValue* list) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  DictionaryValue* dict = new DictionaryValue();

[arv (Not doing code reviews), 2010/12/06 19:45:57]

Who is deleting this?

[nduca, 2010/12/07 01:03:40]

OnCallAsync, line 200, "delete ret" after we've sent the dictionary back to
javascript. Do we have an OwnPtr-type abstraction in the browser to make this
clearer?

On 2010/12/06 19:45:57, arv wrote:

+
+  chrome::VersionInfo version_info;
+
+  if (!version_info.is_valid()) {
+    DLOG(ERROR) << "Unable to create chrome::VersionInfo";
+  } else {
+    // We have everything we need to send the right values.
+    dict->SetString("version", version_info.Version());
+    dict->SetString("cl", version_info.LastChange());
+    dict->SetString("version_mod",
+      platform_util::GetVersionStringModifier());
+    dict->SetString("official",
+      l10n_util::GetStringUTF16(
+      version_info.IsOfficialBuild() ?
+      IDS_ABOUT_VERSION_OFFICIAL
+      : IDS_ABOUT_VERSION_UNOFFICIAL));
+
+    dict->SetString("command_line",
+      CommandLine::ForCurrentProcess()->command_line_string());
+  }
+
+  return dict;
+}
+
+
+#if defined(OS_WIN)
+// Output DxDiagNode tree as HTML tables and nested HTML unordered list
+// elements.
+DictionaryValue* DxDiagNodeToDict(const DxDiagNode& node) {
+  DictionaryValue* dict = new DictionaryValue();

[arv (Not doing code reviews), 2010/12/06 19:45:57]

Who is deleting this?

[nduca, 2010/12/07 01:03:40]

Caller.
On 2010/12/06 19:45:57, arv wrote:

+  for (std::map<std::string, std::string>::const_iterator it =
+      node.values.begin();
+      it != node.values.end();
+      ++it) {
+    dict->SetString(EscapeForHTML(it->first), EscapeForHTML(it->second));
+  }
+
+  for (std::map<std::string, DxDiagNode>::const_iterator it =
+      node.children.begin();
+      it != node.children.end();
+      ++it) {
+    DictionaryValue* subdict = DxDiagNodeToDict(it->second);
+    dict->Set(EscapeForHTML(it->first), subdict);
+  }
+  return dict;
+}
+
+#endif  // OS_WIN
+
+std::string VersionNumberToString(uint32 value) {
+  int hi = (value >> 8) & 0xff;
+  int low = value & 0xff;
+  return base::IntToString(hi) + "." + base::IntToString(low);
+}
+
+DictionaryValue* GpuInfoToDict(const GPUInfo& gpu_info) {
+  DictionaryValue* info = new DictionaryValue();

[arv (Not doing code reviews), 2010/12/06 19:45:57]

Who is deleting this?

[nduca, 2010/12/07 01:03:40]

Caller.
On 2010/12/06 19:45:57, arv wrote:

+  info->SetString("Initialization time",
+      base::Int64ToString(gpu_info.initialization_time().InMilliseconds()));
+  info->SetString("Vendor Id",
+      base::StringPrintf("0x%04x", gpu_info.vendor_id()));
+  info->SetString("Device Id",
+      base::StringPrintf("0x%04x", gpu_info.device_id()));
+  info->SetString("Driver version",
+      WideToASCII(gpu_info.driver_version()).c_str());
+  info->SetString("Pixel shader version",
+      VersionNumberToString(gpu_info.pixel_shader_version()));
+  info->SetString("Vertex shader version",
+      VersionNumberToString(gpu_info.vertex_shader_version()));
+  info->SetString("GL version", VersionNumberToString(gpu_info.gl_version()));
+
+  DictionaryValue* dict = new DictionaryValue();
+  dict->Set("Basic GPU Information", info);
+
+#if defined(OS_WIN)
+  DictionaryValue* dx_info = DxDiagNodeToDict(gpu_info.dx_diagnostics());
+  dict->Set("DirectX diagnostics", dx_info);
+#endif
+
+  return dict;
+}
+
+Value* GpuMessageHandler::OnRequestGpuInfo(const ListValue* list) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  // Get GPU Info.
+  GPUInfo gpu_info = GpuProcessHostUIShim::Get()->gpu_info();
+
+  std::string html;
+  if (gpu_info.progress() != GPUInfo::kComplete) {
+    if (!collecting_graphics_info_) {
+        GpuProcessHostUIShim::Get()->CollectGraphicsInfoAsynchronously();
+        collecting_graphics_info_ = true;
+    }
+    return NULL;
+  } else {
+    collecting_graphics_info_ = false;
+
+    return GpuInfoToDict(gpu_info);
+  }
+}
+
+}  // namespace
+
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// GpuUI
+//
+////////////////////////////////////////////////////////////////////////////////
+
+GpuUI::GpuUI(TabContents* contents) : DOMUI(contents) {
+  AddMessageHandler((new GpuMessageHandler())->Attach(this));
+
+  GpuHTMLSource* html_source = new GpuHTMLSource();
+
+  // Set up the chrome://gpu/ source.
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      NewRunnableMethod(
+          Singleton<ChromeURLDataManager>::get(),
+          &ChromeURLDataManager::AddDataSource,
+          make_scoped_refptr(html_source)));
+}
+
Property changes on: chrome/browser/dom_ui/gpu_internals_ui.cc
___________________________________________________________________
Added: svn:eol-style
   + LF