Delete WorldContextHandle in favor of DOMWrapperWorld

Source/bindings/v8/DOMWrapperWorld.cpp

 /*
  * Copyright (C) 2009 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 47 matching lines @@
 }
 
 DOMWrapperWorld::DOMWrapperWorld(int worldId, int extensionGroup)
     : m_worldId(worldId)
     , m_extensionGroup(extensionGroup)
 {
     if (isIsolatedWorld())
         m_domDataStore = adoptPtr(new DOMDataStore(IsolatedWorld));
 }
 
-DOMWrapperWorld* DOMWrapperWorld::current(ScriptExecutionContext* scriptExecutionContext)
+DOMWrapperWorld* DOMWrapperWorld::current()
 {
-    if (scriptExecutionContext->isWorkerContext())
+    ASSERT(v8::Context::InContext());
+    v8::Handle<v8::Context> context = v8::Context::GetCurrent();
+    if (!V8DOMWrapper::isWrapperOfType(toInnerGlobalObject(context), &V8DOMWindow::info))

[abarth-chromium, 2013/04/18 05:41:51]

toInnerGlobalObject can be slow, but I don't think this function is hot enough
for it to matter.

         return 0;
     ASSERT(isMainThread());
-    ASSERT(v8::Context::InContext());
-    DOMWrapperWorld* world = isolatedWorld(v8::Context::GetCurrent());
-    return world ? world : mainThreadNormalWorld();
+    if (DOMWrapperWorld* world = isolatedWorld(context))
+        return world;
+    return mainThreadNormalWorld();
 }
 
 DOMWrapperWorld* mainThreadNormalWorld()
 {
     ASSERT(isMainThread());
     DEFINE_STATIC_LOCAL(RefPtr<DOMWrapperWorld>, cachedNormalWorld, (DOMWrapperWorld::createMainWorld()));
     return cachedNormalWorld.get();
 }
 
 // FIXME: Remove this function. There is currently an issue with the inspector related to the call to dispatchDidClearWindowObjectInWorld in ScriptController::windowShell.
@@ skipping 168 matching lines @@
 } 
 
 V8DOMActivityLogger* DOMWrapperWorld::activityLogger(int worldId)
 {
     DOMActivityLoggerMap& loggers = domActivityLoggers();
     DOMActivityLoggerMap::iterator it = loggers.find(worldId);   
     return it == loggers.end() ? 0 : it->value.get();
 } 
 
 } // namespace WebCore