Merge 280970 "Add switch to disable recording whole document"

content/renderer/gpu/render_widget_compositor.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/renderer/gpu/render_widget_compositor.h"
 
 #include <limits>
 #include <string>
 
 #if defined(OS_ANDROID)
@@ skipping 24 matching lines @@
 #include "content/renderer/input/input_handler_manager.h"
 #include "content/renderer/render_thread_impl.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "third_party/WebKit/public/platform/WebCompositeAndReadbackAsyncCallback.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/web/WebWidget.h"
 #include "ui/gfx/frame_time.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/native_theme/native_theme_switches.h"
 
+#if defined(OS_ANDROID)
+#include "content/renderer/android/synchronous_compositor_factory.h"
+#endif
+
 namespace base {
 class Value;
 }
 
 namespace cc {
 class Layer;
 }
 
 using blink::WebFloatPoint;
 using blink::WebSize;
@@ skipping 40 matching lines @@
 
   settings.throttle_frame_production =
       !cmd->HasSwitch(switches::kDisableGpuVsync);
   settings.begin_frame_scheduling_enabled =
       cmd->HasSwitch(switches::kEnableBeginFrameScheduling);
   settings.main_frame_before_activation_enabled =
       cmd->HasSwitch(cc::switches::kEnableMainFrameBeforeActivation) &&
       !cmd->HasSwitch(cc::switches::kDisableMainFrameBeforeActivation);
   settings.main_frame_before_draw_enabled =
       !cmd->HasSwitch(cc::switches::kDisableMainFrameBeforeDraw);
-  settings.using_synchronous_renderer_compositor =
-      widget->UsingSynchronousRendererCompositor();
-  settings.report_overscroll_only_for_scrollable_axes =
-      !widget->UsingSynchronousRendererCompositor();
+  settings.report_overscroll_only_for_scrollable_axes = true;
   settings.accelerated_animation_enabled =
       !cmd->HasSwitch(cc::switches::kDisableThreadedAnimation);
   settings.touch_hit_testing =
       !cmd->HasSwitch(cc::switches::kDisableCompositorTouchHitTesting);
 
   int default_tile_width = settings.default_tile_size.width();
   if (cmd->HasSwitch(switches::kDefaultTileWidth)) {
     GetSwitchValueAsInt(*cmd, switches::kDefaultTileWidth, 1,
                         std::numeric_limits<int>::max(), &default_tile_width);
   }
@@ skipping 137 matching lines @@
             &max_unused_resource_memory_percentage)) {
       settings.max_unused_resource_memory_percentage =
           max_unused_resource_memory_percentage;
     }
   }
 
   settings.strict_layer_property_change_checking =
       cmd->HasSwitch(cc::switches::kStrictLayerPropertyChangeChecking);
 
 #if defined(OS_ANDROID)
+  SynchronousCompositorFactory* synchronous_compositor_factory =
+      SynchronousCompositorFactory::GetInstance();
+
+  settings.using_synchronous_renderer_compositor =
+      synchronous_compositor_factory;
+  settings.record_full_layer =
+      synchronous_compositor_factory &&
+      synchronous_compositor_factory->RecordFullLayer();
+  settings.report_overscroll_only_for_scrollable_axes =
+      !synchronous_compositor_factory;
   settings.max_partial_texture_updates = 0;
-  if (widget->UsingSynchronousRendererCompositor()) {
+  if (synchronous_compositor_factory) {
     // Android WebView uses system scrollbars, so make ours invisible.
     settings.scrollbar_animator = cc::LayerTreeSettings::NoAnimator;
     settings.solid_color_scrollbar_color = SK_ColorTRANSPARENT;
   } else {
     settings.scrollbar_animator = cc::LayerTreeSettings::LinearFade;
     settings.scrollbar_fade_delay_ms = 300;
     settings.scrollbar_fade_duration_ms = 300;
     settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128);
   }
   settings.highp_threshold_min = 2048;
   // Android WebView handles root layer flings itself.
   settings.ignore_root_layer_flings =
-      widget->UsingSynchronousRendererCompositor();
+      synchronous_compositor_factory;
   // RGBA_4444 textures are only enabled for low end devices
   // and are disabled for Android WebView as it doesn't support the format.
   settings.use_rgba_4444_textures =
       base::android::SysUtils::IsLowEndDevice() &&
-      !widget->UsingSynchronousRendererCompositor();
-  if (widget->UsingSynchronousRendererCompositor()) {
+      !synchronous_compositor_factory;
+  if (synchronous_compositor_factory) {
     // TODO(boliu): Set this ratio for Webview.
   } else if (base::android::SysUtils::IsLowEndDevice()) {
     // On low-end we want to be very carefull about killing other
     // apps. So initially we use 50% more memory to avoid flickering
     // or raster-on-demand.
     settings.max_memory_for_prepaint_percentage = 67;
   } else {
     // On other devices we have increased memory excessively to avoid
     // raster-on-demand already, so now we reserve 50% _only_ to avoid
     // raster-on-demand, and use 50% of the memory otherwise.
     settings.max_memory_for_prepaint_percentage = 50;
   }
   // Webview does not own the surface so should not clear it.
   settings.should_clear_root_render_pass =
-      !widget->UsingSynchronousRendererCompositor();
+      !synchronous_compositor_factory;
 
 #elif !defined(OS_MACOSX)
   if (ui::IsOverlayScrollbarEnabled()) {
     settings.scrollbar_animator = cc::LayerTreeSettings::Thinning;
     settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128);
   } else if (cmd->HasSwitch(cc::switches::kEnablePinchVirtualViewport)) {
     // use_pinch_zoom_scrollbars is only true on desktop when non-overlay
     // scrollbars are in use.
     settings.use_pinch_zoom_scrollbars = true;
     settings.scrollbar_animator = cc::LayerTreeSettings::LinearFade;
@@ skipping 391 matching lines @@
   widget_->OnSwapBuffersAborted();
 }
 
 void RenderWidgetCompositor::RateLimitSharedMainThreadContext() {
   cc::ContextProvider* provider =
       RenderThreadImpl::current()->SharedMainThreadContextProvider().get();
   provider->ContextGL()->RateLimitOffscreenContextCHROMIUM();
 }
 
 }  // namespace content