| Index: content/browser/android/in_process/synchronous_compositor_output_surface.cc
|
| diff --git a/content/browser/android/in_process/synchronous_compositor_output_surface.cc b/content/browser/android/in_process/synchronous_compositor_output_surface.cc
|
| index 4590ed3138390997168f8e56c8e279acbbc046b8..45a2e9903f764d6c4a5f3c47106e29b64441fc62 100644
|
| --- a/content/browser/android/in_process/synchronous_compositor_output_surface.cc
|
| +++ b/content/browser/android/in_process/synchronous_compositor_output_surface.cc
|
| @@ -79,10 +79,8 @@ SynchronousCompositorOutputSurface::SynchronousCompositorOutputSurface(
|
| capabilities_.deferred_gl_initialization = true;
|
| capabilities_.draw_and_swap_full_viewport_every_frame = true;
|
| capabilities_.adjust_deadline_for_parent = false;
|
| - if (IsDelegatedRendererEnabled()) {
|
| - capabilities_.delegated_rendering = true;
|
| - capabilities_.max_frames_pending = 1;
|
| - }
|
| + capabilities_.delegated_rendering = true;
|
| + capabilities_.max_frames_pending = 1;
|
| // Cannot call out to GetDelegate() here as the output surface is not
|
| // constructed on the correct thread.
|
|
|
| @@ -139,10 +137,6 @@ void SynchronousCompositorOutputSurface::SetNeedsBeginFrame(bool enable) {
|
| void SynchronousCompositorOutputSurface::SwapBuffers(
|
| cc::CompositorFrame* frame) {
|
| DCHECK(CalledOnValidThread());
|
| - if (!ForcedDrawToSoftwareDevice() && !IsDelegatedRendererEnabled()) {
|
| - DCHECK(context_provider_);
|
| - context_provider_->ContextGL()->ShallowFlushCHROMIUM();
|
| - }
|
|
|
| frame_holder_.reset(new cc::CompositorFrame);
|
| frame->AssignTo(frame_holder_.get());
|
|
|