Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(395)

Unified Diff: Source/bindings/v8/V8CustomElementLifecycleCallbacks.cpp

Issue 18258003: Pow __proto__, sock :unresolved, and clunk the created callback at once. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 6 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
Index: Source/bindings/v8/V8CustomElementLifecycleCallbacks.cpp
diff --git a/Source/bindings/v8/V8CustomElementLifecycleCallbacks.cpp b/Source/bindings/v8/V8CustomElementLifecycleCallbacks.cpp
index ebdb0e07d79e27bb827f3bbd915d99330bd82929..d3bd026e3a7d58b6a6ff8891def8cea0202ee429 100644
--- a/Source/bindings/v8/V8CustomElementLifecycleCallbacks.cpp
+++ b/Source/bindings/v8/V8CustomElementLifecycleCallbacks.cpp
@@ -32,6 +32,8 @@
#include "bindings/v8/V8CustomElementLifecycleCallbacks.h"
#include "V8Element.h"
+#include "bindings/v8/CustomElementHelpers.h"
+#include "bindings/v8/DOMDataStore.h"
#include "bindings/v8/ScriptController.h"
#include "bindings/v8/V8Binding.h"
#include "bindings/v8/V8HiddenPropertyName.h"
@@ -40,24 +42,27 @@
namespace WebCore {
-PassRefPtr<V8CustomElementLifecycleCallbacks> V8CustomElementLifecycleCallbacks::create(ScriptExecutionContext* scriptExecutionContext, v8::Handle<v8::Object> owner, v8::Handle<v8::Function> created)
+PassRefPtr<V8CustomElementLifecycleCallbacks> V8CustomElementLifecycleCallbacks::create(ScriptExecutionContext* scriptExecutionContext, v8::Handle<v8::Object> prototype, v8::Handle<v8::Function> created)
{
if (!created.IsEmpty())
- owner->SetHiddenValue(V8HiddenPropertyName::customElementCreated(), created);
- return adoptRef(new V8CustomElementLifecycleCallbacks(scriptExecutionContext, created));
+ prototype->SetHiddenValue(V8HiddenPropertyName::customElementCreated(), created);
+ return adoptRef(new V8CustomElementLifecycleCallbacks(scriptExecutionContext, prototype, created));
}
-static void weakCallback(v8::Isolate*, v8::Persistent<v8::Function>*, ScopedPersistent<v8::Function>* handle)
+template <typename T>
+static void weakCallback(v8::Isolate*, v8::Persistent<T>*, ScopedPersistent<T>* handle)
{
handle->clear();
}
-V8CustomElementLifecycleCallbacks::V8CustomElementLifecycleCallbacks(ScriptExecutionContext* scriptExecutionContext, v8::Handle<v8::Function> created)
- : CustomElementLifecycleCallbacks(created.IsEmpty() ? None : Created)
+V8CustomElementLifecycleCallbacks::V8CustomElementLifecycleCallbacks(ScriptExecutionContext* scriptExecutionContext, v8::Handle<v8::Object> prototype, v8::Handle<v8::Function> created)
+ : CustomElementLifecycleCallbacks(Created)
, ActiveDOMCallback(scriptExecutionContext)
, m_world(DOMWrapperWorld::current())
+ , m_prototype(prototype)
, m_created(created)
{
+ m_prototype.makeWeak(&m_prototype, weakCallback);
if (!m_created.isEmpty())
m_created.makeWeak(&m_created, weakCallback);
}
@@ -67,8 +72,9 @@ void V8CustomElementLifecycleCallbacks::created(Element* element)
if (!canInvokeCallback())
return;
- v8::HandleScope handleScope;
+ element->setIsUpgradedCustomElement();
+ v8::HandleScope handleScope;
v8::Handle<v8::Context> context = toV8Context(scriptExecutionContext(), m_world.get());
if (context.IsEmpty())
return;
@@ -76,19 +82,32 @@ void V8CustomElementLifecycleCallbacks::created(Element* element)
v8::Context::Scope scope(context);
v8::Isolate* isolate = context->GetIsolate();
+ v8::Handle<v8::Object> receiver = DOMDataStore::current(isolate)->get(element);
+ if (!receiver.IsEmpty()) {
+ // Swizzle the prototype of the existing wrapper. We don't need to
+ // worry about non-existent wrappers; they will get the right
+ // prototype when wrapped.
+ v8::Handle<v8::Object> prototype = m_prototype.newLocal(isolate);
+ if (prototype.IsEmpty())
+ return;
+ receiver->SetPrototype(prototype);
+ }
+
v8::Handle<v8::Function> callback = m_created.newLocal(isolate);
if (callback.IsEmpty())
return;
- v8::Handle<v8::Value> elementHandle = toV8(element, context->Global(), isolate);
- if (elementHandle.IsEmpty()) {
- if (!isScriptControllerTerminating())
- CRASH();
- return;
- }
+ if (receiver.IsEmpty()) {
+ v8::Handle<v8::Value> elementHandle = toV8(element, context->Global(), isolate);
+ if (elementHandle.IsEmpty()) {
+ if (!isScriptControllerTerminating())
+ CRASH();
+ return;
+ }
- ASSERT(elementHandle->IsObject());
- v8::Handle<v8::Object> receiver = v8::Handle<v8::Object>::Cast(elementHandle);
+ ASSERT(elementHandle->IsObject());
+ receiver = v8::Handle<v8::Object>::Cast(elementHandle);
esprehn 2013/07/04 01:01:24 Just use toV8(...).As<v8::Object>() it'll ASSERT a
+ }
v8::TryCatch exceptionCatcher;
exceptionCatcher.SetVerbose(true);
@@ -96,4 +115,3 @@ void V8CustomElementLifecycleCallbacks::created(Element* element)
}
} // namespace WebCore
-

Powered by Google App Engine
This is Rietveld 408576698