Revert of Separate RenderView from RenderWidget, part 1: inheritance.

content/renderer/gpu/gpu_benchmarking_extension.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/renderer/gpu/gpu_benchmarking_extension.h"
 
 #include <stddef.h>
 #include <string>
 #include <utility>
 
@@ skipping 191 matching lines @@
     render_view_impl_ = RenderViewImpl::FromWebView(web_view_);
     if (!render_view_impl_) {
       web_frame_ = NULL;
       web_view_ = NULL;
       return false;
     }
 
     if (!init_compositor)
       return true;
 
-    compositor_ = render_view_impl_->GetWidget()->compositor();
+    compositor_ = render_view_impl_->compositor();
     if (!compositor_) {
       web_frame_ = NULL;
       web_view_ = NULL;
       render_view_impl_ = NULL;
       return false;
     }
 
     return true;
   }
 
@@ skipping 131 matching lines @@
     distance.set_y(-distance_length);
     distance.set_x(-distance_length);
   } else {
     return false;
   }
   gesture_params->distances.push_back(distance);
 
   // TODO(nduca): If the render_view_impl is destroyed while the gesture is in
   // progress, we will leak the callback and context. This needs to be fixed,
   // somehow.
-  context.render_view_impl()->GetWidget()->QueueSyntheticGesture(
+  context.render_view_impl()->QueueSyntheticGesture(
       std::move(gesture_params),
       base::Bind(&OnSyntheticGestureCompleted, callback_and_context));
 
   return true;
 }
 
 bool BeginSmoothDrag(v8::Isolate* isolate,
                      float start_x,
                      float start_y,
                      float end_x,
@@ skipping 21 matching lines @@
   gfx::Vector2dF distance = end_point - gesture_params->start_point;
   gesture_params->distances.push_back(distance);
   gesture_params->speed_in_pixels_s = speed_in_pixels_s * page_scale_factor;
   gesture_params->gesture_source_type =
       static_cast<SyntheticGestureParams::GestureSourceType>(
           gesture_source_type);
 
   // TODO(nduca): If the render_view_impl is destroyed while the gesture is in
   // progress, we will leak the callback and context. This needs to be fixed,
   // somehow.
-  context.render_view_impl()->GetWidget()->QueueSyntheticGesture(
+  context.render_view_impl()->QueueSyntheticGesture(
       std::move(gesture_params),
       base::Bind(&OnSyntheticGestureCompleted, callback_and_context));
 
   return true;
 }
 
 }  // namespace
 
 gin::WrapperInfo GpuBenchmarking::kWrapperInfo = {gin::kEmbedderNativeGin};
 
@@ skipping 102 matching lines @@
       static_cast<SyntheticGestureParams::GestureSourceType>(
           gesture_source_type));
 }
 
 bool GpuBenchmarking::SmoothScrollBy(gin::Arguments* args) {
   GpuBenchmarkingContext context;
   if (!context.Init(true))
     return false;
 
   float page_scale_factor = context.web_view()->pageScaleFactor();
-  blink::WebRect rect = context.render_view_impl()->GetWidget()->windowRect();
+  blink::WebRect rect = context.render_view_impl()->windowRect();
 
   float pixels_to_scroll = 0;
   v8::Local<v8::Function> callback;
   float start_x = rect.width / (page_scale_factor * 2);
   float start_y = rect.height / (page_scale_factor * 2);
   int gesture_source_type = SyntheticGestureParams::DEFAULT_INPUT;
   std::string direction = "down";
   float speed_in_pixels_s = 800;
 
   if (!GetOptionalArg(args, &pixels_to_scroll) ||
@@ skipping 49 matching lines @@
                          gesture_source_type,
                          speed_in_pixels_s);
 }
 
 bool GpuBenchmarking::Swipe(gin::Arguments* args) {
   GpuBenchmarkingContext context;
   if (!context.Init(true))
     return false;
 
   float page_scale_factor = context.web_view()->pageScaleFactor();
-  blink::WebRect rect = context.render_view_impl()->GetWidget()->windowRect();
+  blink::WebRect rect = context.render_view_impl()->windowRect();
 
   std::string direction = "up";
   float pixels_to_scroll = 0;
   v8::Local<v8::Function> callback;
   float start_x = rect.width / (page_scale_factor * 2);
   float start_y = rect.height / (page_scale_factor * 2);
   float speed_in_pixels_s = 800;
 
   if (!GetOptionalArg(args, &direction) ||
       !GetOptionalArg(args, &pixels_to_scroll) ||
@@ skipping 14 matching lines @@
                            start_x,
                            start_y);
 }
 
 bool GpuBenchmarking::ScrollBounce(gin::Arguments* args) {
   GpuBenchmarkingContext context;
   if (!context.Init(false))
     return false;
 
   float page_scale_factor = context.web_view()->pageScaleFactor();
-  blink::WebRect rect = context.render_view_impl()->GetWidget()->windowRect();
+  blink::WebRect rect = context.render_view_impl()->windowRect();
 
   std::string direction = "down";
   float distance_length = 0;
   float overscroll_length = 0;
   int repeat_count = 1;
   v8::Local<v8::Function> callback;
   float start_x = rect.width / (page_scale_factor * 2);
   float start_y = rect.height / (page_scale_factor * 2);
   float speed_in_pixels_s = 800;
 
@@ skipping 42 matching lines @@
   }
 
   for (int i = 0; i < repeat_count; i++) {
     gesture_params->distances.push_back(distance);
     gesture_params->distances.push_back(-distance + overscroll);
   }
 
   // TODO(nduca): If the render_view_impl is destroyed while the gesture is in
   // progress, we will leak the callback and context. This needs to be fixed,
   // somehow.
-  context.render_view_impl()->GetWidget()->QueueSyntheticGesture(
+  context.render_view_impl()->QueueSyntheticGesture(
       std::move(gesture_params),
       base::Bind(&OnSyntheticGestureCompleted, callback_and_context));
 
   return true;
 }
 
 bool GpuBenchmarking::PinchBy(gin::Arguments* args) {
   GpuBenchmarkingContext context;
   if (!context.Init(false))
     return false;
@@ skipping 27 matching lines @@
 
   scoped_refptr<CallbackAndContext> callback_and_context =
       new CallbackAndContext(args->isolate(),
                              callback,
                              context.web_frame()->mainWorldScriptContext());
 
 
   // TODO(nduca): If the render_view_impl is destroyed while the gesture is in
   // progress, we will leak the callback and context. This needs to be fixed,
   // somehow.
-  context.render_view_impl()->GetWidget()->QueueSyntheticGesture(
+  context.render_view_impl()->QueueSyntheticGesture(
       std::move(gesture_params),
       base::Bind(&OnSyntheticGestureCompleted, callback_and_context));
 
   return true;
 }
 
 float GpuBenchmarking::VisualViewportHeight() {
   GpuBenchmarkingContext context;
   if (!context.Init(false))
     return 0.0;
@@ skipping 45 matching lines @@
           gesture_source_type);
 
   scoped_refptr<CallbackAndContext> callback_and_context =
       new CallbackAndContext(args->isolate(),
                              callback,
                              context.web_frame()->mainWorldScriptContext());
 
   // TODO(nduca): If the render_view_impl is destroyed while the gesture is in
   // progress, we will leak the callback and context. This needs to be fixed,
   // somehow.
-  context.render_view_impl()->GetWidget()->QueueSyntheticGesture(
+  context.render_view_impl()->QueueSyntheticGesture(
       std::move(gesture_params),
       base::Bind(&OnSyntheticGestureCompleted, callback_and_context));
 
   return true;
 }
 
 void GpuBenchmarking::ClearImageCache() {
   WebImageCache::clear();
 }
 
@@ skipping 53 matching lines @@
 bool GpuBenchmarking::HasGpuProcess() {
   bool has_gpu_process = false;
   if (!RenderThreadImpl::current()->Send(
           new GpuHostMsg_HasGpuProcess(&has_gpu_process)))
     return false;
 
   return has_gpu_process;
 }
 
 }  // namespace content