content/browser/compositor/software_output_device_x11.cc - Issue 140753005: Add the UI compositor to the Mac build

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_x11.cc

Issue 140753005: Add the UI compositor to the Mac build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 11 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:

OLD	NEW
1 // Copyright 2013 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/aura/software_output_device_x11.h"	5 #include "content/browser/compositor/software_output_device_x11.h"

6	6

7 #include <X11/Xlib.h>	7 #include <X11/Xlib.h>

8 #include <X11/Xutil.h>	8 #include <X11/Xutil.h>

9	9

10 #include "content/public/browser/browser_thread.h"	10 #include "content/public/browser/browser_thread.h"

11 #include "third_party/skia/include/core/SkBitmap.h"	11 #include "third_party/skia/include/core/SkBitmap.h"

12 #include "third_party/skia/include/core/SkDevice.h"	12 #include "third_party/skia/include/core/SkDevice.h"

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

14 #include "ui/gfx/x/x11_types.h"	14 #include "ui/gfx/x/x11_types.h"

15	15

(...skipping 45 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
61 viewport_size_.height(),	61 viewport_size_.height(),

62 rect.x(),	62 rect.x(),

63 rect.y(),	63 rect.y(),

64 rect.x(),	64 rect.x(),

65 rect.y(),	65 rect.y(),

66 rect.width(),	66 rect.width(),

67 rect.height());	67 rect.height());

68 }	68 }

69	69

70 } // namespace content	70 } // namespace content

OLD	NEW