Source/WebCore/html/HTMLFrameElementBase.cpp - Issue 10914322: Merge 127534

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/WebCore/html/HTMLFrameElementBase.cpp

Issue 10914322: Merge 127534 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/

Patch Set: Created 8 years, 3 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/WebCore/html/HTMLFrameElementBase.cpp

===================================================================

--- Source/WebCore/html/HTMLFrameElementBase.cpp (revision 128789)

+++ Source/WebCore/html/HTMLFrameElementBase.cpp (working copy)

@@ -161,9 +161,10 @@

return InsertionDone;

}

-void HTMLFrameElementBase::didNotifySubtreeInsertions(ContainerNode* insertionPoint)

+void HTMLFrameElementBase::didNotifySubtreeInsertions(ContainerNode*)

{

- ASSERT_UNUSED(insertionPoint, insertionPoint->inDocument());

+ if (!inDocument())

+ return;

// DocumentFragments don't kick of any loads.

if (!document()->frame())

« no previous file with comments | « Source/WebCore/dom/Node.cpp ('k') | no next file » | no next file with comments »