Chromium Code Reviews| 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 2725 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2736 | 2736 |
| 2737 // m_nodeToDraw is used to draw only one element (and its descendants) | 2737 // m_nodeToDraw is used to draw only one element (and its descendants) |
| 2738 RenderObject* eltRenderer = m_nodeToDraw ? m_nodeToDraw->renderer() : 0; | 2738 RenderObject* eltRenderer = m_nodeToDraw ? m_nodeToDraw->renderer() : 0; |
| 2739 RenderLayer* rootLayer = renderView->layer(); | 2739 RenderLayer* rootLayer = renderView->layer(); |
| 2740 | 2740 |
| 2741 #ifndef NDEBUG | 2741 #ifndef NDEBUG |
| 2742 renderView->assertSubtreeIsLaidOut(); | 2742 renderView->assertSubtreeIsLaidOut(); |
| 2743 RenderObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(rootLayer-> renderer()); | 2743 RenderObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(rootLayer-> renderer()); |
| 2744 #endif | 2744 #endif |
| 2745 | 2745 |
| 2746 RenderObject* enclosingLayerRenderer = eltRenderer->enclosingLayer() ? eltRe nderer->enclosingLayer()->renderer() : eltRenderer; | 2746 RenderObject* enclosingLayerRenderer = eltRenderer ? eltRenderer->enclosingL ayer()->renderer() : 0; |
|
esprehn
2014/03/27 23:54:28
We should rename eltRenderer too.
| |
| 2747 rootLayer->paint(p, rect, m_paintBehavior, enclosingLayerRenderer); | 2747 rootLayer->paint(p, rect, m_paintBehavior, enclosingLayerRenderer); |
| 2748 | 2748 |
| 2749 if (rootLayer->containsDirtyOverlayScrollbars()) | 2749 if (rootLayer->containsDirtyOverlayScrollbars()) |
| 2750 rootLayer->paintOverlayScrollbars(p, rect, m_paintBehavior, eltRenderer) ; | 2750 rootLayer->paintOverlayScrollbars(p, rect, m_paintBehavior, eltRenderer) ; |
| 2751 | 2751 |
| 2752 m_isPainting = false; | 2752 m_isPainting = false; |
| 2753 | 2753 |
| 2754 m_paintBehavior = oldPaintBehavior; | 2754 m_paintBehavior = oldPaintBehavior; |
| 2755 m_lastPaintTime = currentTime(); | 2755 m_lastPaintTime = currentTime(); |
| 2756 | 2756 |
| (...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3247 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) | 3247 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) |
| 3248 { | 3248 { |
| 3249 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 3249 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
| 3250 if (AXObjectCache* cache = axObjectCache()) { | 3250 if (AXObjectCache* cache = axObjectCache()) { |
| 3251 cache->remove(scrollbar); | 3251 cache->remove(scrollbar); |
| 3252 cache->handleScrollbarUpdate(this); | 3252 cache->handleScrollbarUpdate(this); |
| 3253 } | 3253 } |
| 3254 } | 3254 } |
| 3255 | 3255 |
| 3256 } // namespace WebCore | 3256 } // namespace WebCore |
| OLD | NEW |