third_party/WebKit/Source/bindings/core/v8/custom/V8HTMLElementCustom.cpp - Issue 2170383002: CustomElements: adopt node

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/Source/bindings/core/v8/custom/V8HTMLElementCustom.cpp

Issue 2170383002: CustomElements: adopt node (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge conflict resolution Created 4 years, 4 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/Source/bindings/core/v8/ScriptCustomElementDefinitionBuilder.cpp ('k') | third_party/WebKit/Source/core/core.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/bindings/core/v8/custom/V8HTMLElementCustom.cpp

diff --git a/third_party/WebKit/Source/bindings/core/v8/custom/V8HTMLElementCustom.cpp b/third_party/WebKit/Source/bindings/core/v8/custom/V8HTMLElementCustom.cpp

index 1c6d41ae67e678246577010cb6dcfa4bccd9fb02..49245849257e8af5928069d8f280938977923fcd 100644

--- a/third_party/WebKit/Source/bindings/core/v8/custom/V8HTMLElementCustom.cpp

+++ b/third_party/WebKit/Source/bindings/core/v8/custom/V8HTMLElementCustom.cpp

@@ -12,6 +12,7 @@

#include "bindings/core/v8/V8DOMWrapper.h"

#include "bindings/core/v8/V8ThrowException.h"

#include "core/dom/Document.h"

+#include "core/dom/Element.h"

#include "core/dom/ExceptionCode.h"

#include "core/dom/custom/CustomElementsRegistry.h"

#include "core/frame/LocalDOMWindow.h"

@@ -63,7 +64,7 @@ void V8HTMLElement::constructorCustom(

*window->document());

// TODO(davaajav): write this as one call to setCustomElementState instead of two

element->setCustomElementState(CustomElementState::Undefined);

- element->setCustomElementState(CustomElementState::Custom);

+ element->setCustomElementDefinition(definition);

} else {

element = definition->constructionStack().last();

if (element) {