Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(848)

Side by Side Diff: Source/core/layout/LayoutObjectInlines.h

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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 | « Source/core/layout/LayoutObjectChildList.cpp ('k') | Source/core/layout/LayoutRuby.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 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 #ifndef RenderObjectInlines_h 5 #ifndef LayoutObjectInlines_h
6 #define RenderObjectInlines_h 6 #define LayoutObjectInlines_h
7 7
8 #include "core/dom/StyleEngine.h" 8 #include "core/dom/StyleEngine.h"
9 #include "core/rendering/RenderObject.h" 9 #include "core/layout/LayoutObject.h"
10 10
11 namespace blink { 11 namespace blink {
12 12
13 // The following methods are inlined for performance but not put in 13 // The following methods are inlined for performance but not put in
14 // RenderObject.h because that would unnecessarily tie RenderObject.h 14 // LayoutObject.h because that would unnecessarily tie LayoutObject.h
15 // to StyleEngine.h for all users of RenderObject.h that don't use 15 // to StyleEngine.h for all users of LayoutObject.h that don't use
16 // these methods. 16 // these methods.
17 17
18 inline RenderStyle* RenderObject::firstLineStyle() const 18 inline RenderStyle* LayoutObject::firstLineStyle() const
19 { 19 {
20 return document().styleEngine()->usesFirstLineRules() ? cachedFirstLineStyle () : style(); 20 return document().styleEngine()->usesFirstLineRules() ? cachedFirstLineStyle () : style();
21 } 21 }
22 22
23 inline RenderStyle* RenderObject::style(bool firstLine) const 23 inline RenderStyle* LayoutObject::style(bool firstLine) const
24 { 24 {
25 return firstLine ? firstLineStyle() : style(); 25 return firstLine ? firstLineStyle() : style();
26 } 26 }
27 27
28 inline const RenderStyle& RenderObject::styleRef(bool firstLine) const 28 inline const RenderStyle& LayoutObject::styleRef(bool firstLine) const
29 { 29 {
30 const RenderStyle* style = this->style(firstLine); 30 const RenderStyle* style = this->style(firstLine);
31 ASSERT(style); 31 ASSERT(style);
32 return *style; 32 return *style;
33 } 33 }
34 34
35 } 35 }
36 36
37 #endif 37 #endif
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutObjectChildList.cpp ('k') | Source/core/layout/LayoutRuby.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698