Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(482)

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_android.cc

Issue 2790893004: Delete Android content detectors. (Closed)
Patch Set: Rebase Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <utility> 9 #include <utility>
10 10
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 overscroll_controller_->Disable(); 509 overscroll_controller_->Disable();
510 } 510 }
511 511
512 bool RenderWidgetHostViewAndroid::OnMessageReceived( 512 bool RenderWidgetHostViewAndroid::OnMessageReceived(
513 const IPC::Message& message) { 513 const IPC::Message& message) {
514 if (IPC_MESSAGE_ID_CLASS(message.type()) == SyncCompositorMsgStart) { 514 if (IPC_MESSAGE_ID_CLASS(message.type()) == SyncCompositorMsgStart) {
515 return SyncCompositorOnMessageReceived(message); 515 return SyncCompositorOnMessageReceived(message);
516 } 516 }
517 bool handled = true; 517 bool handled = true;
518 IPC_BEGIN_MESSAGE_MAP(RenderWidgetHostViewAndroid, message) 518 IPC_BEGIN_MESSAGE_MAP(RenderWidgetHostViewAndroid, message)
519 IPC_MESSAGE_HANDLER(ViewHostMsg_StartContentIntent, OnStartContentIntent)
520 IPC_MESSAGE_HANDLER(ViewHostMsg_ShowUnhandledTapUIIfNeeded, 519 IPC_MESSAGE_HANDLER(ViewHostMsg_ShowUnhandledTapUIIfNeeded,
521 OnShowUnhandledTapUIIfNeeded) 520 OnShowUnhandledTapUIIfNeeded)
522 IPC_MESSAGE_UNHANDLED(handled = false) 521 IPC_MESSAGE_UNHANDLED(handled = false)
523 IPC_END_MESSAGE_MAP() 522 IPC_END_MESSAGE_MAP()
524 return handled; 523 return handled;
525 } 524 }
526 525
527 bool RenderWidgetHostViewAndroid::SyncCompositorOnMessageReceived( 526 bool RenderWidgetHostViewAndroid::SyncCompositorOnMessageReceived(
528 const IPC::Message& message) { 527 const IPC::Message& message) {
529 DCHECK(!content_view_core_ || sync_compositor_) << !!content_view_core_; 528 DCHECK(!content_view_core_ || sync_compositor_) << !!content_view_core_;
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
906 905
907 return target_view->TransformPointToLocalCoordSpace(point, surface_id, 906 return target_view->TransformPointToLocalCoordSpace(point, surface_id,
908 transformed_point); 907 transformed_point);
909 } 908 }
910 909
911 base::WeakPtr<RenderWidgetHostViewAndroid> 910 base::WeakPtr<RenderWidgetHostViewAndroid>
912 RenderWidgetHostViewAndroid::GetWeakPtrAndroid() { 911 RenderWidgetHostViewAndroid::GetWeakPtrAndroid() {
913 return weak_ptr_factory_.GetWeakPtr(); 912 return weak_ptr_factory_.GetWeakPtr();
914 } 913 }
915 914
916 void RenderWidgetHostViewAndroid::OnStartContentIntent(
917 const GURL& content_url, bool is_main_frame) {
918 view_.StartContentIntent(content_url, is_main_frame);
919 }
920
921 bool RenderWidgetHostViewAndroid::OnTouchEvent( 915 bool RenderWidgetHostViewAndroid::OnTouchEvent(
922 const ui::MotionEvent& event) { 916 const ui::MotionEvent& event) {
923 if (!host_ || !host_->delegate()) 917 if (!host_ || !host_->delegate())
924 return false; 918 return false;
925 919
926 ComputeEventLatencyOSTouchHistograms(event); 920 ComputeEventLatencyOSTouchHistograms(event);
927 921
928 // If a browser-based widget consumes the touch event, it's critical that 922 // If a browser-based widget consumes the touch event, it's critical that
929 // touch event interception be disabled. This avoids issues with 923 // touch event interception be disabled. This avoids issues with
930 // double-handling for embedder-detected gestures like side swipe. 924 // double-handling for embedder-detected gestures like side swipe.
(...skipping 1244 matching lines...) Expand 10 before | Expand all | Expand 10 after
2175 2169
2176 ui::WindowAndroidCompositor* compositor = window_android->GetCompositor(); 2170 ui::WindowAndroidCompositor* compositor = window_android->GetCompositor();
2177 if (!compositor) 2171 if (!compositor)
2178 return; 2172 return;
2179 2173
2180 overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>( 2174 overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>(
2181 overscroll_refresh_handler, compositor, view_.GetDipScale()); 2175 overscroll_refresh_handler, compositor, view_.GetDipScale());
2182 } 2176 }
2183 2177
2184 } // namespace content 2178 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_android.h ('k') | content/browser/web_contents/web_contents_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698