| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 else { | 75 else { |
| 76 m_clipRect = clipRect; | 76 m_clipRect = clipRect; |
| 77 m_clipped = true; | 77 m_clipped = true; |
| 78 } | 78 } |
| 79 | 79 |
| 80 m_paintOffset -= renderer->scrolledContentOffset(); | 80 m_paintOffset -= renderer->scrolledContentOffset(); |
| 81 } | 81 } |
| 82 | 82 |
| 83 // If we establish a new page height, then cache the offset to the top of th
e first page. | 83 // If we establish a new page height, then cache the offset to the top of th
e first page. |
| 84 // We can compare this later on to figure out what part of the page we're ac
tually on, | 84 // We can compare this later on to figure out what part of the page we're ac
tually on, |
| 85 if (pageLogicalHeight || m_columnInfo || renderer->isRenderFlowThread()) { | 85 if (pageLogicalHeight || m_columnInfo) { |
| 86 m_pageLogicalHeight = pageLogicalHeight; | 86 m_pageLogicalHeight = pageLogicalHeight; |
| 87 bool isFlipped = renderer->style()->isFlippedBlocksWritingMode(); | 87 bool isFlipped = renderer->style()->isFlippedBlocksWritingMode(); |
| 88 m_pageOffset = LayoutSize(m_layoutOffset.width() + (!isFlipped ? rendere
r->borderLeft() + renderer->paddingLeft() : renderer->borderRight() + renderer->
paddingRight()), | 88 m_pageOffset = LayoutSize(m_layoutOffset.width() + (!isFlipped ? rendere
r->borderLeft() + renderer->paddingLeft() : renderer->borderRight() + renderer->
paddingRight()), |
| 89 m_layoutOffset.height() + (!isFlipped ? renderer-
>borderTop() + renderer->paddingTop() : renderer->borderBottom() + renderer->pad
dingBottom())); | 89 m_layoutOffset.height() + (!isFlipped ? renderer-
>borderTop() + renderer->paddingTop() : renderer->borderBottom() + renderer->pad
dingBottom())); |
| 90 m_pageLogicalHeightChanged = pageLogicalHeightChanged; | 90 m_pageLogicalHeightChanged = pageLogicalHeightChanged; |
| 91 } else { | 91 } else { |
| 92 // If we don't establish a new page height, then propagate the old page
height and offset down. | 92 // If we don't establish a new page height, then propagate the old page
height and offset down. |
| 93 m_pageLogicalHeight = m_next->m_pageLogicalHeight; | 93 m_pageLogicalHeight = m_next->m_pageLogicalHeight; |
| 94 m_pageLogicalHeightChanged = m_next->m_pageLogicalHeightChanged; | 94 m_pageLogicalHeightChanged = m_next->m_pageLogicalHeightChanged; |
| 95 m_pageOffset = m_next->m_pageOffset; | 95 m_pageOffset = m_next->m_pageOffset; |
| (...skipping 16 matching lines...) Expand all Loading... |
| 112 if (!m_shapeInsideInfo && m_next->m_shapeInsideInfo && renderBlock->allo
wsShapeInsideInfoSharing(m_next->m_shapeInsideInfo->owner())) | 112 if (!m_shapeInsideInfo && m_next->m_shapeInsideInfo && renderBlock->allo
wsShapeInsideInfoSharing(m_next->m_shapeInsideInfo->owner())) |
| 113 m_shapeInsideInfo = m_next->m_shapeInsideInfo; | 113 m_shapeInsideInfo = m_next->m_shapeInsideInfo; |
| 114 } | 114 } |
| 115 | 115 |
| 116 m_layoutDelta = m_next->m_layoutDelta; | 116 m_layoutDelta = m_next->m_layoutDelta; |
| 117 #if !ASSERT_DISABLED | 117 #if !ASSERT_DISABLED |
| 118 m_layoutDeltaXSaturated = m_next->m_layoutDeltaXSaturated; | 118 m_layoutDeltaXSaturated = m_next->m_layoutDeltaXSaturated; |
| 119 m_layoutDeltaYSaturated = m_next->m_layoutDeltaYSaturated; | 119 m_layoutDeltaYSaturated = m_next->m_layoutDeltaYSaturated; |
| 120 #endif | 120 #endif |
| 121 | 121 |
| 122 m_isPaginated = m_pageLogicalHeight || m_columnInfo || renderer->isRenderFlo
wThread(); | 122 m_isPaginated = m_pageLogicalHeight || m_columnInfo; |
| 123 | 123 |
| 124 if (lineGrid() && renderer->hasColumns() && renderer->style()->hasInlineColu
mnAxis()) | 124 if (lineGrid() && renderer->hasColumns() && renderer->style()->hasInlineColu
mnAxis()) |
| 125 computeLineGridPaginationOrigin(renderer); | 125 computeLineGridPaginationOrigin(renderer); |
| 126 | 126 |
| 127 // If we have a new grid to track, then add it to our set. | 127 // If we have a new grid to track, then add it to our set. |
| 128 if (renderer->style()->lineGrid() != RenderStyle::initialLineGrid() && rende
rer->isRenderBlockFlow()) | 128 if (renderer->style()->lineGrid() != RenderStyle::initialLineGrid() && rende
rer->isRenderBlockFlow()) |
| 129 establishLineGrid(toRenderBlockFlow(renderer)); | 129 establishLineGrid(toRenderBlockFlow(renderer)); |
| 130 | 130 |
| 131 // FIXME: <http://bugs.webkit.org/show_bug.cgi?id=13443> Apply control clip
if present. | 131 // FIXME: <http://bugs.webkit.org/show_bug.cgi?id=13443> Apply control clip
if present. |
| 132 } | 132 } |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 265 LayoutUnit paginationDelta = gridLineHeight - remainder; | 265 LayoutUnit paginationDelta = gridLineHeight - remainder; |
| 266 if (isHorizontalWritingMode) | 266 if (isHorizontalWritingMode) |
| 267 m_lineGridPaginationOrigin.setHeight(paginationDelta); | 267 m_lineGridPaginationOrigin.setHeight(paginationDelta); |
| 268 else | 268 else |
| 269 m_lineGridPaginationOrigin.setWidth(paginationDelta); | 269 m_lineGridPaginationOrigin.setWidth(paginationDelta); |
| 270 } | 270 } |
| 271 } | 271 } |
| 272 } | 272 } |
| 273 | 273 |
| 274 } // namespace WebCore | 274 } // namespace WebCore |
| OLD | NEW |