content/browser/compositor/software_output_device_mac.mm - Issue 638123003: Prepare to move BrowserCompositorViewMac to ui

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: content/browser/compositor/software_output_device_mac.mm

Issue 638123003: Prepare to move BrowserCompositorViewMac to ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 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 unified diff | Download patch

« content/browser/compositor/browser_compositor_view_mac.h ('K') | « content/browser/compositor/browser_compositor_view_mac.mm ('k') | content/browser/gpu/gpu_process_host_ui_shim.cc » ('j') | content/browser/gpu/gpu_process_host_ui_shim.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 #import <Cocoa/Cocoa.h>	5 #import <Cocoa/Cocoa.h>

6	6

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

8	8

9 #include "content/browser/compositor/browser_compositor_view_mac.h"	9 #include "content/browser/compositor/browser_compositor_ca_layer_tree_mac.h"

10 #include "ui/compositor/compositor.h"	10 #include "ui/compositor/compositor.h"

11	11

12 namespace content {	12 namespace content {

13	13

14 SoftwareOutputDeviceMac::SoftwareOutputDeviceMac(ui::Compositor* compositor)	14 SoftwareOutputDeviceMac::SoftwareOutputDeviceMac(ui::Compositor* compositor)

15 : compositor_(compositor) {	15 : compositor_(compositor) {

16 }	16 }

17	17

18 SoftwareOutputDeviceMac::~SoftwareOutputDeviceMac() {	18 SoftwareOutputDeviceMac::~SoftwareOutputDeviceMac() {

19 }	19 }

20	20

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

22 SoftwareOutputDevice::EndPaint(frame_data);	22 SoftwareOutputDevice::EndPaint(frame_data);

23 BrowserCompositorViewMac::GotSoftwareFrame(	23 BrowserCompositorCALayerTreeMac::GotSoftwareFrame(

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

25 }	25 }

26	26

27 } // namespace content	27 } // namespace content

OLD	NEW