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

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

Issue 1728313003: Split ImageResourceClient into ResourceClient and ImageResourceObserver [2/2] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and reflect comment 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) 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, 2008, 2009, 2010, 2013 Apple Inc. All r ights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2013 Apple Inc. All r ights 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 1373 matching lines...) Expand 10 before | Expand all | Expand 10 after
1384 } else { 1384 } else {
1385 endColumn = std::upper_bound(columnPos.begin() + nextColumn, columnPos.e nd(), flippedRect.maxX()) - columnPos.begin(); 1385 endColumn = std::upper_bound(columnPos.begin() + nextColumn, columnPos.e nd(), flippedRect.maxX()) - columnPos.begin();
1386 if (endColumn == columnPos.size()) 1386 if (endColumn == columnPos.size())
1387 endColumn = columnPos.size() - 1; 1387 endColumn = columnPos.size() - 1;
1388 } 1388 }
1389 1389
1390 return CellSpan(startColumn, endColumn); 1390 return CellSpan(startColumn, endColumn);
1391 } 1391 }
1392 1392
1393 1393
1394 void LayoutTableSection::imageChanged(WrappedImagePtr, const IntRect*) 1394 void LayoutTableSection::imageChanged(bool, WrappedImagePtr, const IntRect*)
1395 { 1395 {
1396 // FIXME: Examine cells and issue paint invalidations of only the rect the i mage paints in. 1396 // FIXME: Examine cells and issue paint invalidations of only the rect the i mage paints in.
1397 setShouldDoFullPaintInvalidation(); 1397 setShouldDoFullPaintInvalidation();
1398 } 1398 }
1399 1399
1400 void LayoutTableSection::recalcCells() 1400 void LayoutTableSection::recalcCells()
1401 { 1401 {
1402 ASSERT(m_needsCellRecalc); 1402 ASSERT(m_needsCellRecalc);
1403 // We reset the flag here to ensure that |addCell| works. This is safe to do as 1403 // We reset the flag here to ensure that |addCell| works. This is safe to do as
1404 // fillRowsWithDefaultStartingAtPosition makes sure we match the table's col umns 1404 // fillRowsWithDefaultStartingAtPosition makes sure we match the table's col umns
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
1641 // FIXME: The table's direction should determine our row's direction, not th e section's (see bug 96691). 1641 // FIXME: The table's direction should determine our row's direction, not th e section's (see bug 96691).
1642 if (!style()->isLeftToRightDirection()) 1642 if (!style()->isLeftToRightDirection())
1643 cellLocation.setX(LayoutUnit(table()->effectiveColumnPositions()[table() ->numEffectiveColumns()] - table()->effectiveColumnPositions()[table()->absolute ColumnToEffectiveColumn(cell->absoluteColumnIndex() + cell->colSpan())] + horizo ntalBorderSpacing)); 1643 cellLocation.setX(LayoutUnit(table()->effectiveColumnPositions()[table() ->numEffectiveColumns()] - table()->effectiveColumnPositions()[table()->absolute ColumnToEffectiveColumn(cell->absoluteColumnIndex() + cell->colSpan())] + horizo ntalBorderSpacing));
1644 else 1644 else
1645 cellLocation.setX(LayoutUnit(table()->effectiveColumnPositions()[effecti veColumn] + horizontalBorderSpacing)); 1645 cellLocation.setX(LayoutUnit(table()->effectiveColumnPositions()[effecti veColumn] + horizontalBorderSpacing));
1646 1646
1647 cell->setLogicalLocation(cellLocation); 1647 cell->setLogicalLocation(cellLocation);
1648 } 1648 }
1649 1649
1650 } // namespace blink 1650 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698