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

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

Issue 182903003: Make DOMWrapperWorld::current() callable from workers (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 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/DOMWrapperWorld.cpp
diff --git a/Source/bindings/v8/DOMWrapperWorld.cpp b/Source/bindings/v8/DOMWrapperWorld.cpp
index b48341a3c4d7a57ef464053daeaeb0b4a8cd2a43..53b020e55ec4740440c0cf359832e241f769e9ad 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());
@@ -202,9 +194,4 @@ void DOMWrapperWorld::clearIsolatedWorldContentSecurityPolicy(int worldId)
isolatedWorldContentSecurityPolicies().remove(worldId);
}
-bool DOMWrapperWorld::contextHasCorrectPrototype(v8::Handle<v8::Context> context)
-{
- return V8WindowShell::contextHasCorrectPrototype(context);
-}
-
} // namespace WebCore

Powered by Google App Engine
This is Rietveld 408576698