ui/compositor/compositor.cc - Issue 10825259: Use WebKit Platform API header locations instead of client API

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

Issue 10825259: Use WebKit Platform API header locations instead of client API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fixes test files, relaxes checkdeps rules Created 8 years, 4 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 | Annotate | Revision Log

« no previous file with comments | « ui/compositor/DEPS ('k') | ui/compositor/test/test_suite.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/compositor/compositor.h"	5 #include "ui/compositor/compositor.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8	8

9 #include "base/command_line.h"	9 #include "base/command_line.h"

10 #include "base/threading/thread_restrictions.h"	10 #include "base/threading/thread_restrictions.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/images/SkImageEncoder.h"	12 #include "third_party/skia/include/images/SkImageEncoder.h"

13 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFloatPoin t.h"	13 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h"

14 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"	14 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h"

15 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"	15 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"

16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h"	16 #include "third_party/WebKit/Source/Platform/chromium/public/WebCompositor.h"

17 #include "ui/compositor/compositor_observer.h"	17 #include "ui/compositor/compositor_observer.h"

18 #include "ui/compositor/compositor_switches.h"	18 #include "ui/compositor/compositor_switches.h"

19 #include "ui/compositor/dip_util.h"	19 #include "ui/compositor/dip_util.h"

20 #include "ui/compositor/layer.h"	20 #include "ui/compositor/layer.h"

21 #include "ui/compositor/test_web_graphics_context_3d.h"	21 #include "ui/compositor/test_web_graphics_context_3d.h"

22 #include "ui/gl/gl_context.h"	22 #include "ui/gl/gl_context.h"

23 #include "ui/gl/gl_implementation.h"	23 #include "ui/gl/gl_implementation.h"

24 #include "ui/gl/gl_surface.h"	24 #include "ui/gl/gl_surface.h"

25 #include "webkit/glue/webthread_impl.h"	25 #include "webkit/glue/webthread_impl.h"

26 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"	26 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"

(...skipping 398 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
425	425

426 COMPOSITOR_EXPORT void DisableTestCompositor() {	426 COMPOSITOR_EXPORT void DisableTestCompositor() {

427 test_compositor_enabled = false;	427 test_compositor_enabled = false;

428 }	428 }

429	429

430 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() {	430 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() {

431 return test_compositor_enabled;	431 return test_compositor_enabled;

432 }	432 }

433	433

434 } // namespace ui	434 } // namespace ui

OLD	NEW