cc/heads_up_display_layer.cc - Issue 11410021: Remove WTF and WebCore from cc/ and webkit/compositor_bindings/

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: cc/heads_up_display_layer.cc

Issue 11410021: Remove WTF and WebCore from cc/ and webkit/compositor_bindings/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix content_browsertests Created 8 years, 1 month 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

OLD	NEW
1 // Copyright 2012 The Chromium Authors. All rights reserved.	1 // Copyright 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 "config.h"

6

7 #include "cc/heads_up_display_layer.h"	5 #include "cc/heads_up_display_layer.h"

8	6

9 #include "base/debug/trace_event.h"	7 #include "base/debug/trace_event.h"

10 #include "cc/heads_up_display_layer_impl.h"	8 #include "cc/heads_up_display_layer_impl.h"

11 #include "cc/layer_tree_host.h"	9 #include "cc/layer_tree_host.h"

12	10

13 namespace cc {	11 namespace cc {

14	12

15 scoped_refptr<HeadsUpDisplayLayer> HeadsUpDisplayLayer::create()	13 scoped_refptr<HeadsUpDisplayLayer> HeadsUpDisplayLayer::create()

16 {	14 {

(...skipping 55 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
72 Layer::pushPropertiesTo(layerImpl);	70 Layer::pushPropertiesTo(layerImpl);

73	71

74 HeadsUpDisplayLayerImpl* hudLayerImpl = static_cast<HeadsUpDisplayLayerImpl* >(layerImpl);	72 HeadsUpDisplayLayerImpl* hudLayerImpl = static_cast<HeadsUpDisplayLayerImpl* >(layerImpl);

75 hudLayerImpl->setShowFPSCounter(m_showFPSCounter);	73 hudLayerImpl->setShowFPSCounter(m_showFPSCounter);

76	74

77 if (m_fontAtlas.get())	75 if (m_fontAtlas.get())

78 hudLayerImpl->setFontAtlas(m_fontAtlas.Pass());	76 hudLayerImpl->setFontAtlas(m_fontAtlas.Pass());

79 }	77 }

80	78

81 } // namespace cc	79 } // namespace cc

OLD	NEW

« no previous file with comments | « cc/gl_renderer_unittest.cc ('k') | cc/heads_up_display_layer_impl.cc » ('j') | no next file with comments »