content/browser/frame_host/render_widget_host_view_child_frame.cc - Issue 1411503005: Aura on Android: content/browser

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/frame_host/render_widget_host_view_child_frame.cc

Issue 1411503005: Aura on Android: content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_select_file

Patch Set: Getting rid of BrowserStartupController changes Created 5 years, 2 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

« content/browser/BUILD.gn ('K') | « content/browser/frame_host/render_widget_host_view_child_frame.h ('k') | content/browser/frame_host/render_widget_host_view_guest.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/render_widget_host_view_child_frame.cc

diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.cc b/content/browser/frame_host/render_widget_host_view_child_frame.cc

index 07cd5b536522aa01c9c3c6fdf3f2aa683685b3b5..7aa6db21bac73ce6eadd736d47a6221a18bf02bd 100644

--- a/content/browser/frame_host/render_widget_host_view_child_frame.cc

+++ b/content/browser/frame_host/render_widget_host_view_child_frame.cc

@@ -223,7 +223,7 @@ void RenderWidgetHostViewChildFrame::SelectionBoundsChanged(

const ViewHostMsg_SelectionBounds_Params& params) {

}

-#if defined(OS_ANDROID)

+#if defined(OS_ANDROID) && !defined(USE_AURA)

void RenderWidgetHostViewChildFrame::LockCompositingSurface() {

}

@@ -462,8 +462,9 @@ void RenderWidgetHostViewChildFrame::ReturnResources(

BrowserAccessibilityManager*

RenderWidgetHostViewChildFrame::CreateBrowserAccessibilityManager(

BrowserAccessibilityDelegate* delegate) {

- return BrowserAccessibilityManager::Create(

- BrowserAccessibilityManager::GetEmptyDocument(), delegate);

+ return nullptr;

+// return BrowserAccessibilityManager::Create(

+// BrowserAccessibilityManager::GetEmptyDocument(), delegate);

}

void RenderWidgetHostViewChildFrame::ClearCompositorSurfaceIfNecessary() {