Source/core/frame/FrameView.cpp - Issue 215773002: Don't call RenderObject::enclosingLayer on a null pointer

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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: 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:

Index: Source/core/frame/FrameView.cpp

diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp

index 3a1ec6409f82112ae332983736e9b0e71a77c387..b48e8381ebd463bf10b04bfbaa93945f48a45432 100644

--- a/Source/core/frame/FrameView.cpp

+++ b/Source/core/frame/FrameView.cpp

@@ -2743,7 +2743,7 @@ void FrameView::paintContents(GraphicsContext* p, const IntRect& rect)

RenderObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(rootLayer->renderer());

#endif

- RenderObject* enclosingLayerRenderer = eltRenderer->enclosingLayer() ? eltRenderer->enclosingLayer()->renderer() : eltRenderer;

+ RenderObject* enclosingLayerRenderer = eltRenderer ? eltRenderer->enclosingLayer()->renderer() : 0;

esprehn 2014/03/27 23:54:28 We should rename eltRenderer too.

rootLayer->paint(p, rect, m_paintBehavior, enclosingLayerRenderer);

if (rootLayer->containsDirtyOverlayScrollbars())