content/browser/compositor/software_output_device_mac.mm - Issue 2354903003: Don't include the tracing in gpu_memory_buffer.h

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 2354903003: Don't include the tracing in gpu_memory_buffer.h (Closed)

Patch Set: Fix linux build again Created 4 years, 3 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

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 #include "content/browser/compositor/software_output_device_mac.h"	5 #include "content/browser/compositor/software_output_device_mac.h"

6	6

7 #include "base/mac/foundation_util.h"	7 #include "base/mac/foundation_util.h"

	8 #include "base/trace_event/trace_event.h"

8 #include "third_party/skia/include/core/SkCanvas.h"	9 #include "third_party/skia/include/core/SkCanvas.h"

9 #include "ui/accelerated_widget_mac/accelerated_widget_mac.h"	10 #include "ui/accelerated_widget_mac/accelerated_widget_mac.h"

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

11 #include "ui/gfx/mac/io_surface.h"	12 #include "ui/gfx/mac/io_surface.h"

12 #include "ui/gfx/skia_util.h"	13 #include "ui/gfx/skia_util.h"

13	14

14 namespace content {	15 namespace content {

15	16

16 SoftwareOutputDeviceMac::SoftwareOutputDeviceMac(ui::Compositor* compositor)	17 SoftwareOutputDeviceMac::SoftwareOutputDeviceMac(ui::Compositor* compositor)

17 : compositor_(compositor), scale_factor_(1), current_index_(0) {}	18 : compositor_(compositor), scale_factor_(1), current_index_(0) {}

(...skipping 139 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
157 gfx::VSyncProvider* SoftwareOutputDeviceMac::GetVSyncProvider() {	158 gfx::VSyncProvider* SoftwareOutputDeviceMac::GetVSyncProvider() {

158 return this;	159 return this;

159 }	160 }

160	161

161 void SoftwareOutputDeviceMac::GetVSyncParameters(	162 void SoftwareOutputDeviceMac::GetVSyncParameters(

162 const gfx::VSyncProvider::UpdateVSyncCallback& callback) {	163 const gfx::VSyncProvider::UpdateVSyncCallback& callback) {

163 update_vsync_callback_ = callback;	164 update_vsync_callback_ = callback;

164 }	165 }

165	166

166 } // namespace content	167 } // namespace content

OLD	NEW

« no previous file with comments | « components/display_compositor/yuv_readback_unittest.cc ('k') | content/browser/compositor/surface_utils.cc » ('j') | no next file with comments »