| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
| 3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Dirk Mueller <mueller@kde.org> | 5 * 2000 Dirk Mueller <mueller@kde.org> |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
| 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
| 9 * Copyright (C) 2009 Google Inc. All rights reserved. | 9 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 10 * | 10 * |
| (...skipping 1020 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1031 ASSERT(!root->needsLayout()); | 1031 ASSERT(!root->needsLayout()); |
| 1032 // We should only repaint for the outer most layout. This works as | 1032 // We should only repaint for the outer most layout. This works as |
| 1033 // we continue to track repaint rects until this function is called. | 1033 // we continue to track repaint rects until this function is called. |
| 1034 ASSERT(!m_nestedLayoutCount); | 1034 ASSERT(!m_nestedLayoutCount); |
| 1035 | 1035 |
| 1036 // FIXME: really, we're in the repaint phase here, and the compositing queri
es are legal. | 1036 // FIXME: really, we're in the repaint phase here, and the compositing queri
es are legal. |
| 1037 // Until those states are fully fledged, I'll just disable the ASSERTS. | 1037 // Until those states are fully fledged, I'll just disable the ASSERTS. |
| 1038 DisableCompositingQueryAsserts disabler; | 1038 DisableCompositingQueryAsserts disabler; |
| 1039 | 1039 |
| 1040 for (RenderObject* renderer = root; renderer; renderer = renderer->nextInPre
Order()) { | 1040 for (RenderObject* renderer = root; renderer; renderer = renderer->nextInPre
Order()) { |
| 1041 // The repaint rectangles stored on the RenderObjects should all match | |
| 1042 // the current repaint rectangles for the renderers. | |
| 1043 ASSERT(renderer->clippedOverflowRectForRepaint(renderer->containerForRep
aint()) == renderer->newRepaintRect()); | |
| 1044 | |
| 1045 const LayoutRect& oldRepaintRect = renderer->oldRepaintRect(); | 1041 const LayoutRect& oldRepaintRect = renderer->oldRepaintRect(); |
| 1046 const LayoutRect& newRepaintRect = renderer->newRepaintRect(); | 1042 const LayoutRect& newRepaintRect = renderer->newRepaintRect(); |
| 1047 | 1043 |
| 1048 if ((renderer->onlyNeededPositionedMovementLayout() && renderer->composi
tingState() != PaintsIntoOwnBacking) | 1044 if ((renderer->onlyNeededPositionedMovementLayout() && renderer->composi
tingState() != PaintsIntoOwnBacking) |
| 1049 || (renderer->shouldDoFullRepaintIfSelfPaintingLayer() | 1045 || (renderer->shouldDoFullRepaintIfSelfPaintingLayer() |
| 1050 && renderer->hasLayer() | 1046 && renderer->hasLayer() |
| 1051 && toRenderLayerModelObject(renderer)->layer()->isSelfPaintingLa
yer())) { | 1047 && toRenderLayerModelObject(renderer)->layer()->isSelfPaintingLa
yer())) { |
| 1052 renderer->setShouldDoFullRepaintAfterLayout(true); | 1048 renderer->setShouldDoFullRepaintAfterLayout(true); |
| 1053 } | 1049 } |
| 1054 | 1050 |
| (...skipping 2160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3215 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) | 3211 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) |
| 3216 { | 3212 { |
| 3217 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 3213 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
| 3218 if (AXObjectCache* cache = axObjectCache()) { | 3214 if (AXObjectCache* cache = axObjectCache()) { |
| 3219 cache->remove(scrollbar); | 3215 cache->remove(scrollbar); |
| 3220 cache->handleScrollbarUpdate(this); | 3216 cache->handleScrollbarUpdate(this); |
| 3221 } | 3217 } |
| 3222 } | 3218 } |
| 3223 | 3219 |
| 3224 } // namespace WebCore | 3220 } // namespace WebCore |
| OLD | NEW |