| 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 119b7fdf184bbc385785d2f957cc1a24f4cf365a..d177da23ad0e216c4d16423da5e1007a57271da6 100644
|
| --- a/android_webview/browser/shared_renderer_state.cc
|
| +++ b/android_webview/browser/shared_renderer_state.cc
|
| @@ -88,9 +88,7 @@ SharedRendererState::SharedRendererState(
|
| : ui_loop_(ui_loop),
|
| browser_view_renderer_(browser_view_renderer),
|
| renderer_manager_key_(GLViewRendererManager::GetInstance()->NullKey()),
|
| - force_commit_(false),
|
| inside_hardware_release_(false),
|
| - needs_force_invalidate_on_next_draw_gl_(false),
|
| weak_factory_on_ui_thread_(this) {
|
| DCHECK(ui_loop_->BelongsToCurrentThread());
|
| DCHECK(browser_view_renderer_);
|
| @@ -157,18 +155,11 @@ gfx::Vector2d SharedRendererState::GetScrollOffsetOnRT() {
|
| return scroll_offset_;
|
| }
|
|
|
| -bool SharedRendererState::HasCompositorFrameOnUI() const {
|
| - base::AutoLock lock(lock_);
|
| - return compositor_frame_.get();
|
| -}
|
| -
|
| void SharedRendererState::SetCompositorFrameOnUI(
|
| - scoped_ptr<cc::CompositorFrame> frame,
|
| - bool force_commit) {
|
| + scoped_ptr<cc::CompositorFrame> frame) {
|
| base::AutoLock lock(lock_);
|
| DCHECK(!compositor_frame_.get());
|
| compositor_frame_ = frame.Pass();
|
| - force_commit_ = force_commit;
|
| }
|
|
|
| scoped_ptr<cc::CompositorFrame> SharedRendererState::PassCompositorFrameOnRT() {
|
| @@ -182,16 +173,10 @@ SharedRendererState::PassUncommittedFrameOnUI() {
|
| return compositor_frame_.Pass();
|
| }
|
|
|
| -bool SharedRendererState::ForceCommitOnRT() const {
|
| - base::AutoLock lock(lock_);
|
| - return force_commit_;
|
| -}
|
| -
|
| bool SharedRendererState::UpdateDrawConstraintsOnRT(
|
| const ParentCompositorDrawConstraints& parent_draw_constraints) {
|
| base::AutoLock lock(lock_);
|
| - if (needs_force_invalidate_on_next_draw_gl_ ||
|
| - !parent_draw_constraints_.Equals(parent_draw_constraints)) {
|
| + if (!parent_draw_constraints_.Equals(parent_draw_constraints)) {
|
| parent_draw_constraints_ = parent_draw_constraints;
|
| return true;
|
| }
|
| @@ -210,35 +195,12 @@ void SharedRendererState::PostExternalDrawConstraintsToChildCompositorOnRT(
|
| }
|
| }
|
|
|
| -void SharedRendererState::DidSkipCommitFrameOnRT() {
|
| - ui_loop_->PostTask(FROM_HERE,
|
| - base::Bind(&SharedRendererState::DidSkipCommitFrameOnUI,
|
| - ui_thread_weak_ptr_));
|
| -}
|
| -
|
| -void SharedRendererState::DidSkipCommitFrameOnUI() {
|
| - DCHECK(ui_loop_->BelongsToCurrentThread());
|
| - browser_view_renderer_->DidSkipCommitFrame();
|
| -}
|
| -
|
| ParentCompositorDrawConstraints
|
| SharedRendererState::GetParentDrawConstraintsOnUI() const {
|
| base::AutoLock lock(lock_);
|
| return parent_draw_constraints_;
|
| }
|
|
|
| -void SharedRendererState::SetForceInvalidateOnNextDrawGLOnUI(
|
| - bool needs_force_invalidate_on_next_draw_gl) {
|
| - base::AutoLock lock(lock_);
|
| - needs_force_invalidate_on_next_draw_gl_ =
|
| - needs_force_invalidate_on_next_draw_gl;
|
| -}
|
| -
|
| -bool SharedRendererState::NeedsForceInvalidateOnNextDrawGLOnUI() const {
|
| - base::AutoLock lock(lock_);
|
| - return needs_force_invalidate_on_next_draw_gl_;
|
| -}
|
| -
|
| void SharedRendererState::SetInsideHardwareRelease(bool inside) {
|
| base::AutoLock lock(lock_);
|
| inside_hardware_release_ = inside;
|
|
|