CustomElements: upgrade element patch

third_party/WebKit/Source/bindings/core/v8/ScriptCustomElementDefinition.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "bindings/core/v8/ScriptCustomElementDefinition.h"
 
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8BindingMacros.h"
 #include "bindings/core/v8/V8CustomElementsRegistry.h"
 #include "bindings/core/v8/V8Element.h"
+#include "bindings/core/v8/V8ErrorHandler.h"
 #include "bindings/core/v8/V8HiddenValue.h"
 #include "bindings/core/v8/V8ScriptRunner.h"
 #include "bindings/core/v8/V8ThrowException.h"
 #include "core/dom/ExceptionCode.h"
+#include "core/events/ErrorEvent.h"
 #include "core/html/HTMLElement.h"
 #include "core/html/HTMLUnknownElement.h"
 #include "v8.h"
 #include "wtf/Allocator.h"
 
 namespace blink {
 
 // Retrieves the custom elements constructor -> name map, creating it
 // if necessary. The same map is used to keep prototypes alive.
 static v8::Local<v8::Map> ensureCustomElementsRegistryMap(
@@ skipping 196 matching lines @@
         return false;
     ScriptState::Scope scope(m_scriptState.get());
     v8::Isolate* isolate = m_scriptState->isolate();
 
     // Step 5 says to rethrow the exception; but there is no one to
     // catch it. The side effect is to report the error.
     v8::TryCatch tryCatch(isolate);
     tryCatch.SetVerbose(true);
 
     Element* result = runConstructor();
-    if (!result)
+    if (tryCatch.HasCaught())
         return false;
 
     if (result != element) {
         V8ThrowException::throwException(
             V8ThrowException::createDOMException(
                 m_scriptState->isolate(),
                 InvalidStateError,
                 "custom element constructors must call super() first and must "
                 "not return a different object",
                 constructor()),
             m_scriptState->isolate());
+
+        ExecutionContext* executionContext = m_scriptState->getExecutionContext();

[dominicc (has gone to gerrit), 2016/07/22 07:34:08]

Could you move this line closer to where it is used?

+        v8::Local<v8::Function> function = constructor().As<v8::Function>();
+        ErrorEvent* event = ErrorEvent::create(
+            "custom element constructors must call super() first and must"
+            "not return a different object",
+            SourceLocation::fromFunction(function),
+            &m_scriptState->world());
+        v8::Local<v8::Value> data = tryCatch.Exception();

[dominicc (has gone to gerrit), 2016/07/22 07:34:08]

I don't think "data" is a very descriptive name. Maybe just call
tryCatch.Exception() inline?

+
+        V8ErrorHandler::storeExceptionOnErrorEventWrapper(m_scriptState.get(), event, data, m_scriptState->context()->Global());
+        executionContext->reportException(event, NotSharableCrossOrigin);
+
         return false;
     }
 
     return true;
 }
 
 Element* ScriptCustomElementDefinition::runConstructor()
 {
     v8::Isolate* isolate = m_scriptState->isolate();
     DCHECK(ScriptState::current(isolate) == m_scriptState);
@@ skipping 93 matching lines @@
         v8String(isolate, name.localName()),
         v8StringOrNull(isolate, oldValue),
         v8StringOrNull(isolate, newValue),
         v8String(isolate, name.namespaceURI()),
     };
     runCallback(m_attributeChangedCallback.newLocal(isolate), element,
         argc, argv);
 }
 
 } // namespace blink