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 667 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
678 | 678 |
679 content_view_core_->ShowDisambiguationPopup(target_rect, zoomed_bitmap); | 679 content_view_core_->ShowDisambiguationPopup(target_rect, zoomed_bitmap); |
680 } | 680 } |
681 | 681 |
682 scoped_ptr<SyntheticGestureTarget> | 682 scoped_ptr<SyntheticGestureTarget> |
683 RenderWidgetHostViewAndroid::CreateSyntheticGestureTarget() { | 683 RenderWidgetHostViewAndroid::CreateSyntheticGestureTarget() { |
684 return scoped_ptr<SyntheticGestureTarget>(new SyntheticGestureTargetAndroid( | 684 return scoped_ptr<SyntheticGestureTarget>(new SyntheticGestureTargetAndroid( |
685 host_, content_view_core_->CreateTouchEventSynthesizer())); | 685 host_, content_view_core_->CreateTouchEventSynthesizer())); |
686 } | 686 } |
687 | 687 |
| 688 void RenderWidgetHostViewAndroid::DidFinishTopControlsGesture() { |
| 689 if (content_view_core_) |
| 690 content_view_core_->DidFinishTopControlsGesture(); |
| 691 } |
| 692 |
688 void RenderWidgetHostViewAndroid::OnAcceleratedCompositingStateChange() { | 693 void RenderWidgetHostViewAndroid::OnAcceleratedCompositingStateChange() { |
689 } | 694 } |
690 | 695 |
691 void RenderWidgetHostViewAndroid::SendDelegatedFrameAck( | 696 void RenderWidgetHostViewAndroid::SendDelegatedFrameAck( |
692 uint32 output_surface_id) { | 697 uint32 output_surface_id) { |
693 cc::CompositorFrameAck ack; | 698 cc::CompositorFrameAck ack; |
694 if (resource_collection_.get()) | 699 if (resource_collection_.get()) |
695 resource_collection_->TakeUnusedResourcesForChildCompositor(&ack.resources); | 700 resource_collection_->TakeUnusedResourcesForChildCompositor(&ack.resources); |
696 RenderWidgetHostImpl::SendSwapCompositorFrameAck(host_->GetRoutingID(), | 701 RenderWidgetHostImpl::SendSwapCompositorFrameAck(host_->GetRoutingID(), |
697 output_surface_id, | 702 output_surface_id, |
(...skipping 750 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1448 // RenderWidgetHostView, public: | 1453 // RenderWidgetHostView, public: |
1449 | 1454 |
1450 // static | 1455 // static |
1451 RenderWidgetHostView* | 1456 RenderWidgetHostView* |
1452 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) { | 1457 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) { |
1453 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget); | 1458 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget); |
1454 return new RenderWidgetHostViewAndroid(rwhi, NULL); | 1459 return new RenderWidgetHostViewAndroid(rwhi, NULL); |
1455 } | 1460 } |
1456 | 1461 |
1457 } // namespace content | 1462 } // namespace content |
OLD | NEW |