| Index: android_webview/browser/shared_renderer_state.cc
|
| diff --git a/android_webview/browser/shared_renderer_state.cc b/android_webview/browser/shared_renderer_state.cc
|
| index 2ac3d049f50d42d455425f9009d1896bd42458c9..6281e5cb6ecb31ec51f9442f1907036839a6c3e5 100644
|
| --- a/android_webview/browser/shared_renderer_state.cc
|
| +++ b/android_webview/browser/shared_renderer_state.cc
|
| @@ -72,6 +72,7 @@ SharedRendererState::SharedRendererState(
|
| BrowserViewRendererClient* client)
|
| : ui_loop_(ui_loop),
|
| client_on_ui_(client),
|
| + force_commit_(false),
|
| inside_hardware_release_(false),
|
| needs_force_invalidate_on_next_draw_gl_(false),
|
| weak_factory_on_ui_thread_(this) {
|
| @@ -145,10 +146,11 @@ bool SharedRendererState::HasCompositorFrame() const {
|
| }
|
|
|
| void SharedRendererState::SetCompositorFrame(
|
| - scoped_ptr<cc::CompositorFrame> frame) {
|
| + scoped_ptr<cc::CompositorFrame> frame, bool force_commit) {
|
| base::AutoLock lock(lock_);
|
| DCHECK(!compositor_frame_.get());
|
| compositor_frame_ = frame.Pass();
|
| + force_commit_ = force_commit;
|
| }
|
|
|
| scoped_ptr<cc::CompositorFrame> SharedRendererState::PassCompositorFrame() {
|
| @@ -156,6 +158,11 @@ scoped_ptr<cc::CompositorFrame> SharedRendererState::PassCompositorFrame() {
|
| return compositor_frame_.Pass();
|
| }
|
|
|
| +bool SharedRendererState::ForceCommit() {
|
| + base::AutoLock lock(lock_);
|
| + return force_commit_;
|
| +}
|
| +
|
| bool SharedRendererState::UpdateDrawConstraints(
|
| const ParentCompositorDrawConstraints& parent_draw_constraints) {
|
| base::AutoLock lock(lock_);
|
|
|