ui/accelerated_widget_mac/io_surface_layer.mm - Issue 817153002: Switch users of foundation_util.h to include it directly and clean up uses of mac_util.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: ui/accelerated_widget_mac/io_surface_layer.mm

Issue 817153002: Switch users of foundation_util.h to include it directly and clean up uses of mac_util.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 12 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 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 "ui/accelerated_widget_mac/io_surface_layer.h"	5 #include "ui/accelerated_widget_mac/io_surface_layer.h"

6	6

7 #include <CoreFoundation/CoreFoundation.h>	7 #include <CoreFoundation/CoreFoundation.h>

8 #include <OpenGL/CGLIOSurface.h>	8 #include <OpenGL/CGLIOSurface.h>

9 #include <OpenGL/CGLRenderers.h>	9 #include <OpenGL/CGLRenderers.h>

10 #include <OpenGL/gl.h>	10 #include <OpenGL/gl.h>

11 #include <OpenGL/OpenGL.h>	11 #include <OpenGL/OpenGL.h>

12	12

13 #include "base/debug/trace_event.h"	13 #include "base/debug/trace_event.h"

14 #include "base/mac/mac_util.h"

15 #include "base/mac/sdk_forward_declarations.h"	14 #include "base/mac/sdk_forward_declarations.h"

16 #include "ui/accelerated_widget_mac/io_surface_context.h"	15 #include "ui/accelerated_widget_mac/io_surface_context.h"

17 #include "ui/accelerated_widget_mac/io_surface_texture.h"	16 #include "ui/accelerated_widget_mac/io_surface_texture.h"

18 #include "ui/base/cocoa/animation_utils.h"	17 #include "ui/base/cocoa/animation_utils.h"

19 #include "ui/gfx/geometry/size_conversions.h"	18 #include "ui/gfx/geometry/size_conversions.h"

20 #include "ui/gl/gpu_switching_manager.h"	19 #include "ui/gl/gpu_switching_manager.h"

21	20

22 ////////////////////////////////////////////////////////////////////////////////	21 ////////////////////////////////////////////////////////////////////////////////

23 // IOSurfaceLayerHelper	22 // IOSurfaceLayerHelper

24	23

(...skipping 268 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
293 if (helper_)	292 if (helper_)

294 helper_->DidDraw(draw_succeeded);	293 helper_->DidDraw(draw_succeeded);

295	294

296 [super drawInCGLContext:glContext	295 [super drawInCGLContext:glContext

297 pixelFormat:pixelFormat	296 pixelFormat:pixelFormat

298 forLayerTime:timeInterval	297 forLayerTime:timeInterval

299 displayTime:timeStamp];	298 displayTime:timeStamp];

300 }	299 }

301	300

302 @end	301 @end

OLD	NEW

« no previous file with comments | « skia/ext/skia_utils_mac_unittest.mm ('k') | ui/accelerated_widget_mac/io_surface_texture.mm » ('j') | no next file with comments »