Index: Source/bindings/v8/DOMWrapperWorld.cpp |
diff --git a/Source/bindings/v8/DOMWrapperWorld.cpp b/Source/bindings/v8/DOMWrapperWorld.cpp |
index 69dca91c87dac2fcccae8bf14e72e9683211faab..6001cd4ce66738bb963b6a9a057ee78707fb077d 100644 |
--- a/Source/bindings/v8/DOMWrapperWorld.cpp |
+++ b/Source/bindings/v8/DOMWrapperWorld.cpp |
@@ -41,12 +41,12 @@ |
#include "bindings/v8/WrapperTypeInfo.h" |
#include "core/dom/ExecutionContext.h" |
#include "wtf/HashTraits.h" |
-#include "wtf/MainThread.h" |
#include "wtf/StdLibExtras.h" |
namespace WebCore { |
unsigned DOMWrapperWorld::isolatedWorldCount = 0; |
+DOMWrapperWorld* DOMWrapperWorld::worldOfInitializingWindow = 0; |
PassRefPtr<DOMWrapperWorld> DOMWrapperWorld::create(int worldId, int extensionGroup) |
{ |
@@ -60,14 +60,6 @@ DOMWrapperWorld::DOMWrapperWorld(int worldId, int extensionGroup) |
{ |
} |
-DOMWrapperWorld* DOMWrapperWorld::current(v8::Isolate* isolate) |
-{ |
- v8::Handle<v8::Context> context = isolate->GetCurrentContext(); |
- if (context.IsEmpty() || !toDOMWindow(context)) |
- return 0; |
- return world(context); |
-} |
- |
DOMWrapperWorld* DOMWrapperWorld::mainWorld() |
{ |
ASSERT(isMainThread()); |
@@ -222,9 +214,4 @@ V8DOMActivityLogger* DOMWrapperWorld::activityLogger(int worldId) |
return it == loggers.end() ? 0 : it->value.get(); |
} |
-bool DOMWrapperWorld::contextHasCorrectPrototype(v8::Handle<v8::Context> context) |
-{ |
- return V8WindowShell::contextHasCorrectPrototype(context); |
-} |
- |
} // namespace WebCore |