| 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 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 211 | 211 |
| 212 bool shouldRepaint(const LayoutRect&) const; | 212 bool shouldRepaint(const LayoutRect&) const; |
| 213 | 213 |
| 214 bool rootFillsViewportBackground(RenderBox* rootBox) const; | 214 bool rootFillsViewportBackground(RenderBox* rootBox) const; |
| 215 | 215 |
| 216 // These functions may only be accessed by LayoutStateMaintainer. | 216 // These functions may only be accessed by LayoutStateMaintainer. |
| 217 bool pushLayoutState(RenderBox& renderer, const LayoutSize& offset, LayoutUn
it pageHeight = 0, bool pageHeightChanged = false, ColumnInfo* colInfo = 0) | 217 bool pushLayoutState(RenderBox& renderer, const LayoutSize& offset, LayoutUn
it pageHeight = 0, bool pageHeightChanged = false, ColumnInfo* colInfo = 0) |
| 218 { | 218 { |
| 219 // We push LayoutState even if layoutState is disabled because it stores
layoutDelta too. | 219 // We push LayoutState even if layoutState is disabled because it stores
layoutDelta too. |
| 220 if (!doingFullRepaint() || m_layoutState->isPaginated() || renderer.hasC
olumns() || renderer.flowThreadContainingBlock() | 220 if (!doingFullRepaint() || m_layoutState->isPaginated() || renderer.hasC
olumns() || renderer.flowThreadContainingBlock() |
| 221 || (renderer.isRenderBlock() && toRenderBlock(renderer).shapeInsideI
nfo()) | |
| 222 || (m_layoutState->shapeInsideInfo() && renderer.isRenderBlock() &&
!toRenderBlock(renderer).allowsShapeInsideInfoSharing(&m_layoutState->shapeInsid
eInfo()->owner())) | |
| 223 ) { | 221 ) { |
| 224 pushLayoutStateForCurrentFlowThread(renderer); | 222 pushLayoutStateForCurrentFlowThread(renderer); |
| 225 m_layoutState = new LayoutState(m_layoutState, renderer, offset, pag
eHeight, pageHeightChanged, colInfo); | 223 m_layoutState = new LayoutState(m_layoutState, renderer, offset, pag
eHeight, pageHeightChanged, colInfo); |
| 226 return true; | 224 return true; |
| 227 } | 225 } |
| 228 return false; | 226 return false; |
| 229 } | 227 } |
| 230 | 228 |
| 231 void layoutContent(); | 229 void layoutContent(); |
| 232 #ifndef NDEBUG | 230 #ifndef NDEBUG |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 366 { | 364 { |
| 367 m_view.enableLayoutState(); | 365 m_view.enableLayoutState(); |
| 368 } | 366 } |
| 369 private: | 367 private: |
| 370 RenderView& m_view; | 368 RenderView& m_view; |
| 371 }; | 369 }; |
| 372 | 370 |
| 373 } // namespace WebCore | 371 } // namespace WebCore |
| 374 | 372 |
| 375 #endif // RenderView_h | 373 #endif // RenderView_h |
| OLD | NEW |