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

Side by Side Diff: Source/core/rendering/InlineFlowBox.h

Issue 355843002: Rename style(bool) to styleOrFirstLineStyle(bool) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 5 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 | « Source/core/rendering/InlineBox.cpp ('k') | Source/core/rendering/InlineFlowBox.cpp » ('j') | 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) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 LayoutUnit marginLogicalRight() const 136 LayoutUnit marginLogicalRight() const
137 { 137 {
138 if (!includeLogicalRightEdge()) 138 if (!includeLogicalRightEdge())
139 return 0; 139 return 0;
140 return isHorizontal() ? boxModelObject()->marginRight() : boxModelObject ()->marginBottom(); 140 return isHorizontal() ? boxModelObject()->marginRight() : boxModelObject ()->marginBottom();
141 } 141 }
142 int borderLogicalLeft() const 142 int borderLogicalLeft() const
143 { 143 {
144 if (!includeLogicalLeftEdge()) 144 if (!includeLogicalLeftEdge())
145 return 0; 145 return 0;
146 return isHorizontal() ? renderer().style(isFirstLineStyle())->borderLeft Width() : renderer().style(isFirstLineStyle())->borderTopWidth(); 146 return isHorizontal() ? renderer().styleOrFirstLineStyle(isFirstLineStyl e())->borderLeftWidth() : renderer().styleOrFirstLineStyle(isFirstLineStyle())-> borderTopWidth();
147 } 147 }
148 int borderLogicalRight() const 148 int borderLogicalRight() const
149 { 149 {
150 if (!includeLogicalRightEdge()) 150 if (!includeLogicalRightEdge())
151 return 0; 151 return 0;
152 return isHorizontal() ? renderer().style(isFirstLineStyle())->borderRigh tWidth() : renderer().style(isFirstLineStyle())->borderBottomWidth(); 152 return isHorizontal() ? renderer().styleOrFirstLineStyle(isFirstLineStyl e())->borderRightWidth() : renderer().styleOrFirstLineStyle(isFirstLineStyle())- >borderBottomWidth();
153 } 153 }
154 int paddingLogicalLeft() const 154 int paddingLogicalLeft() const
155 { 155 {
156 if (!includeLogicalLeftEdge()) 156 if (!includeLogicalLeftEdge())
157 return 0; 157 return 0;
158 return isHorizontal() ? boxModelObject()->paddingLeft() : boxModelObject ()->paddingTop(); 158 return isHorizontal() ? boxModelObject()->paddingLeft() : boxModelObject ()->paddingTop();
159 } 159 }
160 int paddingLogicalRight() const 160 int paddingLogicalRight() const
161 { 161 {
162 if (!includeLogicalRightEdge()) 162 if (!includeLogicalRightEdge())
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 } 371 }
372 372
373 } // namespace WebCore 373 } // namespace WebCore
374 374
375 #ifndef NDEBUG 375 #ifndef NDEBUG
376 // Outside the WebCore namespace for ease of invocation from gdb. 376 // Outside the WebCore namespace for ease of invocation from gdb.
377 void showTree(const WebCore::InlineFlowBox*); 377 void showTree(const WebCore::InlineFlowBox*);
378 #endif 378 #endif
379 379
380 #endif // InlineFlowBox_h 380 #endif // InlineFlowBox_h
OLDNEW
« no previous file with comments | « Source/core/rendering/InlineBox.cpp ('k') | Source/core/rendering/InlineFlowBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698