content/browser/gpu/gpu_process_host_ui_shim.cc - Issue 753933002: MacViews: Move content::AcceleratedWidget to new component, ui/accelerated_widget_mac

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/gpu/gpu_process_host_ui_shim.cc

Issue 753933002: MacViews: Move content::AcceleratedWidget to new component, ui/accelerated_widget_mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20141124-MacViews-MoveSoftwareLayerMac-fromcl

Patch Set: gn check Created 6 years, 1 month 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

« no previous file with comments | « content/browser/compositor/software_output_device_mac.mm ('k') | content/browser/renderer_host/render_widget_host_view_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/gpu/gpu_process_host_ui_shim.cc

diff --git a/content/browser/gpu/gpu_process_host_ui_shim.cc b/content/browser/gpu/gpu_process_host_ui_shim.cc

index c92a72dba7f9c69d73c64463626bdae921b752d6..2293e745892609f8391e4d01e628cbc4bfc83abb 100644

--- a/content/browser/gpu/gpu_process_host_ui_shim.cc

+++ b/content/browser/gpu/gpu_process_host_ui_shim.cc

@@ -25,7 +25,7 @@

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

#if defined(OS_MACOSX)

-#include "content/browser/compositor/browser_compositor_ca_layer_tree_mac.h"

+#include "ui/accelerated_widget_mac/accelerated_widget_mac.h"

#endif

#if defined(USE_OZONE)

@@ -279,7 +279,7 @@ void GpuProcessHostUIShim::OnAcceleratedSurfaceBuffersSwapped(

DCHECK(IsDelegatedRendererEnabled());

gfx::AcceleratedWidget native_widget =

content::GpuSurfaceTracker::Get()->AcquireNativeWidget(params.surface_id);

- AcceleratedWidgetMacGotAcceleratedFrame(

+ ui::AcceleratedWidgetMacGotAcceleratedFrame(

native_widget,

params.surface_handle,

params.latency_info,