Chromium Code Reviews| Index: content/browser/renderer_host/render_widget_host_view_android.cc |
| diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc |
| index 4f1c64d810b30557b4b3434ce3de598a3915c4f4..2e2b4e7829628332a22ead3637b6fa5f33437d96 100644 |
| --- a/content/browser/renderer_host/render_widget_host_view_android.cc |
| +++ b/content/browser/renderer_host/render_widget_host_view_android.cc |
| @@ -155,8 +155,9 @@ RenderWidgetHostViewAndroid::RenderWidgetHostViewAndroid( |
| using_synchronous_compositor_(SynchronousCompositorImpl::FromID( |
| widget_host->GetProcess()->GetID(), |
| widget_host->GetRoutingID()) != NULL), |
| - frame_evictor_(new DelegatedFrameEvictor(this)) { |
| - if (!UsingDelegatedRenderer()) { |
| + frame_evictor_(new DelegatedFrameEvictor(this)), |
| + using_delegated_renderer_(UsingDelegatedRenderer()) { |
|
no sievers
2014/02/14 18:42:48
I'd remove the function now and inline the code he
sivag
2014/02/17 07:51:13
Done.
|
| + if (!using_delegated_renderer_) { |
| texture_layer_ = cc::TextureLayer::Create(NULL); |
| layer_ = texture_layer_; |
| } |
| @@ -324,7 +325,7 @@ bool RenderWidgetHostViewAndroid::HasValidFrame() const { |
| if (texture_size_in_layer_.IsEmpty()) |
| return false; |
| - if (UsingDelegatedRenderer()) { |
| + if (using_delegated_renderer_) { |
| if (!delegated_renderer_layer_.get()) |
| return false; |
| } else { |
| @@ -853,7 +854,7 @@ void RenderWidgetHostViewAndroid::OnSwapCompositorFrame( |
| } |
| if (frame->delegated_frame_data) { |
| - DCHECK(UsingDelegatedRenderer()); |
| + DCHECK(using_delegated_renderer_); |
| DCHECK(frame->delegated_frame_data); |
| DCHECK(!frame->delegated_frame_data->render_pass_list.empty()); |
| @@ -868,7 +869,7 @@ void RenderWidgetHostViewAndroid::OnSwapCompositorFrame( |
| return; |
| } |
| - DCHECK(!UsingDelegatedRenderer()); |
| + DCHECK(!using_delegated_renderer_); |
| if (!frame->gl_frame_data || frame->gl_frame_data->mailbox.IsZero()) |
| return; |