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/bind.h" | 9 #include "base/bind.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/message_loop.h" | 11 #include "base/message_loop.h" |
12 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
| 13 #include "cc/layer.h" |
| 14 #include "cc/texture_layer.h" |
13 #include "content/browser/android/content_view_core_impl.h" | 15 #include "content/browser/android/content_view_core_impl.h" |
14 #include "content/browser/gpu/gpu_surface_tracker.h" | 16 #include "content/browser/gpu/gpu_surface_tracker.h" |
15 #include "content/browser/renderer_host/compositor_impl_android.h" | 17 #include "content/browser/renderer_host/compositor_impl_android.h" |
16 #include "content/browser/renderer_host/image_transport_factory_android.h" | 18 #include "content/browser/renderer_host/image_transport_factory_android.h" |
17 #include "content/browser/renderer_host/render_widget_host_impl.h" | 19 #include "content/browser/renderer_host/render_widget_host_impl.h" |
18 #include "content/browser/renderer_host/surface_texture_transport_client_android
.h" | 20 #include "content/browser/renderer_host/surface_texture_transport_client_android
.h" |
19 #include "content/common/android/device_info.h" | 21 #include "content/common/android/device_info.h" |
20 #include "content/common/gpu/client/gl_helper.h" | 22 #include "content/common/gpu/client/gl_helper.h" |
21 #include "content/common/gpu/gpu_messages.h" | 23 #include "content/common/gpu/gpu_messages.h" |
22 #include "content/common/view_messages.h" | 24 #include "content/common/view_messages.h" |
(...skipping 29 matching lines...) Expand all Loading... |
52 : host_(widget_host), | 54 : host_(widget_host), |
53 is_layer_attached_(true), | 55 is_layer_attached_(true), |
54 content_view_core_(NULL), | 56 content_view_core_(NULL), |
55 ime_adapter_android_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), | 57 ime_adapter_android_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), |
56 cached_background_color_(SK_ColorWHITE), | 58 cached_background_color_(SK_ColorWHITE), |
57 texture_id_in_layer_(0) { | 59 texture_id_in_layer_(0) { |
58 if (CompositorImpl::UsesDirectGL()) { | 60 if (CompositorImpl::UsesDirectGL()) { |
59 surface_texture_transport_.reset(new SurfaceTextureTransportClient()); | 61 surface_texture_transport_.reset(new SurfaceTextureTransportClient()); |
60 layer_ = surface_texture_transport_->Initialize(); | 62 layer_ = surface_texture_transport_->Initialize(); |
61 } else { | 63 } else { |
62 // TODO: Cannot use CompositorImpl::CompositorSupport() in unit tests. | 64 texture_layer_ = cc::TextureLayer::create(0); |
63 texture_layer_.reset(WebKit::WebExternalTextureLayer::create()); | 65 layer_ = texture_layer_; |
64 layer_ = texture_layer_->layer(); | |
65 } | 66 } |
66 | 67 |
67 layer_->setOpaque(true); | 68 layer_->setContentsOpaque(true); |
68 layer_->setDrawsContent(true); | 69 layer_->setIsDrawable(true); |
69 | 70 |
70 host_->SetView(this); | 71 host_->SetView(this); |
71 SetContentViewCore(content_view_core); | 72 SetContentViewCore(content_view_core); |
72 } | 73 } |
73 | 74 |
74 RenderWidgetHostViewAndroid::~RenderWidgetHostViewAndroid() { | 75 RenderWidgetHostViewAndroid::~RenderWidgetHostViewAndroid() { |
75 SetContentViewCore(NULL); | 76 SetContentViewCore(NULL); |
76 if (!shared_surface_.is_null()) { | 77 if (!shared_surface_.is_null()) { |
77 ImageTransportFactoryAndroid::GetInstance()->DestroySharedSurfaceHandle( | 78 ImageTransportFactoryAndroid::GetInstance()->DestroySharedSurfaceHandle( |
78 shared_surface_); | 79 shared_surface_); |
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
226 NOTIMPLEMENTED(); | 227 NOTIMPLEMENTED(); |
227 return false; | 228 return false; |
228 } | 229 } |
229 | 230 |
230 void RenderWidgetHostViewAndroid::Show() { | 231 void RenderWidgetHostViewAndroid::Show() { |
231 if (is_layer_attached_) | 232 if (is_layer_attached_) |
232 return; | 233 return; |
233 | 234 |
234 is_layer_attached_ = true; | 235 is_layer_attached_ = true; |
235 if (content_view_core_) | 236 if (content_view_core_) |
236 content_view_core_->AttachWebLayer(layer_); | 237 content_view_core_->AttachLayer(layer_); |
237 } | 238 } |
238 | 239 |
239 void RenderWidgetHostViewAndroid::Hide() { | 240 void RenderWidgetHostViewAndroid::Hide() { |
240 if (!is_layer_attached_) | 241 if (!is_layer_attached_) |
241 return; | 242 return; |
242 | 243 |
243 is_layer_attached_ = false; | 244 is_layer_attached_ = false; |
244 if (content_view_core_) | 245 if (content_view_core_) |
245 content_view_core_->RemoveWebLayer(layer_); | 246 content_view_core_->RemoveLayer(layer_); |
246 } | 247 } |
247 | 248 |
248 bool RenderWidgetHostViewAndroid::IsShowing() { | 249 bool RenderWidgetHostViewAndroid::IsShowing() { |
249 // ContentViewCoreImpl represents the native side of the Java | 250 // ContentViewCoreImpl represents the native side of the Java |
250 // ContentViewCore. It being NULL means that it is not attached | 251 // ContentViewCore. It being NULL means that it is not attached |
251 // to the View system yet, so we treat this RWHVA as hidden. | 252 // to the View system yet, so we treat this RWHVA as hidden. |
252 return is_layer_attached_ && content_view_core_; | 253 return is_layer_attached_ && content_view_core_; |
253 } | 254 } |
254 | 255 |
255 gfx::Rect RenderWidgetHostViewAndroid::GetViewBounds() const { | 256 gfx::Rect RenderWidgetHostViewAndroid::GetViewBounds() const { |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
296 NOTIMPLEMENTED(); | 297 NOTIMPLEMENTED(); |
297 } | 298 } |
298 | 299 |
299 void RenderWidgetHostViewAndroid::RenderViewGone( | 300 void RenderWidgetHostViewAndroid::RenderViewGone( |
300 base::TerminationStatus status, int error_code) { | 301 base::TerminationStatus status, int error_code) { |
301 Destroy(); | 302 Destroy(); |
302 } | 303 } |
303 | 304 |
304 void RenderWidgetHostViewAndroid::Destroy() { | 305 void RenderWidgetHostViewAndroid::Destroy() { |
305 if (content_view_core_) { | 306 if (content_view_core_) { |
306 content_view_core_->RemoveWebLayer(layer_); | 307 content_view_core_->RemoveLayer(layer_); |
307 content_view_core_ = NULL; | 308 content_view_core_ = NULL; |
308 } | 309 } |
309 | 310 |
310 // The RenderWidgetHost's destruction led here, so don't call it. | 311 // The RenderWidgetHost's destruction led here, so don't call it. |
311 host_ = NULL; | 312 host_ = NULL; |
312 | 313 |
313 delete this; | 314 delete this; |
314 } | 315 } |
315 | 316 |
316 void RenderWidgetHostViewAndroid::SetTooltipText( | 317 void RenderWidgetHostViewAndroid::SetTooltipText( |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
381 content_view_core_->ShowDisambiguationPopup(target_rect, zoomed_bitmap); | 382 content_view_core_->ShowDisambiguationPopup(target_rect, zoomed_bitmap); |
382 } | 383 } |
383 | 384 |
384 void RenderWidgetHostViewAndroid::OnAcceleratedCompositingStateChange() { | 385 void RenderWidgetHostViewAndroid::OnAcceleratedCompositingStateChange() { |
385 } | 386 } |
386 | 387 |
387 void RenderWidgetHostViewAndroid::AcceleratedSurfaceBuffersSwapped( | 388 void RenderWidgetHostViewAndroid::AcceleratedSurfaceBuffersSwapped( |
388 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params, | 389 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params, |
389 int gpu_host_id) { | 390 int gpu_host_id) { |
390 texture_layer_->setTextureId(params.surface_handle); | 391 texture_layer_->setTextureId(params.surface_handle); |
391 DCHECK(texture_layer_->layer() == layer_); | 392 DCHECK(texture_layer_ == layer_); |
392 layer_->setBounds(params.size); | 393 layer_->setBounds(params.size); |
393 texture_id_in_layer_ = params.surface_handle; | 394 texture_id_in_layer_ = params.surface_handle; |
394 texture_size_in_layer_ = params.size; | 395 texture_size_in_layer_ = params.size; |
395 | 396 |
396 // TODO(sievers): When running the impl thread in the browser we | 397 // TODO(sievers): When running the impl thread in the browser we |
397 // need to delay the ACK until after commit. | 398 // need to delay the ACK until after commit. |
398 DCHECK(!CompositorImpl::CompositorSupport()->isThreadingEnabled()); | 399 DCHECK(!CompositorImpl::IsThreadingEnabled()); |
399 uint32 sync_point = | 400 uint32 sync_point = |
400 ImageTransportFactoryAndroid::GetInstance()->InsertSyncPoint(); | 401 ImageTransportFactoryAndroid::GetInstance()->InsertSyncPoint(); |
401 RenderWidgetHostImpl::AcknowledgeBufferPresent( | 402 RenderWidgetHostImpl::AcknowledgeBufferPresent( |
402 params.route_id, gpu_host_id, true, sync_point); | 403 params.route_id, gpu_host_id, true, sync_point); |
403 } | 404 } |
404 | 405 |
405 void RenderWidgetHostViewAndroid::AcceleratedSurfacePostSubBuffer( | 406 void RenderWidgetHostViewAndroid::AcceleratedSurfacePostSubBuffer( |
406 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params, | 407 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params, |
407 int gpu_host_id) { | 408 int gpu_host_id) { |
408 NOTREACHED(); | 409 NOTREACHED(); |
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
555 max_page_scale_factor); | 556 max_page_scale_factor); |
556 content_view_core_->UpdateScrollOffsetAndPageScaleFactor(scroll_offset.x(), | 557 content_view_core_->UpdateScrollOffsetAndPageScaleFactor(scroll_offset.x(), |
557 scroll_offset.y(), | 558 scroll_offset.y(), |
558 page_scale_factor); | 559 page_scale_factor); |
559 } | 560 } |
560 } | 561 } |
561 | 562 |
562 void RenderWidgetHostViewAndroid::SetContentViewCore( | 563 void RenderWidgetHostViewAndroid::SetContentViewCore( |
563 ContentViewCoreImpl* content_view_core) { | 564 ContentViewCoreImpl* content_view_core) { |
564 if (content_view_core_ && is_layer_attached_) | 565 if (content_view_core_ && is_layer_attached_) |
565 content_view_core_->RemoveWebLayer(layer_); | 566 content_view_core_->RemoveLayer(layer_); |
566 | 567 |
567 content_view_core_ = content_view_core; | 568 content_view_core_ = content_view_core; |
568 if (content_view_core_ && is_layer_attached_) | 569 if (content_view_core_ && is_layer_attached_) |
569 content_view_core_->AttachWebLayer(layer_); | 570 content_view_core_->AttachLayer(layer_); |
570 } | 571 } |
571 | 572 |
572 void RenderWidgetHostViewAndroid::HasTouchEventHandlers( | 573 void RenderWidgetHostViewAndroid::HasTouchEventHandlers( |
573 bool need_touch_events) { | 574 bool need_touch_events) { |
574 if (content_view_core_) | 575 if (content_view_core_) |
575 content_view_core_->HasTouchEventHandlers(need_touch_events); | 576 content_view_core_->HasTouchEventHandlers(need_touch_events); |
576 } | 577 } |
577 | 578 |
578 // static | 579 // static |
579 void RenderWidgetHostViewPort::GetDefaultScreenInfo( | 580 void RenderWidgetHostViewPort::GetDefaultScreenInfo( |
(...skipping 14 matching lines...) Expand all Loading... |
594 // RenderWidgetHostView, public: | 595 // RenderWidgetHostView, public: |
595 | 596 |
596 // static | 597 // static |
597 RenderWidgetHostView* | 598 RenderWidgetHostView* |
598 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) { | 599 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) { |
599 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget); | 600 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget); |
600 return new RenderWidgetHostViewAndroid(rwhi, NULL); | 601 return new RenderWidgetHostViewAndroid(rwhi, NULL); |
601 } | 602 } |
602 | 603 |
603 } // namespace content | 604 } // namespace content |
OLD | NEW |