ui/gfx/compositor/layer.cc - Issue 8788008: Update includes for WebLayer APIs for new location

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

Issue 8788008: Update includes for WebLayer APIs for new location (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years 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/gfx/compositor/layer.h ('k') | no next file » | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/gfx/compositor/layer.h"	5 #include "ui/gfx/compositor/layer.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/debug/trace_event.h"	10 #include "base/debug/trace_event.h"

11 #include "base/logging.h"	11 #include "base/logging.h"

12 #include "base/memory/scoped_ptr.h"	12 #include "base/memory/scoped_ptr.h"

13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebContentLayer.h"	13 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebContentLa yer.h"

14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebExternalTextureLay er.h"	14 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebExternalT extureLayer.h"

15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFloatPoint.h"	15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFloatPoint.h"

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

17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h"	17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h"

18 #include "ui/base/animation/animation.h"	18 #include "ui/base/animation/animation.h"

19 #include "ui/gfx/canvas_skia.h"	19 #include "ui/gfx/canvas_skia.h"

20 #include "ui/gfx/compositor/compositor_switches.h"	20 #include "ui/gfx/compositor/compositor_switches.h"

21 #include "ui/gfx/compositor/layer_animator.h"	21 #include "ui/gfx/compositor/layer_animator.h"

22 #include "ui/gfx/interpolated_transform.h"	22 #include "ui/gfx/interpolated_transform.h"

23 #include "ui/gfx/point3.h"	23 #include "ui/gfx/point3.h"

24	24

(...skipping 736 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
761 unsigned int color = 0xFF000000;	761 unsigned int color = 0xFF000000;

762 color \|= web_layer_is_accelerated_ ? 0x0000FF00 : 0x00FF0000;	762 color \|= web_layer_is_accelerated_ ? 0x0000FF00 : 0x00FF0000;

763 bool opaque = fills_bounds_opaquely_ && (GetCombinedOpacity() == 1.f);	763 bool opaque = fills_bounds_opaquely_ && (GetCombinedOpacity() == 1.f);

764 if (!opaque)	764 if (!opaque)

765 color \|= 0xFF;	765 color \|= 0xFF;

766 web_layer_.setDebugBorderColor(color);	766 web_layer_.setDebugBorderColor(color);

767 }	767 }

768 #endif	768 #endif

769	769

770 } // namespace ui	770 } // namespace ui

OLD	NEW