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

Unified Diff: android_webview/browser/shared_renderer_state.cc

Issue 659743002: aw: Fallback delegated composite (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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;
hush (inactive) 2014/10/15 18:17:31 that means there is a period of time that force_co
boliu 2014/10/15 19:37:51 Tried that, but it's really weird to ask something
}
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_);

Powered by Google App Engine
This is Rietveld 408576698