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

content/renderer/gpu/gpu_benchmarking_extension.cc

Index: content/renderer/gpu/gpu_benchmarking_extension.cc
diff --git a/content/renderer/gpu/gpu_benchmarking_extension.cc b/content/renderer/gpu/gpu_benchmarking_extension.cc
index e208ca6b59bbb90826685d7aa80f3e536b784e1b..8a807ff7be61fdd6e2a0e1cce605c2844aa58357 100644
--- a/content/renderer/gpu/gpu_benchmarking_extension.cc
+++ b/content/renderer/gpu/gpu_benchmarking_extension.cc
@@ -209,7 +209,7 @@
     if (!init_compositor)
       return true;
 
-    compositor_ = render_view_impl_->GetWidget()->compositor();
+    compositor_ = render_view_impl_->compositor();
     if (!compositor_) {
       web_frame_ = NULL;
       web_view_ = NULL;
@@ -361,7 +361,7 @@
   // 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));
 
@@ -403,7 +403,7 @@
   // 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));
 
@@ -526,7 +526,7 @@
     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;
@@ -596,7 +596,7 @@
     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;
@@ -631,7 +631,7 @@
     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;
@@ -694,7 +694,7 @@
   // 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));
 
@@ -742,7 +742,7 @@
   // 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));
 
@@ -808,7 +808,7 @@
   // 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));