content/browser/compositor/surface_utils.cc - Issue 1549113002: Switch to standard integer types in content/browser/.

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/surface_utils.cc

Issue 1549113002: Switch to standard integer types in content/browser/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 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

« no previous file with comments | « content/browser/compositor/software_output_device_x11.cc ('k') | content/browser/compositor/test/no_transport_image_transport_factory.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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/surface_utils.h"	5 #include "content/browser/compositor/surface_utils.h"

6	6

	7 #include "build/build_config.h"

7 #include "cc/surfaces/surface_id_allocator.h"	8 #include "cc/surfaces/surface_id_allocator.h"

8	9

9 #if defined(OS_ANDROID) && !defined(USE_AURA)	10 #if defined(OS_ANDROID) && !defined(USE_AURA)

10 #include "content/browser/renderer_host/compositor_impl_android.h"	11 #include "content/browser/renderer_host/compositor_impl_android.h"

11 #else	12 #else

12 #include "content/browser/compositor/image_transport_factory.h"	13 #include "content/browser/compositor/image_transport_factory.h"

13 #include "ui/compositor/compositor.h"	14 #include "ui/compositor/compositor.h"

14 #endif	15 #endif

15	16

16 namespace content {	17 namespace content {

(...skipping 10 matching lines...) Expand all Loading...
27 cc::SurfaceManager* GetSurfaceManager() {	28 cc::SurfaceManager* GetSurfaceManager() {

28 #if defined(OS_ANDROID) && !defined(USE_AURA)	29 #if defined(OS_ANDROID) && !defined(USE_AURA)

29 return CompositorImpl::GetSurfaceManager();	30 return CompositorImpl::GetSurfaceManager();

30 #else	31 #else

31 ImageTransportFactory* factory = ImageTransportFactory::GetInstance();	32 ImageTransportFactory* factory = ImageTransportFactory::GetInstance();

32 return factory->GetSurfaceManager();	33 return factory->GetSurfaceManager();

33 #endif	34 #endif

34 }	35 }

35	36

36 } // namespace content	37 } // namespace content

OLD	NEW