third_party/WebKit/LayoutTests/fast/dom/htmlallcollection-enumerated-properties.html - Issue 1366643003: [DO NOT LAND] Set @@toStringTag for DOM object prototypes

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: third_party/WebKit/LayoutTests/fast/dom/htmlallcollection-enumerated-properties.html

Issue 1366643003: [DO NOT LAND] Set @@toStringTag for DOM object prototypes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/LayoutTests/fast/dom/DOMException/resources/dispatch-event-exception.js ('k') | third_party/WebKit/LayoutTests/fast/dom/htmlallcollection-enumerated-properties-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/fast/dom/htmlallcollection-enumerated-properties.html

diff --git a/third_party/WebKit/LayoutTests/fast/dom/htmlallcollection-enumerated-properties.html b/third_party/WebKit/LayoutTests/fast/dom/htmlallcollection-enumerated-properties.html

index 43ab04793d136a9bd0cabb8bc451b946bd9b780f..0c05190e9e0daa0d76ebf471872d95536c7339fc 100644

--- a/third_party/WebKit/LayoutTests/fast/dom/htmlallcollection-enumerated-properties.html

+++ b/third_party/WebKit/LayoutTests/fast/dom/htmlallcollection-enumerated-properties.html

@@ -25,8 +25,13 @@ description("This tests verifies the enumerated properties on HTMLAllCollection

var htmlAllCollection = document.all;

shouldBe("htmlAllCollection.__proto__", "HTMLAllCollection.prototype");

+<<<<<<< HEAD

shouldBe("htmlAllCollection.__proto__.__proto__", "HTMLCollection.prototype");

shouldBe("htmlAllCollection.length", "34");

+=======

+shouldBe("htmlAllCollection.__proto__.__proto__", "Object.prototype");

+shouldBe("htmlAllCollection.length", "35");

+>>>>>>> git squash commit.

// As per http://www.whatwg.org/specs/web-apps/current-work/multipage/common-dom-interfaces.html#htmlallcollection-0:

// The supported property names consist of the non-empty values of all the id attributes of all the elements