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 2735 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2746 | 2746 |
2747 // m_nodeToDraw is used to draw only one element (and its descendants) | 2747 // m_nodeToDraw is used to draw only one element (and its descendants) |
2748 RenderObject* renderer = m_nodeToDraw ? m_nodeToDraw->renderer() : 0; | 2748 RenderObject* renderer = m_nodeToDraw ? m_nodeToDraw->renderer() : 0; |
2749 RenderLayer* rootLayer = renderView->layer(); | 2749 RenderLayer* rootLayer = renderView->layer(); |
2750 | 2750 |
2751 #ifndef NDEBUG | 2751 #ifndef NDEBUG |
2752 renderView->assertSubtreeIsLaidOut(); | 2752 renderView->assertSubtreeIsLaidOut(); |
2753 RenderObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(*rootLayer-
>renderer()); | 2753 RenderObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(*rootLayer-
>renderer()); |
2754 #endif | 2754 #endif |
2755 | 2755 |
2756 RenderObject* enclosingLayerRenderer = renderer ? renderer->enclosingLayer()
->renderer() : 0; | 2756 rootLayer->paint(p, rect, m_paintBehavior, renderer); |
2757 rootLayer->paint(p, rect, m_paintBehavior, enclosingLayerRenderer); | |
2758 | 2757 |
2759 if (rootLayer->containsDirtyOverlayScrollbars()) | 2758 if (rootLayer->containsDirtyOverlayScrollbars()) |
2760 rootLayer->paintOverlayScrollbars(p, rect, m_paintBehavior, renderer); | 2759 rootLayer->paintOverlayScrollbars(p, rect, m_paintBehavior, renderer); |
2761 | 2760 |
2762 m_isPainting = false; | 2761 m_isPainting = false; |
2763 | 2762 |
2764 m_paintBehavior = oldPaintBehavior; | 2763 m_paintBehavior = oldPaintBehavior; |
2765 m_lastPaintTime = currentTime(); | 2764 m_lastPaintTime = currentTime(); |
2766 | 2765 |
2767 // Regions may have changed as a result of the visibility/z-index of element
changing. | 2766 // Regions may have changed as a result of the visibility/z-index of element
changing. |
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3269 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) | 3268 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) |
3270 { | 3269 { |
3271 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 3270 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
3272 if (AXObjectCache* cache = axObjectCache()) { | 3271 if (AXObjectCache* cache = axObjectCache()) { |
3273 cache->remove(scrollbar); | 3272 cache->remove(scrollbar); |
3274 cache->handleScrollbarUpdate(this); | 3273 cache->handleScrollbarUpdate(this); |
3275 } | 3274 } |
3276 } | 3275 } |
3277 | 3276 |
3278 } // namespace WebCore | 3277 } // namespace WebCore |
OLD | NEW |