Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Side by Side Diff: Source/core/frame/FrameView.cpp

Issue 215773002: Don't call RenderObject::enclosingLayer on a null pointer (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: address comments Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/page/scrolling/ScrollingCoordinator.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 2717 matching lines...) Expand 10 before | Expand all | Expand 10 after
2728 if (m_paintBehavior == PaintBehaviorNormal) 2728 if (m_paintBehavior == PaintBehaviorNormal)
2729 document->markers().invalidateRenderedRectsForMarkersInRect(rect); 2729 document->markers().invalidateRenderedRectsForMarkersInRect(rect);
2730 2730
2731 if (document->printing()) 2731 if (document->printing())
2732 m_paintBehavior |= PaintBehaviorFlattenCompositingLayers; 2732 m_paintBehavior |= PaintBehaviorFlattenCompositingLayers;
2733 2733
2734 ASSERT(!m_isPainting); 2734 ASSERT(!m_isPainting);
2735 m_isPainting = true; 2735 m_isPainting = true;
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* renderer = 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 = renderer ? renderer->enclosingLayer() ->renderer() : 0;
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, renderer);
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
2757 // Regions may have changed as a result of the visibility/z-index of element changing. 2757 // Regions may have changed as a result of the visibility/z-index of element changing.
2758 if (document->annotatedRegionsDirty()) 2758 if (document->annotatedRegionsDirty())
2759 updateAnnotatedRegions(); 2759 updateAnnotatedRegions();
2760 2760
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW
« no previous file with comments | « no previous file | Source/core/page/scrolling/ScrollingCoordinator.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698