Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1478)

Unified Diff: android_webview/browser/shared_renderer_state.cc

Issue 914103004: (NOT FOR COMMIT) Remove BVR cruft (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/browser/shared_renderer_state.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 577991439c51660130156366b753e5f90d7b52be..31d1c6b1ca01563e23295e7b9ff90f93fba17c4d 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;
« no previous file with comments | « android_webview/browser/shared_renderer_state.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698