DevTools: follow up to r288297, check rvh for being null in all branches.

content/browser/devtools/renderer_overrides_handler.cc

 // Copyright (c) 2013 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/devtools/renderer_overrides_handler.h"
 
 #include <map>
 #include <string>
 
 #include "base/barrier_closure.h"
@@ skipping 49 matching lines @@
 namespace {
 
 static const char kPng[] = "png";
 static const char kJpeg[] = "jpeg";
 static int kDefaultScreenshotQuality = 80;
 static int kFrameRateThresholdMs = 100;
 static int kCaptureRetryLimit = 2;
 
 }  // namespace
 
-RendererOverridesHandler::RendererOverridesHandler(DevToolsAgentHost* agent)
-    : agent_(agent),
-      has_last_compositor_frame_metadata_(false),
+RendererOverridesHandler::RendererOverridesHandler()
+    : has_last_compositor_frame_metadata_(false),
       capture_retry_count_(0),
       weak_factory_(this) {
   RegisterCommandHandler(
       devtools::DOM::setFileInputFiles::kName,
       base::Bind(
           &RendererOverridesHandler::GrantPermissionsForSetFileInputFiles,
           base::Unretained(this)));
   RegisterCommandHandler(
       devtools::Network::clearBrowserCache::kName,
       base::Bind(
@@ skipping 61 matching lines @@
   RegisterCommandHandler(
       devtools::Input::emulateTouchFromMouseEvent::kName,
       base::Bind(
           &RendererOverridesHandler::InputEmulateTouchFromMouseEvent,
           base::Unretained(this)));
 }
 
 RendererOverridesHandler::~RendererOverridesHandler() {}
 
 void RendererOverridesHandler::OnClientDetached() {
-  RenderViewHostImpl* host = GetRenderViewHostImpl();
-  if (screencast_command_ && host)
-    host->SetTouchEventEmulationEnabled(false, false);
+  if (screencast_command_ && host_)
+    host_->SetTouchEventEmulationEnabled(false, false);
   screencast_command_ = NULL;
 }
 
 void RendererOverridesHandler::OnSwapCompositorFrame(
     const cc::CompositorFrameMetadata& frame_metadata) {
   last_compositor_frame_metadata_ = frame_metadata;
   has_last_compositor_frame_metadata_ = true;
 
   if (screencast_command_)
     InnerSwapCompositorFrame();
 }
 
 void RendererOverridesHandler::OnVisibilityChanged(bool visible) {
   if (!screencast_command_)
     return;
   NotifyScreencastVisibility(visible);
 }
 
-void RendererOverridesHandler::OnRenderViewHostChanged() {
-  RenderViewHostImpl* host = GetRenderViewHostImpl();
+void RendererOverridesHandler::SetRenderViewHost(
+    RenderViewHostImpl* host) {
+  host_ = host;
   if (screencast_command_ && host)
     host->SetTouchEventEmulationEnabled(true, true);
 }
 
+void RendererOverridesHandler::ClearRenderViewHost() {
+  host_ = NULL;
+}
+
 bool RendererOverridesHandler::OnSetTouchEventEmulationEnabled() {
   return screencast_command_.get() != NULL;
 }
 
 void RendererOverridesHandler::InnerSwapCompositorFrame() {
   if ((base::TimeTicks::Now() - last_frame_time_).InMilliseconds() <
           kFrameRateThresholdMs) {
     return;
   }
 
-  RenderViewHost* host = GetRenderViewHostImpl();
-  if (!host->GetView())
+  if (!host_ || !host_->GetView())
     return;
 
   last_frame_time_ = base::TimeTicks::Now();
 
   RenderWidgetHostViewBase* view = static_cast<RenderWidgetHostViewBase*>(
-      host->GetView());
+      host_->GetView());
   // TODO(vkuzkokov): do not use previous frame metadata.
   cc::CompositorFrameMetadata& metadata = last_compositor_frame_metadata_;
 
   float page_scale = metadata.page_scale_factor;
   gfx::SizeF viewport_size_dip = gfx::ScaleSize(
       metadata.scrollable_viewport_size, page_scale);
 
   float total_bar_height_dip = metadata.location_bar_content_translation.y() +
                                    metadata.overdraw_bottom_height;
   gfx::SizeF screen_size_dip(viewport_size_dip.width(),
@@ skipping 54 matching lines @@
 
 scoped_refptr<DevToolsProtocol::Response>
 RendererOverridesHandler::GrantPermissionsForSetFileInputFiles(
     scoped_refptr<DevToolsProtocol::Command> command) {
   base::DictionaryValue* params = command->params();
   base::ListValue* file_list = NULL;
   const char* param =
       devtools::DOM::setFileInputFiles::kParamFiles;
   if (!params || !params->GetList(param, &file_list))
     return command->InvalidParamResponse(param);
-  RenderViewHost* host = GetRenderViewHostImpl();
-  if (!host)
+  if (!host_)
     return NULL;
 
   for (size_t i = 0; i < file_list->GetSize(); ++i) {
     base::FilePath::StringType file;
     if (!file_list->GetString(i, &file))
       return command->InvalidParamResponse(param);
     ChildProcessSecurityPolicyImpl::GetInstance()->GrantReadFile(
-        host->GetProcess()->GetID(), base::FilePath(file));
+        host_->GetProcess()->GetID(), base::FilePath(file));
   }
   return NULL;
 }
 
 
 // Network agent handlers  ----------------------------------------------------
 
 scoped_refptr<DevToolsProtocol::Response>
 RendererOverridesHandler::ClearBrowserCache(
     scoped_refptr<DevToolsProtocol::Command> command) {
-  GetContentClient()->browser()->ClearCache(GetRenderViewHostImpl());
+  GetContentClient()->browser()->ClearCache(host_);
   return command->SuccessResponse(NULL);
 }
 
 scoped_refptr<DevToolsProtocol::Response>
 RendererOverridesHandler::ClearBrowserCookies(
     scoped_refptr<DevToolsProtocol::Command> command) {
-  GetContentClient()->browser()->ClearCookies(GetRenderViewHostImpl());
+  GetContentClient()->browser()->ClearCookies(host_);
   return command->SuccessResponse(NULL);
 }
 
 
 // Page agent handlers  -------------------------------------------------------
 
 scoped_refptr<DevToolsProtocol::Response>
 RendererOverridesHandler::PageDisable(
     scoped_refptr<DevToolsProtocol::Command> command) {
-  RenderViewHostImpl* host = GetRenderViewHostImpl();
-  if (screencast_command_ && host)
-    host->SetTouchEventEmulationEnabled(false, false);
+  if (screencast_command_ && host_)
+    host_->SetTouchEventEmulationEnabled(false, false);
   screencast_command_ = NULL;
   return NULL;
 }
 
 scoped_refptr<DevToolsProtocol::Response>
 RendererOverridesHandler::PageHandleJavaScriptDialog(
     scoped_refptr<DevToolsProtocol::Command> command) {
   base::DictionaryValue* params = command->params();
   const char* paramAccept =
       devtools::Page::handleJavaScriptDialog::kParamAccept;
   bool accept = false;
   if (!params || !params->GetBoolean(paramAccept, &accept))
     return command->InvalidParamResponse(paramAccept);
   base::string16 prompt_override;
   base::string16* prompt_override_ptr = &prompt_override;
   if (!params || !params->GetString(
       devtools::Page::handleJavaScriptDialog::kParamPromptText,
       prompt_override_ptr)) {
     prompt_override_ptr = NULL;
   }
 
-  WebContents* web_contents = agent_->GetWebContents();
+  if (!host_)
+    return command->InternalErrorResponse("Could not connect to view");

[dgozman, 2014/08/16 10:06:20]

typo here and below: Could not connect to host

[pfeldman, 2014/08/16 11:12:40]

I actually made them all consistent on purpose. It is "render view". Protocol
clients don't have to bother about what it is.

+
+  WebContents* web_contents = WebContents::FromRenderViewHost(host_);
   if (web_contents) {
     JavaScriptDialogManager* manager =
         web_contents->GetDelegate()->GetJavaScriptDialogManager();
     if (manager && manager->HandleJavaScriptDialog(
             web_contents, accept, prompt_override_ptr)) {
       return command->SuccessResponse(new base::DictionaryValue());
     }
   }
   return command->InternalErrorResponse("No JavaScript dialog to handle");
 }
 
 scoped_refptr<DevToolsProtocol::Response>
 RendererOverridesHandler::PageNavigate(
     scoped_refptr<DevToolsProtocol::Command> command) {
   base::DictionaryValue* params = command->params();
   std::string url;
   const char* param = devtools::Page::navigate::kParamUrl;
   if (!params || !params->GetString(param, &url))
     return command->InvalidParamResponse(param);
 
   GURL gurl(url);
   if (!gurl.is_valid())
     return command->InternalErrorResponse("Cannot navigate to invalid URL");
 
-  WebContents* web_contents = agent_->GetWebContents();
+  if (!host_)
+    return command->InternalErrorResponse("Could not connect to view");
+
+  WebContents* web_contents = WebContents::FromRenderViewHost(host_);
   if (web_contents) {
     web_contents->GetController()
         .LoadURL(gurl, Referrer(), PAGE_TRANSITION_TYPED, std::string());
     // Fall through into the renderer.
     return NULL;
   }
 
   return command->InternalErrorResponse("No WebContents to navigate");
 }
 
 scoped_refptr<DevToolsProtocol::Response>
 RendererOverridesHandler::PageReload(
     scoped_refptr<DevToolsProtocol::Command> command) {
-  WebContents* web_contents = agent_->GetWebContents();
+  if (!host_)
+    return command->InternalErrorResponse("Could not connect to view");
+
+  WebContents* web_contents = WebContents::FromRenderViewHost(host_);
   if (web_contents) {
     // Override only if it is crashed.
     if (!web_contents->IsCrashed())
       return NULL;
 
     web_contents->GetController().Reload(false);
     return command->SuccessResponse(NULL);
   }
   return command->InternalErrorResponse("No WebContents to reload");
 }
 
 scoped_refptr<DevToolsProtocol::Response>
 RendererOverridesHandler::PageGetNavigationHistory(
     scoped_refptr<DevToolsProtocol::Command> command) {
-  WebContents* web_contents = agent_->GetWebContents();
+  if (!host_)
+    return command->InternalErrorResponse("Could not connect to view");
+  WebContents* web_contents = WebContents::FromRenderViewHost(host_);
   if (web_contents) {
     base::DictionaryValue* result = new base::DictionaryValue();
     NavigationController& controller = web_contents->GetController();
     result->SetInteger(
         devtools::Page::getNavigationHistory::kResponseCurrentIndex,
         controller.GetCurrentEntryIndex());
     base::ListValue* entries = new base::ListValue();
     for (int i = 0; i != controller.GetEntryCount(); ++i) {
       const NavigationEntry* entry = controller.GetEntryAtIndex(i);
       base::DictionaryValue* entry_value = new base::DictionaryValue();
@@ skipping 19 matching lines @@
 scoped_refptr<DevToolsProtocol::Response>
 RendererOverridesHandler::PageNavigateToHistoryEntry(
     scoped_refptr<DevToolsProtocol::Command> command) {
   base::DictionaryValue* params = command->params();
   const char* param = devtools::Page::navigateToHistoryEntry::kParamEntryId;
   int entry_id = 0;
   if (!params || !params->GetInteger(param, &entry_id)) {
     return command->InvalidParamResponse(param);
   }
 
-  WebContents* web_contents = agent_->GetWebContents();
+  if (!host_)
+    return command->InternalErrorResponse("Could not connect to view");
+
+  WebContents* web_contents = WebContents::FromRenderViewHost(host_);
   if (web_contents) {
     NavigationController& controller = web_contents->GetController();
     for (int i = 0; i != controller.GetEntryCount(); ++i) {
       if (controller.GetEntryAtIndex(i)->GetUniqueID() == entry_id) {
         controller.GoToIndex(i);
         return command->SuccessResponse(new base::DictionaryValue());
       }
     }
     return command->InvalidParamResponse(param);
   }
   return command->InternalErrorResponse("No WebContents to navigate");
 }
 
 scoped_refptr<DevToolsProtocol::Response>
 RendererOverridesHandler::PageCaptureScreenshot(
     scoped_refptr<DevToolsProtocol::Command> command) {
-  RenderViewHostImpl* host = GetRenderViewHostImpl();
-  if (!host->GetView())
-    return command->InternalErrorResponse("Unable to access the view");
+  if (!host_ || !host_->GetView())
+    return command->InternalErrorResponse("Could not connect to view");
 
-  host->GetSnapshotFromBrowser(
+  host_->GetSnapshotFromBrowser(
       base::Bind(&RendererOverridesHandler::ScreenshotCaptured,
           weak_factory_.GetWeakPtr(), command));
   return command->AsyncResponsePromise();
 }
 
 void RendererOverridesHandler::ScreenshotCaptured(
     scoped_refptr<DevToolsProtocol::Command> command,
     const unsigned char* png_data,
     size_t png_size) {
   if (!png_data || !png_size) {
@@ skipping 23 matching lines @@
 #else
   result->SetBoolean(devtools::kResult, false);
 #endif  // defined(OS_ANDROID)
   return command->SuccessResponse(result);
 }
 
 scoped_refptr<DevToolsProtocol::Response>
 RendererOverridesHandler::PageStartScreencast(
     scoped_refptr<DevToolsProtocol::Command> command) {
   screencast_command_ = command;
-  RenderViewHostImpl* host = GetRenderViewHostImpl();
-  host->SetTouchEventEmulationEnabled(true, true);
-  bool visible = !host->is_hidden();
+  if (!host_)
+    return command->InternalErrorResponse("Could not connect to view");
+  host_->SetTouchEventEmulationEnabled(true, true);
+  bool visible = !host_->is_hidden();
   NotifyScreencastVisibility(visible);
   if (visible) {
     if (has_last_compositor_frame_metadata_)
       InnerSwapCompositorFrame();
     else
-      host->Send(new ViewMsg_ForceRedraw(host->GetRoutingID(), 0));
+      host_->Send(new ViewMsg_ForceRedraw(host_->GetRoutingID(), 0));
   }
   return command->SuccessResponse(NULL);
 }
 
 scoped_refptr<DevToolsProtocol::Response>
 RendererOverridesHandler::PageStopScreencast(
     scoped_refptr<DevToolsProtocol::Command> command) {
   last_frame_time_ = base::TimeTicks();
   screencast_command_ = NULL;
-  RenderViewHostImpl* host = GetRenderViewHostImpl();
-  if (host)
-    host->SetTouchEventEmulationEnabled(false, false);
+  if (host_)
+    host_->SetTouchEventEmulationEnabled(false, false);
   return command->SuccessResponse(NULL);
 }
 
 void RendererOverridesHandler::ScreencastFrameCaptured(
     const std::string& format,
     int quality,
     const cc::CompositorFrameMetadata& metadata,
     bool success,
     const SkBitmap& bitmap) {
   if (!success) {
@@ skipping 270 matching lines @@
       &security_origin)) {
     return command->InvalidParamResponse(
         devtools::Page::queryUsageAndQuota::kParamSecurityOrigin);
   }
 
   ResponseCallback callback = base::Bind(
       &RendererOverridesHandler::PageQueryUsageAndQuotaCompleted,
       weak_factory_.GetWeakPtr(),
       command);
 
-  scoped_refptr<quota::QuotaManager> quota_manager = GetRenderViewHostImpl()
-                                                         ->GetProcess()
-                                                         ->GetStoragePartition()
-                                                         ->GetQuotaManager();
+  if (!host_)
+    return command->InternalErrorResponse("Could not connect to view");
+
+  scoped_refptr<quota::QuotaManager> quota_manager =
+      host_->GetProcess()->GetStoragePartition()->GetQuotaManager();
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(
           &QueryUsageAndQuotaOnIOThread,
           quota_manager,
           GURL(security_origin),
           callback));
 
   return command->AsyncResponsePromise();
@@ skipping 129 matching lines @@
     event->button = WebMouseEvent::ButtonMiddle;
     event->modifiers |= WebInputEvent::MiddleButtonDown;
   } else if (button == "right") {
     event->button = WebMouseEvent::ButtonRight;
     event->modifiers |= WebInputEvent::RightButtonDown;
   } else {
     return command->InvalidParamResponse(
         devtools::Input::emulateTouchFromMouseEvent::kParamButton);
   }
 
-  RenderViewHost* host = GetRenderViewHostImpl();
+  if (!host_)
+    return command->InternalErrorResponse("Could not connect to view");
+
   if (event->type == WebInputEvent::MouseWheel)
-    host->ForwardWheelEvent(wheel_event);
+    host_->ForwardWheelEvent(wheel_event);
   else
-    host->ForwardMouseEvent(mouse_event);
+    host_->ForwardMouseEvent(mouse_event);
   return command->SuccessResponse(NULL);
 }
 
-RenderViewHostImpl* RendererOverridesHandler::GetRenderViewHostImpl() {
-  return static_cast<RenderViewHostImpl*>(
-      agent_->GetWebContents()->GetRenderViewHost());
-}
-
 }  // namespace content