OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2011 Apple Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 868 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
879 // If the child moved, we have to repaint it as well as any floating/pos
itioned | 879 // If the child moved, we have to repaint it as well as any floating/pos
itioned |
880 // descendants. An exception is if we need a layout. In this case, we kn
ow we're going to | 880 // descendants. An exception is if we need a layout. In this case, we kn
ow we're going to |
881 // repaint ourselves (and the child) anyway. | 881 // repaint ourselves (and the child) anyway. |
882 if (!selfNeedsLayout() && child->checkForRepaintDuringLayout()) | 882 if (!selfNeedsLayout() && child->checkForRepaintDuringLayout()) |
883 child->repaintDuringLayoutIfMoved(oldChildRect); | 883 child->repaintDuringLayoutIfMoved(oldChildRect); |
884 } | 884 } |
885 | 885 |
886 for (size_t i = 0; i < sizingData.rowTracks.size(); ++i) | 886 for (size_t i = 0; i < sizingData.rowTracks.size(); ++i) |
887 setLogicalHeight(logicalHeight() + sizingData.rowTracks[i].m_usedBreadth
); | 887 setLogicalHeight(logicalHeight() + sizingData.rowTracks[i].m_usedBreadth
); |
888 | 888 |
889 // FIXME: We should handle min / max logical height. | 889 // Min / max logical height is handled by the call to updateLogicalHeight in
layoutBlock. |
890 | 890 |
891 setLogicalHeight(logicalHeight() + borderAndPaddingLogicalHeight()); | 891 setLogicalHeight(logicalHeight() + borderAndPaddingLogicalHeight()); |
892 } | 892 } |
893 | 893 |
894 GridCoordinate RenderGrid::cachedGridCoordinate(const RenderBox* gridItem) const | 894 GridCoordinate RenderGrid::cachedGridCoordinate(const RenderBox* gridItem) const |
895 { | 895 { |
896 ASSERT(m_gridItemCoordinate.contains(gridItem)); | 896 ASSERT(m_gridItemCoordinate.contains(gridItem)); |
897 return m_gridItemCoordinate.get(gridItem); | 897 return m_gridItemCoordinate.get(gridItem); |
898 } | 898 } |
899 | 899 |
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1143 if (isOutOfFlowPositioned()) | 1143 if (isOutOfFlowPositioned()) |
1144 return "RenderGrid (positioned)"; | 1144 return "RenderGrid (positioned)"; |
1145 if (isAnonymous()) | 1145 if (isAnonymous()) |
1146 return "RenderGrid (generated)"; | 1146 return "RenderGrid (generated)"; |
1147 if (isRelPositioned()) | 1147 if (isRelPositioned()) |
1148 return "RenderGrid (relative positioned)"; | 1148 return "RenderGrid (relative positioned)"; |
1149 return "RenderGrid"; | 1149 return "RenderGrid"; |
1150 } | 1150 } |
1151 | 1151 |
1152 } // namespace WebCore | 1152 } // namespace WebCore |
OLD | NEW |