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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutObject.h

Issue 2007723002: Declare methods defined in LayoutObjectInlines.h as inline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 1067 matching lines...) Expand 10 before | Expand all | Expand 10 after
1078 const ComputedStyle* style() const { return m_style.get(); } 1078 const ComputedStyle* style() const { return m_style.get(); }
1079 ComputedStyle* mutableStyle() const { return m_style.get(); } 1079 ComputedStyle* mutableStyle() const { return m_style.get(); }
1080 1080
1081 // m_style can only be nullptr before the first style is set, thus most 1081 // m_style can only be nullptr before the first style is set, thus most
1082 // callers will never see a nullptr style and should use styleRef(). 1082 // callers will never see a nullptr style and should use styleRef().
1083 // FIXME: It would be better if style() returned a const reference. 1083 // FIXME: It would be better if style() returned a const reference.
1084 const ComputedStyle& styleRef() const { return mutableStyleRef(); } 1084 const ComputedStyle& styleRef() const { return mutableStyleRef(); }
1085 ComputedStyle& mutableStyleRef() const { ASSERT(m_style); return *m_style; } 1085 ComputedStyle& mutableStyleRef() const { ASSERT(m_style); return *m_style; }
1086 1086
1087 /* The following methods are inlined in LayoutObjectInlines.h */ 1087 /* The following methods are inlined in LayoutObjectInlines.h */
1088 const ComputedStyle* firstLineStyle() const; 1088 inline const ComputedStyle* firstLineStyle() const;
1089 const ComputedStyle& firstLineStyleRef() const; 1089 inline const ComputedStyle& firstLineStyleRef() const;
1090 const ComputedStyle* style(bool firstLine) const; 1090 inline const ComputedStyle* style(bool firstLine) const;
1091 const ComputedStyle& styleRef(bool firstLine) const; 1091 inline const ComputedStyle& styleRef(bool firstLine) const;
1092 1092
1093 static inline Color resolveColor(const ComputedStyle& styleToUse, int colorP roperty) 1093 static inline Color resolveColor(const ComputedStyle& styleToUse, int colorP roperty)
1094 { 1094 {
1095 return styleToUse.visitedDependentColor(colorProperty); 1095 return styleToUse.visitedDependentColor(colorProperty);
1096 } 1096 }
1097 1097
1098 inline Color resolveColor(int colorProperty) const 1098 inline Color resolveColor(int colorProperty) const
1099 { 1099 {
1100 return style()->visitedDependentColor(colorProperty); 1100 return style()->visitedDependentColor(colorProperty);
1101 } 1101 }
(...skipping 1076 matching lines...) Expand 10 before | Expand all | Expand 10 after
2178 void showTree(const blink::LayoutObject*); 2178 void showTree(const blink::LayoutObject*);
2179 void showLineTree(const blink::LayoutObject*); 2179 void showLineTree(const blink::LayoutObject*);
2180 void showLayoutTree(const blink::LayoutObject* object1); 2180 void showLayoutTree(const blink::LayoutObject* object1);
2181 // We don't make object2 an optional parameter so that showLayoutTree 2181 // We don't make object2 an optional parameter so that showLayoutTree
2182 // can be called from gdb easily. 2182 // can be called from gdb easily.
2183 void showLayoutTree(const blink::LayoutObject* object1, const blink::LayoutObjec t* object2); 2183 void showLayoutTree(const blink::LayoutObject* object1, const blink::LayoutObjec t* object2);
2184 2184
2185 #endif 2185 #endif
2186 2186
2187 #endif // LayoutObject_h 2187 #endif // LayoutObject_h
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698