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

Unified Diff: content/browser/android/in_process/synchronous_compositor_impl.cc

Issue 16613002: Hook up android webview synchronous compositor GL init (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: why is gcc so tolerant of errors?! Created 7 years, 6 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: content/browser/android/in_process/synchronous_compositor_impl.cc
diff --git a/content/browser/android/in_process/synchronous_compositor_impl.cc b/content/browser/android/in_process/synchronous_compositor_impl.cc
index 7a53cd057cf3c0b48d9f148cbe1daa3112c58979..df85b7bf14738d8f411a917d904cbf16a9bb7535 100644
--- a/content/browser/android/in_process/synchronous_compositor_impl.cc
+++ b/content/browser/android/in_process/synchronous_compositor_impl.cc
@@ -119,24 +119,16 @@ SynchronousCompositorImpl::~SynchronousCompositorImpl() {
compositor_client_->DidDestroyCompositor(this);
}
-bool SynchronousCompositorImpl::IsHwReady() {
- DCHECK(CalledOnValidThread());
- DCHECK(output_surface_);
-
- return output_surface_->IsHwReady();
-}
-
void SynchronousCompositorImpl::SetClient(
SynchronousCompositorClient* compositor_client) {
DCHECK(CalledOnValidThread());
compositor_client_ = compositor_client;
}
-bool SynchronousCompositorImpl::DemandDrawSw(SkCanvas* canvas) {
+bool SynchronousCompositorImpl::InitializeHwDraw() {
DCHECK(CalledOnValidThread());
DCHECK(output_surface_);
-
- return output_surface_->DemandDrawSw(canvas);
+ return output_surface_->InitializeHwDraw();
}
bool SynchronousCompositorImpl::DemandDrawHw(
@@ -149,6 +141,13 @@ bool SynchronousCompositorImpl::DemandDrawHw(
return output_surface_->DemandDrawHw(view_size, transform, damage_area);
}
+bool SynchronousCompositorImpl::DemandDrawSw(SkCanvas* canvas) {
+ DCHECK(CalledOnValidThread());
+ DCHECK(output_surface_);
+
+ return output_surface_->DemandDrawSw(canvas);
+}
+
void SynchronousCompositorImpl::DidBindOutputSurface(
SynchronousCompositorOutputSurface* output_surface) {
DCHECK(CalledOnValidThread());

Powered by Google App Engine
This is Rietveld 408576698