Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/renderer_host/render_widget_host_view_android.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_android.h" |
| 6 | 6 |
| 7 #include <android/bitmap.h> | 7 #include <android/bitmap.h> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 108 : host_(widget_host), | 108 : host_(widget_host), |
| 109 needs_begin_frame_(false), | 109 needs_begin_frame_(false), |
| 110 are_layers_attached_(true), | 110 are_layers_attached_(true), |
| 111 content_view_core_(NULL), | 111 content_view_core_(NULL), |
| 112 ime_adapter_android_(this), | 112 ime_adapter_android_(this), |
| 113 cached_background_color_(SK_ColorWHITE), | 113 cached_background_color_(SK_ColorWHITE), |
| 114 texture_id_in_layer_(0), | 114 texture_id_in_layer_(0), |
| 115 current_mailbox_output_surface_id_(kUndefinedOutputSurfaceId), | 115 current_mailbox_output_surface_id_(kUndefinedOutputSurfaceId), |
| 116 weak_ptr_factory_(this), | 116 weak_ptr_factory_(this), |
| 117 overscroll_effect_enabled_(true), | 117 overscroll_effect_enabled_(true), |
| 118 flush_input_requested_(false) { | 118 flush_input_requested_(false), |
| 119 overlay_video_mode_(false) { | |
| 119 if (CompositorImpl::UsesDirectGL()) { | 120 if (CompositorImpl::UsesDirectGL()) { |
| 120 surface_texture_transport_.reset(new SurfaceTextureTransportClient()); | 121 surface_texture_transport_.reset(new SurfaceTextureTransportClient()); |
| 121 layer_ = surface_texture_transport_->Initialize(); | 122 layer_ = surface_texture_transport_->Initialize(); |
| 122 layer_->SetIsDrawable(true); | 123 layer_->SetIsDrawable(true); |
| 123 } else { | 124 } else { |
| 124 if (CommandLine::ForCurrentProcess()->HasSwitch( | 125 if (CommandLine::ForCurrentProcess()->HasSwitch( |
| 125 switches::kEnableDelegatedRenderer)) { | 126 switches::kEnableDelegatedRenderer)) { |
| 126 delegated_renderer_layer_ = cc::DelegatedRendererLayer::Create(this); | 127 delegated_renderer_layer_ = cc::DelegatedRendererLayer::Create(this); |
| 127 layer_ = delegated_renderer_layer_; | 128 layer_ = delegated_renderer_layer_; |
| 128 } else { | 129 } else { |
| (...skipping 618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 747 } | 748 } |
| 748 | 749 |
| 749 void RenderWidgetHostViewAndroid::SynchronousFrameMetadata( | 750 void RenderWidgetHostViewAndroid::SynchronousFrameMetadata( |
| 750 const cc::CompositorFrameMetadata& frame_metadata) { | 751 const cc::CompositorFrameMetadata& frame_metadata) { |
| 751 // This is a subset of OnSwapCompositorFrame() used in the synchronous | 752 // This is a subset of OnSwapCompositorFrame() used in the synchronous |
| 752 // compositor flow. | 753 // compositor flow. |
| 753 UpdateContentViewCoreFrameMetadata(frame_metadata); | 754 UpdateContentViewCoreFrameMetadata(frame_metadata); |
| 754 ComputeContentsSize(frame_metadata); | 755 ComputeContentsSize(frame_metadata); |
| 755 } | 756 } |
| 756 | 757 |
| 758 void RenderWidgetHostViewAndroid::SetOverlayVideoMode(bool enabled) { | |
| 759 if (overlay_video_mode_ == enabled) | |
|
Ted C
2013/09/30 15:54:36
Doesn't look like you really need to store this va
| |
| 760 return; | |
| 761 overlay_video_mode_ = enabled; | |
| 762 layer_->SetContentsOpaque(!enabled); | |
| 763 } | |
| 764 | |
| 757 void RenderWidgetHostViewAndroid::UpdateContentViewCoreFrameMetadata( | 765 void RenderWidgetHostViewAndroid::UpdateContentViewCoreFrameMetadata( |
| 758 const cc::CompositorFrameMetadata& frame_metadata) { | 766 const cc::CompositorFrameMetadata& frame_metadata) { |
| 759 if (content_view_core_) { | 767 if (content_view_core_) { |
| 760 // All offsets and sizes are in CSS pixels. | 768 // All offsets and sizes are in CSS pixels. |
| 761 content_view_core_->UpdateFrameInfo( | 769 content_view_core_->UpdateFrameInfo( |
| 762 frame_metadata.root_scroll_offset, | 770 frame_metadata.root_scroll_offset, |
| 763 frame_metadata.page_scale_factor, | 771 frame_metadata.page_scale_factor, |
| 764 gfx::Vector2dF(frame_metadata.min_page_scale_factor, | 772 gfx::Vector2dF(frame_metadata.min_page_scale_factor, |
| 765 frame_metadata.max_page_scale_factor), | 773 frame_metadata.max_page_scale_factor), |
| 766 frame_metadata.root_layer_size, | 774 frame_metadata.root_layer_size, |
| (...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1336 // RenderWidgetHostView, public: | 1344 // RenderWidgetHostView, public: |
| 1337 | 1345 |
| 1338 // static | 1346 // static |
| 1339 RenderWidgetHostView* | 1347 RenderWidgetHostView* |
| 1340 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) { | 1348 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) { |
| 1341 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget); | 1349 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget); |
| 1342 return new RenderWidgetHostViewAndroid(rwhi, NULL); | 1350 return new RenderWidgetHostViewAndroid(rwhi, NULL); |
| 1343 } | 1351 } |
| 1344 | 1352 |
| 1345 } // namespace content | 1353 } // namespace content |
| OLD | NEW |