Source/WebCore/dom/MicroDataItemList.cpp - Issue 10695128: Merge 120979

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/dom/MicroDataItemList.cpp

Issue 10695128: Merge 120979 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/

Patch Set: Created 8 years, 5 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/dom/MicroDataItemList.cpp

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

--- Source/WebCore/dom/MicroDataItemList.cpp (revision 122245)

+++ Source/WebCore/dom/MicroDataItemList.cpp (working copy)

@@ -32,6 +32,7 @@

#include "Document.h"

#include "HTMLElement.h"

#include "HTMLNames.h"

+#include "NodeRareData.h"

namespace WebCore {

@@ -46,7 +47,8 @@

MicroDataItemList::~MicroDataItemList()

{

- rootNode()->document()->removeCachedMicroDataItemList(this, m_originalTypeNames);

+ String localTypeNames = m_originalTypeNames.isNull() ? String("http://webkit.org/microdata/undefinedItemType") : m_originalTypeNames;

+ m_node->nodeLists()->removeCacheWithName(this, DynamicNodeList::MicroDataItemListType, localTypeNames);

}

bool MicroDataItemList::nodeMatches(Element* testNode) const

« no previous file with comments | « Source/WebCore/dom/DynamicNodeList.cpp ('k') | Source/WebCore/dom/NameNodeList.h » ('j') | no next file with comments »