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 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
208 virtual void computeSelfHitTestRects(Vector<LayoutRect>&, const LayoutPoint& layerOffset) const OVERRIDE; | 208 virtual void computeSelfHitTestRects(Vector<LayoutRect>&, const LayoutPoint& layerOffset) const OVERRIDE; |
209 | 209 |
210 bool shouldRepaint(const LayoutRect&) const; | 210 bool shouldRepaint(const LayoutRect&) const; |
211 | 211 |
212 bool rootFillsViewportBackground(RenderBox* rootBox) const; | 212 bool rootFillsViewportBackground(RenderBox* rootBox) const; |
213 | 213 |
214 // These functions may only be accessed by LayoutStateMaintainer. | 214 // These functions may only be accessed by LayoutStateMaintainer. |
215 bool pushLayoutState(RenderBox& renderer, const LayoutSize& offset, LayoutUn it pageHeight = 0, bool pageHeightChanged = false, ColumnInfo* colInfo = 0) | 215 bool pushLayoutState(RenderBox& renderer, const LayoutSize& offset, LayoutUn it pageHeight = 0, bool pageHeightChanged = false, ColumnInfo* colInfo = 0) |
216 { | 216 { |
217 // We push LayoutState even if layoutState is disabled because it stores layoutDelta too. | 217 // We push LayoutState even if layoutState is disabled because it stores layoutDelta too. |
218 if ((!doingFullRepaint() || RuntimeEnabledFeatures::repaintAfterLayoutEn abled()) || m_layoutState->isPaginated() || renderer.hasColumns() || renderer.fl owThreadContainingBlock() | 218 if ((!doingFullRepaint() || (RuntimeEnabledFeatures::repaintAfterLayoutE nabled() && !m_layoutStateDisableCount)) || m_layoutState->isPaginated() || rend erer.hasColumns() || renderer.flowThreadContainingBlock() |
Julien - ping for review
2014/05/07 17:50:03
Can we use layoutStateEnabled() instead of that as
leviw_travelin_and_unemployed
2014/05/07 17:58:48
We can definitely use layoutStateEnabled(). Also g
| |
219 ) { | 219 ) { |
220 pushLayoutStateForCurrentFlowThread(renderer); | 220 pushLayoutStateForCurrentFlowThread(renderer); |
221 m_layoutState = new LayoutState(m_layoutState, renderer, offset, pag eHeight, pageHeightChanged, colInfo); | 221 m_layoutState = new LayoutState(m_layoutState, renderer, offset, pag eHeight, pageHeightChanged, colInfo); |
222 return true; | 222 return true; |
223 } | 223 } |
224 return false; | 224 return false; |
225 } | 225 } |
226 | 226 |
227 void layoutContent(); | 227 void layoutContent(); |
228 #ifndef NDEBUG | 228 #ifndef NDEBUG |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
373 { | 373 { |
374 m_view.enableLayoutState(); | 374 m_view.enableLayoutState(); |
375 } | 375 } |
376 private: | 376 private: |
377 RenderView& m_view; | 377 RenderView& m_view; |
378 }; | 378 }; |
379 | 379 |
380 } // namespace WebCore | 380 } // namespace WebCore |
381 | 381 |
382 #endif // RenderView_h | 382 #endif // RenderView_h |
OLD | NEW |