content/browser/renderer_host/render_widget_host_view_android.cc - Issue 2263043002: android_webview: Let AwContents manage TouchHandleDrawable

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/render_widget_host_view_android.cc

Issue 2263043002: android_webview: Let AwContents manage TouchHandleDrawable (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: create drawable from Java Created 4 years, 4 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 side-by-side diff with in-line comments

Download patch

« android_webview/native/popup_touch_handle_drawable.cc ('K') | « content/browser/android/synchronous_compositor_host.h ('k') | content/content_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 99330cd7b65b3e1d4efa14a6c42327114d361d54..55298681a6e3f231a21161428282ab28c3ed6816 100644

--- a/content/browser/renderer_host/render_widget_host_view_android.cc

+++ b/content/browser/renderer_host/render_widget_host_view_android.cc

@@ -38,7 +38,6 @@

#include "content/browser/android/composited_touch_handle_drawable.h"

#include "content/browser/android/content_view_core_impl.h"

#include "content/browser/android/overscroll_controller_android.h"

-#include "content/browser/android/popup_touch_handle_drawable.h"

#include "content/browser/android/synchronous_compositor_host.h"

#include "content/browser/devtools/render_frame_devtools_agent_host.h"

#include "content/browser/gpu/browser_gpu_channel_host_factory.h"

@@ -58,6 +57,7 @@

#include "content/common/input_messages.h"

#include "content/common/view_messages.h"

#include "content/public/browser/android/compositor.h"

+#include "content/public/browser/android/synchronous_compositor_client.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/devtools_agent_host.h"

#include "content/public/browser/render_view_host.h"

@@ -1082,10 +1082,10 @@ void RenderWidgetHostViewAndroid::OnSelectionEvent(

std::unique_ptr<ui::TouchHandleDrawable>

RenderWidgetHostViewAndroid::CreateDrawable() {

DCHECK(content_view_core_);

- if (!using_browser_compositor_)

- return PopupTouchHandleDrawable::Create(

- content_view_core_, ui::GetScaleFactorForNativeView(GetNativeView()));

+ if (!using_browser_compositor_) {

+ return std::unique_ptr<ui::TouchHandleDrawable>(

+ sync_compositor_->client()->CreateDrawable());

boliu 2016/08/26 04:15:45 need a null check for sync_compositor_ here and re

Jinsuk Kim 2016/08/26 09:21:19 Done.

+ }

return std::unique_ptr<

ui::TouchHandleDrawable>(new CompositedTouchHandleDrawable(

content_view_core_->GetViewAndroid()->GetLayer(),

« android_webview/native/popup_touch_handle_drawable.cc ('K') | « content/browser/android/synchronous_compositor_host.h ('k') | content/content_browser.gypi » ('j') | no next file with comments »