| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2006 Apple Computer, Inc. | 3 * Copyright (C) 2006 Apple Computer, Inc. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 bool shouldRepaint(const LayoutRect&) const; | 218 bool shouldRepaint(const LayoutRect&) const; |
| 219 | 219 |
| 220 bool rootFillsViewportBackground(RenderBox* rootBox) const; | 220 bool rootFillsViewportBackground(RenderBox* rootBox) const; |
| 221 | 221 |
| 222 // These functions may only be accessed by LayoutStateMaintainer. | 222 // These functions may only be accessed by LayoutStateMaintainer. |
| 223 bool pushLayoutState(RenderBox& renderer, const LayoutSize& offset, LayoutUn
it pageHeight = 0, bool pageHeightChanged = false, ColumnInfo* colInfo = 0) | 223 bool pushLayoutState(RenderBox& renderer, const LayoutSize& offset, LayoutUn
it pageHeight = 0, bool pageHeightChanged = false, ColumnInfo* colInfo = 0) |
| 224 { | 224 { |
| 225 // We push LayoutState even if layoutState is disabled because it stores
layoutDelta too. | 225 // We push LayoutState even if layoutState is disabled because it stores
layoutDelta too. |
| 226 if (!doingFullRepaint() || m_layoutState->isPaginated() || renderer.hasC
olumns() || renderer.flowThreadContainingBlock() | 226 if (!doingFullRepaint() || m_layoutState->isPaginated() || renderer.hasC
olumns() || renderer.flowThreadContainingBlock() |
| 227 || (renderer.isRenderBlock() && toRenderBlock(renderer).shapeInsideI
nfo()) | 227 || (renderer.isRenderBlock() && toRenderBlock(renderer).shapeInsideI
nfo()) |
| 228 || (m_layoutState->shapeInsideInfo() && renderer.isRenderBlock() &&
!toRenderBlock(renderer).allowsShapeInsideInfoSharing(m_layoutState->shapeInside
Info()->owner())) | 228 || (m_layoutState->shapeInsideInfo() && renderer.isRenderBlock() &&
!toRenderBlock(renderer).allowsShapeInsideInfoSharing(&m_layoutState->shapeInsid
eInfo()->owner())) |
| 229 ) { | 229 ) { |
| 230 pushLayoutStateForCurrentFlowThread(renderer); | 230 pushLayoutStateForCurrentFlowThread(renderer); |
| 231 m_layoutState = new LayoutState(m_layoutState, renderer, offset, pag
eHeight, pageHeightChanged, colInfo); | 231 m_layoutState = new LayoutState(m_layoutState, renderer, offset, pag
eHeight, pageHeightChanged, colInfo); |
| 232 return true; | 232 return true; |
| 233 } | 233 } |
| 234 return false; | 234 return false; |
| 235 } | 235 } |
| 236 | 236 |
| 237 void layoutContent(const LayoutState&); | 237 void layoutContent(const LayoutState&); |
| 238 #ifndef NDEBUG | 238 #ifndef NDEBUG |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 352 { | 352 { |
| 353 m_view.enableLayoutState(); | 353 m_view.enableLayoutState(); |
| 354 } | 354 } |
| 355 private: | 355 private: |
| 356 RenderView& m_view; | 356 RenderView& m_view; |
| 357 }; | 357 }; |
| 358 | 358 |
| 359 } // namespace WebCore | 359 } // namespace WebCore |
| 360 | 360 |
| 361 #endif // RenderView_h | 361 #endif // RenderView_h |
| OLD | NEW |