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 2721 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2732 | 2732 |
2733 // m_nodeToDraw is used to draw only one element (and its descendants) | 2733 // m_nodeToDraw is used to draw only one element (and its descendants) |
2734 RenderObject* renderer = m_nodeToDraw ? m_nodeToDraw->renderer() : 0; | 2734 RenderObject* renderer = m_nodeToDraw ? m_nodeToDraw->renderer() : 0; |
2735 RenderLayer* rootLayer = renderView->layer(); | 2735 RenderLayer* rootLayer = renderView->layer(); |
2736 | 2736 |
2737 #ifndef NDEBUG | 2737 #ifndef NDEBUG |
2738 renderView->assertSubtreeIsLaidOut(); | 2738 renderView->assertSubtreeIsLaidOut(); |
2739 RenderObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(*rootLayer-
>renderer()); | 2739 RenderObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(*rootLayer-
>renderer()); |
2740 #endif | 2740 #endif |
2741 | 2741 |
2742 RenderObject* enclosingLayerRenderer = renderer ? renderer->enclosingLayer()
->renderer() : 0; | 2742 rootLayer->paint(p, rect, m_paintBehavior, renderer); |
2743 rootLayer->paint(p, rect, m_paintBehavior, enclosingLayerRenderer); | |
2744 | 2743 |
2745 if (rootLayer->containsDirtyOverlayScrollbars()) | 2744 if (rootLayer->containsDirtyOverlayScrollbars()) |
2746 rootLayer->paintOverlayScrollbars(p, rect, m_paintBehavior, renderer); | 2745 rootLayer->paintOverlayScrollbars(p, rect, m_paintBehavior, renderer); |
2747 | 2746 |
2748 m_isPainting = false; | 2747 m_isPainting = false; |
2749 | 2748 |
2750 m_paintBehavior = oldPaintBehavior; | 2749 m_paintBehavior = oldPaintBehavior; |
2751 m_lastPaintTime = currentTime(); | 2750 m_lastPaintTime = currentTime(); |
2752 | 2751 |
2753 // Regions may have changed as a result of the visibility/z-index of element
changing. | 2752 // Regions may have changed as a result of the visibility/z-index of element
changing. |
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3257 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) | 3256 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) |
3258 { | 3257 { |
3259 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 3258 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
3260 if (AXObjectCache* cache = axObjectCache()) { | 3259 if (AXObjectCache* cache = axObjectCache()) { |
3261 cache->remove(scrollbar); | 3260 cache->remove(scrollbar); |
3262 cache->handleScrollbarUpdate(this); | 3261 cache->handleScrollbarUpdate(this); |
3263 } | 3262 } |
3264 } | 3263 } |
3265 | 3264 |
3266 } // namespace WebCore | 3265 } // namespace WebCore |
OLD | NEW |