content/browser/compositor/software_output_device_mac.mm - 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/compositor/software_output_device_mac.mm

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

Index: content/browser/compositor/software_output_device_mac.mm

diff --git a/content/browser/compositor/software_output_device_mac.mm b/content/browser/compositor/software_output_device_mac.mm

index e08372e82b70c3d540fc70457cb568573f656d21..129c9d8bb6a7c424ed85b16016517d56fae0f911 100644

--- a/content/browser/compositor/software_output_device_mac.mm

+++ b/content/browser/compositor/software_output_device_mac.mm

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

#include "content/browser/compositor/software_output_device_mac.h"

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

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

#include "ui/compositor/compositor.h"

namespace content {

@@ -20,8 +20,8 @@ SoftwareOutputDeviceMac::~SoftwareOutputDeviceMac() {

void SoftwareOutputDeviceMac::EndPaint(cc::SoftwareFrameData* frame_data) {

SoftwareOutputDevice::EndPaint(frame_data);

- AcceleratedWidgetMacGotSoftwareFrame(

- compositor_->widget(), frame_data, scale_factor_, canvas_.get());

+ ui::AcceleratedWidgetMacGotSoftwareFrame(

+ compositor_->widget(), scale_factor_, canvas_.get());

}

} // namespace content

« no previous file with comments | « content/browser/compositor/software_layer_mac.mm ('k') | content/browser/gpu/gpu_process_host_ui_shim.cc » ('j') | no next file with comments »