Source/core/inspector/InspectorDOMAgent.cpp - Issue 189573002: Convert HTMLFrameOwnerElement and FocusController to use Frame.

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/inspector/InspectorDOMAgent.cpp

Issue 189573002: Convert HTMLFrameOwnerElement and FocusController to use Frame. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Missed a null check 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 side-by-side diff with in-line comments

Download patch

Index: Source/core/inspector/InspectorDOMAgent.cpp

diff --git a/Source/core/inspector/InspectorDOMAgent.cpp b/Source/core/inspector/InspectorDOMAgent.cpp

index de39b4afa0c8a82d62de2e41ed2c81e99dbb6fd5..10b245a729caa2ce3ddcf71c3d6b17d02dbc5cac 100644

--- a/Source/core/inspector/InspectorDOMAgent.cpp

+++ b/Source/core/inspector/InspectorDOMAgent.cpp

@@ -1533,7 +1533,8 @@ PassRefPtr<TypeBuilder::DOM::Node> InspectorDOMAgent::buildObjectForNode(Node* n

if (node->isFrameOwnerElement()) {

HTMLFrameOwnerElement* frameOwner = toHTMLFrameOwnerElement(node);

- if (LocalFrame* frame = frameOwner->contentFrame())

+ LocalFrame* frame = (frameOwner->contentFrame() && frameOwner->contentFrame()->isLocalFrame()) ? toLocalFrame(frameOwner->contentFrame()) : 0;

+ if (frame)

value->setFrameId(m_pageAgent->frameId(frame));

if (Document* doc = frameOwner->contentDocument())

value->setContentDocument(buildObjectForNode(doc, 0, nodesMap));

« no previous file with comments | « Source/core/html/HTMLFrameOwnerElement.cpp ('k') | Source/core/page/EventHandler.cpp » ('j') | no next file with comments »