Revert 170357 "Revert of Make DOMWrapperWorld::current() return ..."

trunk/Source/bindings/v8/V8CustomElementLifecycleCallbacks.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 98 matching lines @@
 
     CALLBACK_LIST(MAKE_WEAK)
 #undef MAKE_WEAK
 }
 
 V8PerContextData* V8CustomElementLifecycleCallbacks::creationContextData()
 {
     if (!executionContext())
         return 0;
 
-    v8::Handle<v8::Context> context = toV8Context(executionContext(), m_world.get());
+    v8::Handle<v8::Context> context = toV8Context(executionContext(), *m_world);
     if (context.IsEmpty())
         return 0;
 
     return V8PerContextData::from(context);
 }
 
 V8CustomElementLifecycleCallbacks::~V8CustomElementLifecycleCallbacks()
 {
     if (!m_owner)
         return;
@@ skipping 23 matching lines @@
 {
     // FIXME: callbacks while paused should be queued up for execution to
     // continue then be delivered in order rather than delivered immediately.
     // Bug 329665 tracks similar behavior for other synchronous events.
     if (!executionContext() || executionContext()->activeDOMObjectsAreStopped())
         return;
 
     element->setCustomElementState(Element::Upgraded);
 
     v8::HandleScope handleScope(m_isolate);
-    v8::Handle<v8::Context> context = toV8Context(executionContext(), m_world.get());
+    v8::Handle<v8::Context> context = toV8Context(executionContext(), *m_world);
     if (context.IsEmpty())
         return;
 
     v8::Context::Scope scope(context);
 
     v8::Handle<v8::Object> receiver = DOMDataStore::current(m_isolate).get<V8Element>(element, m_isolate);
     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.
@@ skipping 31 matching lines @@
 
 void V8CustomElementLifecycleCallbacks::attributeChanged(Element* element, const AtomicString& name, const AtomicString& oldValue, const AtomicString& newValue)
 {
     // FIXME: callbacks while paused should be queued up for execution to
     // continue then be delivered in order rather than delivered immediately.
     // Bug 329665 tracks similar behavior for other synchronous events.
     if (!executionContext() || executionContext()->activeDOMObjectsAreStopped())
         return;
 
     v8::HandleScope handleScope(m_isolate);
-    v8::Handle<v8::Context> context = toV8Context(executionContext(), m_world.get());
+    v8::Handle<v8::Context> context = toV8Context(executionContext(), *m_world);
     if (context.IsEmpty())
         return;
 
     v8::Context::Scope scope(context);
 
     v8::Handle<v8::Object> receiver = toV8(element, context->Global(), m_isolate).As<v8::Object>();
     ASSERT(!receiver.IsEmpty());
 
     v8::Handle<v8::Function> callback = m_attributeChanged.newLocal(m_isolate);
     if (callback.IsEmpty())
@@ skipping 14 matching lines @@
 
 void V8CustomElementLifecycleCallbacks::call(const ScopedPersistent<v8::Function>& weakCallback, Element* element)
 {
     // FIXME: callbacks while paused should be queued up for execution to
     // continue then be delivered in order rather than delivered immediately.
     // Bug 329665 tracks similar behavior for other synchronous events.
     if (!executionContext() || executionContext()->activeDOMObjectsAreStopped())
         return;
 
     v8::HandleScope handleScope(m_isolate);
-    v8::Handle<v8::Context> context = toV8Context(executionContext(), m_world.get());
+    v8::Handle<v8::Context> context = toV8Context(executionContext(), *m_world);
     if (context.IsEmpty())
         return;
 
     v8::Context::Scope scope(context);
 
     v8::Handle<v8::Function> callback = weakCallback.newLocal(m_isolate);
     if (callback.IsEmpty())
         return;
 
     v8::Handle<v8::Object> receiver = toV8(element, context->Global(), m_isolate).As<v8::Object>();
     ASSERT(!receiver.IsEmpty());
 
     InspectorInstrumentation::willExecuteCustomElementCallback(element);
 
     v8::TryCatch exceptionCatcher;
     exceptionCatcher.SetVerbose(true);
     ScriptController::callFunction(executionContext(), callback, receiver, 0, 0, m_isolate);
 }
 
 } // namespace WebCore