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

Side by Side Diff: Source/core/layout/LayoutTable.cpp

Issue 895953003: Insert an anonymous inline-table when inserting a table part under an inline. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Code review - lump similar tests together in one file. 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
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 1317 matching lines...) Expand 10 before | Expand all | Expand 10 after
1328 updateHitTestResult(result, flipForWritingMode(locationInContainer.point () - toLayoutSize(adjustedLocation))); 1328 updateHitTestResult(result, flipForWritingMode(locationInContainer.point () - toLayoutSize(adjustedLocation)));
1329 if (!result.addNodeToRectBasedTestResult(node(), request, locationInCont ainer, boundsRect)) 1329 if (!result.addNodeToRectBasedTestResult(node(), request, locationInCont ainer, boundsRect))
1330 return true; 1330 return true;
1331 } 1331 }
1332 1332
1333 return false; 1333 return false;
1334 } 1334 }
1335 1335
1336 LayoutTable* LayoutTable::createAnonymousWithParentRenderer(const LayoutObject* parent) 1336 LayoutTable* LayoutTable::createAnonymousWithParentRenderer(const LayoutObject* parent)
1337 { 1337 {
1338 RefPtr<LayoutStyle> newStyle = LayoutStyle::createAnonymousStyleWithDisplay( parent->styleRef(), TABLE); 1338 RefPtr<LayoutStyle> newStyle = LayoutStyle::createAnonymousStyleWithDisplay( parent->styleRef(), parent->isRenderInline() ? INLINE_TABLE : TABLE);
1339 LayoutTable* newTable = new LayoutTable(0); 1339 LayoutTable* newTable = new LayoutTable(0);
1340 newTable->setDocumentForAnonymous(&parent->document()); 1340 newTable->setDocumentForAnonymous(&parent->document());
1341 newTable->setStyle(newStyle.release()); 1341 newTable->setStyle(newStyle.release());
1342 return newTable; 1342 return newTable;
1343 } 1343 }
1344 1344
1345 const BorderValue& LayoutTable::tableStartBorderAdjoiningCell(const LayoutTableC ell* cell) const 1345 const BorderValue& LayoutTable::tableStartBorderAdjoiningCell(const LayoutTableC ell* cell) const
1346 { 1346 {
1347 ASSERT(cell->isFirstOrLastCellInRow()); 1347 ASSERT(cell->isFirstOrLastCellInRow());
1348 if (hasSameDirectionAs(cell->row())) 1348 if (hasSameDirectionAs(cell->row()))
1349 return style()->borderStart(); 1349 return style()->borderStart();
1350 1350
1351 return style()->borderEnd(); 1351 return style()->borderEnd();
1352 } 1352 }
1353 1353
1354 const BorderValue& LayoutTable::tableEndBorderAdjoiningCell(const LayoutTableCel l* cell) const 1354 const BorderValue& LayoutTable::tableEndBorderAdjoiningCell(const LayoutTableCel l* cell) const
1355 { 1355 {
1356 ASSERT(cell->isFirstOrLastCellInRow()); 1356 ASSERT(cell->isFirstOrLastCellInRow());
1357 if (hasSameDirectionAs(cell->row())) 1357 if (hasSameDirectionAs(cell->row()))
1358 return style()->borderEnd(); 1358 return style()->borderEnd();
1359 1359
1360 return style()->borderStart(); 1360 return style()->borderStart();
1361 } 1361 }
1362 1362
1363 } 1363 }
OLDNEW
« no previous file with comments | « LayoutTests/fast/table/table-parts-in-inline-expected.txt ('k') | Source/core/rendering/RenderInline.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698