Source/web/WebPageSerializer.cpp - Issue 200723002: Use new is*Element() helper functions more in web/ code

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/web/WebPageSerializer.cpp

Issue 200723002: Use new is*Element() helper functions more in web/ code (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Use same assertion as in operator->() 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/web/WebPageSerializer.cpp

diff --git a/Source/web/WebPageSerializer.cpp b/Source/web/WebPageSerializer.cpp

index ac543d6b2c368cefdac827f7c9f1d0be2be9777d..4df430c537fe381963c7aec7df378899ca23688d 100644

--- a/Source/web/WebPageSerializer.cpp

+++ b/Source/web/WebPageSerializer.cpp

@@ -109,9 +109,10 @@ void retrieveResourcesForElement(Element* element,

Vector<KURL>* frameURLs,

Vector<KURL>* resourceURLs)

{

+ ASSERT(element);

// If the node is a frame, we'll process it later in retrieveResourcesForFrame.

- if ((element->hasTagName(HTMLNames::iframeTag) || element->hasTagName(HTMLNames::frameTag)

- || element->hasTagName(HTMLNames::objectTag) || element->hasTagName(HTMLNames::embedTag))

+ if ((isHTMLIFrameElement(*element) || isHTMLFrameElement(*element)

+ || isHTMLObjectElement(*element) || isHTMLEmbedElement(*element))

&& element->isFrameOwnerElement()) {

if (LocalFrame* frame = toHTMLFrameOwnerElement(element)->contentFrame()) {

if (!visitedFrames->contains(frame))

« no previous file with comments | « Source/web/WebNode.cpp ('k') | Source/web/WebPageSerializerImpl.cpp » ('j') | no next file with comments »