Commit 66bd551c authored by jbates@chromium.org's avatar jbates@chromium.org

Implement isRenderingVSynced on RenderWidget

BUG=137797


Review URL: https://chromiumcodereview.appspot.com/10826025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149352 0039d316-1c4b-4281-b951-d872f2087c98
parent 27626e65
...@@ -73,6 +73,7 @@ ...@@ -73,6 +73,7 @@
#include "ui/base/ui_base_switches.h" #include "ui/base/ui_base_switches.h"
#include "ui/gfx/display.h" #include "ui/gfx/display.h"
#include "ui/gfx/screen.h" #include "ui/gfx/screen.h"
#include "ui/gl/gl_switches.h"
#include "webkit/glue/web_intent_data.h" #include "webkit/glue/web_intent_data.h"
#include "webkit/glue/web_intent_service_data.h" #include "webkit/glue/web_intent_service_data.h"
#include "webkit/glue/webpreferences.h" #include "webkit/glue/webpreferences.h"
...@@ -476,6 +477,8 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh, ...@@ -476,6 +477,8 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,
command_line.HasSwitch(switches::kShowFPSCounter); command_line.HasSwitch(switches::kShowFPSCounter);
prefs.show_paint_rects = prefs.show_paint_rects =
command_line.HasSwitch(switches::kShowPaintRects); command_line.HasSwitch(switches::kShowPaintRects);
prefs.render_vsync_enabled =
!command_line.HasSwitch(switches::kDisableGpuVsync);
prefs.accelerated_compositing_enabled = prefs.accelerated_compositing_enabled =
GpuProcessHost::gpu_enabled() && GpuProcessHost::gpu_enabled() &&
!command_line.HasSwitch(switches::kDisableAcceleratedCompositing); !command_line.HasSwitch(switches::kDisableAcceleratedCompositing);
......
...@@ -188,6 +188,7 @@ IPC_STRUCT_TRAITS_BEGIN(webkit_glue::WebPreferences) ...@@ -188,6 +188,7 @@ IPC_STRUCT_TRAITS_BEGIN(webkit_glue::WebPreferences)
IPC_STRUCT_TRAITS_MEMBER(show_composited_layer_tree) IPC_STRUCT_TRAITS_MEMBER(show_composited_layer_tree)
IPC_STRUCT_TRAITS_MEMBER(show_fps_counter) IPC_STRUCT_TRAITS_MEMBER(show_fps_counter)
IPC_STRUCT_TRAITS_MEMBER(show_paint_rects) IPC_STRUCT_TRAITS_MEMBER(show_paint_rects)
IPC_STRUCT_TRAITS_MEMBER(render_vsync_enabled)
IPC_STRUCT_TRAITS_MEMBER(asynchronous_spell_checking_enabled) IPC_STRUCT_TRAITS_MEMBER(asynchronous_spell_checking_enabled)
IPC_STRUCT_TRAITS_MEMBER(unified_textchecker_enabled) IPC_STRUCT_TRAITS_MEMBER(unified_textchecker_enabled)
IPC_STRUCT_TRAITS_MEMBER(accelerated_compositing_enabled) IPC_STRUCT_TRAITS_MEMBER(accelerated_compositing_enabled)
......
...@@ -79,6 +79,7 @@ WebPreferences::WebPreferences() ...@@ -79,6 +79,7 @@ WebPreferences::WebPreferences()
show_composited_layer_tree(false), show_composited_layer_tree(false),
show_fps_counter(false), show_fps_counter(false),
show_paint_rects(false), show_paint_rects(false),
render_vsync_enabled(true),
asynchronous_spell_checking_enabled(true), asynchronous_spell_checking_enabled(true),
unified_textchecker_enabled(false), unified_textchecker_enabled(false),
accelerated_compositing_enabled(false), accelerated_compositing_enabled(false),
...@@ -320,6 +321,9 @@ void WebPreferences::Apply(WebView* web_view) const { ...@@ -320,6 +321,9 @@ void WebPreferences::Apply(WebView* web_view) const {
// overlay of rects, if requested on the command line. // overlay of rects, if requested on the command line.
settings->setShowPaintRects(show_paint_rects); settings->setShowPaintRects(show_paint_rects);
// Set whether to throttle framerate to Vsync.
settings->setRenderVSyncEnabled(render_vsync_enabled);
// Enable gpu-accelerated compositing if requested on the command line. // Enable gpu-accelerated compositing if requested on the command line.
settings->setAcceleratedCompositingEnabled(accelerated_compositing_enabled); settings->setAcceleratedCompositingEnabled(accelerated_compositing_enabled);
......
...@@ -97,6 +97,7 @@ struct WEBKIT_GLUE_EXPORT WebPreferences { ...@@ -97,6 +97,7 @@ struct WEBKIT_GLUE_EXPORT WebPreferences {
bool show_composited_layer_tree; bool show_composited_layer_tree;
bool show_fps_counter; bool show_fps_counter;
bool show_paint_rects; bool show_paint_rects;
bool render_vsync_enabled;
bool asynchronous_spell_checking_enabled; bool asynchronous_spell_checking_enabled;
bool unified_textchecker_enabled; bool unified_textchecker_enabled;
bool accelerated_compositing_enabled; bool accelerated_compositing_enabled;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment