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

Side by Side Diff: Source/core/rendering/RenderTable.cpp

Issue 351213002: Change RenderObject::style(bool) to accept an enum instead (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Renamed enum to OwnOrFirstLineStyle, rebased and got rid of duplicate state on the stack in RootInl… 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/RenderTable.h ('k') | Source/core/rendering/RenderText.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 /* 1 /*
2 * Copyright (C) 1997 Martin Jones (mjones@kde.org) 2 * Copyright (C) 1997 Martin Jones (mjones@kde.org)
3 * (C) 1997 Torben Weis (weis@kde.org) 3 * (C) 1997 Torben Weis (weis@kde.org)
4 * (C) 1998 Waldo Bastian (bastian@kde.org) 4 * (C) 1998 Waldo Bastian (bastian@kde.org)
5 * (C) 1999 Lars Knoll (knoll@kde.org) 5 * (C) 1999 Lars Knoll (knoll@kde.org)
6 * (C) 1999 Antti Koivisto (koivisto@kde.org) 6 * (C) 1999 Antti Koivisto (koivisto@kde.org)
7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc. All rights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc. All rights reserved.
8 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 1295 matching lines...) Expand 10 before | Expand all | Expand 10 after
1306 1306
1307 RenderBlock* RenderTable::firstLineBlock() const 1307 RenderBlock* RenderTable::firstLineBlock() const
1308 { 1308 {
1309 return 0; 1309 return 0;
1310 } 1310 }
1311 1311
1312 void RenderTable::updateFirstLetter() 1312 void RenderTable::updateFirstLetter()
1313 { 1313 {
1314 } 1314 }
1315 1315
1316 int RenderTable::baselinePosition(FontBaseline baselineType, bool firstLine, Lin eDirectionMode direction, LinePositionMode linePositionMode) const 1316 int RenderTable::baselinePosition(FontBaseline baselineType, OwnOrFirstLineStyle firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) cons t
1317 { 1317 {
1318 ASSERT(linePositionMode == PositionOnContainingLine); 1318 ASSERT(linePositionMode == PositionOnContainingLine);
1319 int baseline = firstLineBoxBaseline(); 1319 int baseline = firstLineBoxBaseline();
1320 if (baseline != -1) { 1320 if (baseline != -1) {
1321 if (isInline()) 1321 if (isInline())
1322 return beforeMarginInLineDirection(direction) + baseline; 1322 return beforeMarginInLineDirection(direction) + baseline;
1323 return baseline; 1323 return baseline;
1324 } 1324 }
1325 1325
1326 return RenderBox::baselinePosition(baselineType, firstLine, direction, lineP ositionMode); 1326 return RenderBox::baselinePosition(baselineType, firstLine, direction, lineP ositionMode);
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
1427 const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCel l* cell) const 1427 const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCel l* cell) const
1428 { 1428 {
1429 ASSERT(cell->isFirstOrLastCellInRow()); 1429 ASSERT(cell->isFirstOrLastCellInRow());
1430 if (hasSameDirectionAs(cell->row())) 1430 if (hasSameDirectionAs(cell->row()))
1431 return style()->borderEnd(); 1431 return style()->borderEnd();
1432 1432
1433 return style()->borderStart(); 1433 return style()->borderStart();
1434 } 1434 }
1435 1435
1436 } 1436 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderTable.h ('k') | Source/core/rendering/RenderText.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698