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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutInline.cpp

Issue 1766723004: style: Remame values in EOverflow and EVerticalAlign to CamelCase (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: enum-clash-EOverflowEVerticalAlign: rebase Created 4 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 { 202 {
203 // Once we have been tainted once, just assume it will happen again. This wa y effects like hover highlighting that change the 203 // Once we have been tainted once, just assume it will happen again. This wa y effects like hover highlighting that change the
204 // background color will only cause a layout on the first rollover. 204 // background color will only cause a layout on the first rollover.
205 if (alwaysCreateLineBoxes()) 205 if (alwaysCreateLineBoxes())
206 return; 206 return;
207 207
208 const ComputedStyle& parentStyle = parent()->styleRef(); 208 const ComputedStyle& parentStyle = parent()->styleRef();
209 LayoutInline* parentLayoutInline = parent()->isLayoutInline() ? toLayoutInli ne(parent()) : 0; 209 LayoutInline* parentLayoutInline = parent()->isLayoutInline() ? toLayoutInli ne(parent()) : 0;
210 bool checkFonts = document().inNoQuirksMode(); 210 bool checkFonts = document().inNoQuirksMode();
211 bool alwaysCreateLineBoxesNew = (parentLayoutInline && parentLayoutInline->a lwaysCreateLineBoxes()) 211 bool alwaysCreateLineBoxesNew = (parentLayoutInline && parentLayoutInline->a lwaysCreateLineBoxes())
212 || (parentLayoutInline && parentStyle.verticalAlign() != BASELINE) 212 || (parentLayoutInline && parentStyle.verticalAlign() != VerticalAlignBa seline)
213 || style()->verticalAlign() != BASELINE 213 || style()->verticalAlign() != VerticalAlignBaseline
214 || style()->getTextEmphasisMark() != TextEmphasisMarkNone 214 || style()->getTextEmphasisMark() != TextEmphasisMarkNone
215 || (checkFonts && (!parentStyle.font().fontMetrics().hasIdenticalAscentD escentAndLineGap(style()->font().fontMetrics()) 215 || (checkFonts && (!parentStyle.font().fontMetrics().hasIdenticalAscentD escentAndLineGap(style()->font().fontMetrics())
216 || parentStyle.lineHeight() != style()->lineHeight())); 216 || parentStyle.lineHeight() != style()->lineHeight()));
217 217
218 if (!alwaysCreateLineBoxesNew && checkFonts && document().styleEngine().uses FirstLineRules()) { 218 if (!alwaysCreateLineBoxesNew && checkFonts && document().styleEngine().uses FirstLineRules()) {
219 // Have to check the first line style as well. 219 // Have to check the first line style as well.
220 const ComputedStyle& firstLineParentStyle = parent()->styleRef(true); 220 const ComputedStyle& firstLineParentStyle = parent()->styleRef(true);
221 const ComputedStyle& childStyle = styleRef(true); 221 const ComputedStyle& childStyle = styleRef(true);
222 alwaysCreateLineBoxesNew = !firstLineParentStyle.font().fontMetrics().ha sIdenticalAscentDescentAndLineGap(childStyle.font().fontMetrics()) 222 alwaysCreateLineBoxesNew = !firstLineParentStyle.font().fontMetrics().ha sIdenticalAscentDescentAndLineGap(childStyle.font().fontMetrics())
223 || childStyle.verticalAlign() != BASELINE 223 || childStyle.verticalAlign() != VerticalAlignBaseline
224 || firstLineParentStyle.lineHeight() != childStyle.lineHeight(); 224 || firstLineParentStyle.lineHeight() != childStyle.lineHeight();
225 } 225 }
226 226
227 if (alwaysCreateLineBoxesNew) { 227 if (alwaysCreateLineBoxesNew) {
228 if (!fullLayout) 228 if (!fullLayout)
229 dirtyLineBoxes(false); 229 dirtyLineBoxes(false);
230 setAlwaysCreateLineBoxes(); 230 setAlwaysCreateLineBoxes();
231 } 231 }
232 } 232 }
233 233
(...skipping 1154 matching lines...) Expand 10 before | Expand all | Expand 10 after
1388 1388
1389 void LayoutInline::invalidateDisplayItemClients(const LayoutBoxModelObject& pain tInvalidationContainer, PaintInvalidationReason invalidationReason) const 1389 void LayoutInline::invalidateDisplayItemClients(const LayoutBoxModelObject& pain tInvalidationContainer, PaintInvalidationReason invalidationReason) const
1390 { 1390 {
1391 LayoutBoxModelObject::invalidateDisplayItemClients(paintInvalidationContaine r, invalidationReason); 1391 LayoutBoxModelObject::invalidateDisplayItemClients(paintInvalidationContaine r, invalidationReason);
1392 1392
1393 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox()) 1393 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox())
1394 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box, in validationReason); 1394 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box, in validationReason);
1395 } 1395 }
1396 1396
1397 } // namespace blink 1397 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutTableCell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698