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()); |