Remove DOMWrapperWorld::isIsolatedWorldId and DOMWrapperWorld::context

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 101 matching lines @@
         ASSERT_NOT_REACHED();
         return;
     }
     ASSERT(i->value == this);
 
     map.remove(i);
     isolatedWorldCount--;
     ASSERT(map.size() == isolatedWorldCount);
 }
 
+#ifndef NDEBUG
+static bool isIsolatedWorldId(int worldId)
+{
+    return worldId != MainWorldId && worldId != WorkerWorldId;
+}
+#endif
+
 PassRefPtr<DOMWrapperWorld> DOMWrapperWorld::ensureIsolatedWorld(int worldId, int extensionGroup)
 {
     ASSERT(isIsolatedWorldId(worldId));
 
     WorldMap& map = isolatedWorldMap();
     WorldMap::AddResult result = map.add(worldId, 0);
     RefPtr<DOMWrapperWorld> world = result.storedValue->value;
     if (world) {
         ASSERT(world->worldId() == worldId);
         ASSERT(world->extensionGroup() == extensionGroup);
         return world.release();
     }
 
     world = DOMWrapperWorld::create(worldId, extensionGroup);
     result.storedValue->value = world.get();
     isolatedWorldCount++;
     ASSERT(map.size() == isolatedWorldCount);
 
     return world.release();
 }
 
-v8::Handle<v8::Context> DOMWrapperWorld::context(ScriptController& controller)
-{
-    return controller.windowShell(this)->context();
-}
-
 typedef HashMap<int, RefPtr<SecurityOrigin> > IsolatedWorldSecurityOriginMap;
 static IsolatedWorldSecurityOriginMap& isolatedWorldSecurityOrigins()
 {
     ASSERT(isMainThread());
     DEFINE_STATIC_LOCAL(IsolatedWorldSecurityOriginMap, map, ());
     return map;
 }
 
 SecurityOrigin* DOMWrapperWorld::isolatedWorldSecurityOrigin()
 {
     ASSERT(this->isIsolatedWorld());
     IsolatedWorldSecurityOriginMap& origins = isolatedWorldSecurityOrigins();
     IsolatedWorldSecurityOriginMap::iterator it = origins.find(worldId());
     return it == origins.end() ? 0 : it->value.get();
 }
 
 void DOMWrapperWorld::setIsolatedWorldSecurityOrigin(int worldId, PassRefPtr<SecurityOrigin> securityOrigin)
 {
-    ASSERT(DOMWrapperWorld::isIsolatedWorldId(worldId));
+    ASSERT(isIsolatedWorldId(worldId));
     if (securityOrigin)
         isolatedWorldSecurityOrigins().set(worldId, securityOrigin);
     else
         isolatedWorldSecurityOrigins().remove(worldId);
 }
 
 void DOMWrapperWorld::clearIsolatedWorldSecurityOrigin(int worldId)
 {
-    ASSERT(DOMWrapperWorld::isIsolatedWorldId(worldId));
+    ASSERT(isIsolatedWorldId(worldId));
     isolatedWorldSecurityOrigins().remove(worldId);
 }
 
 typedef HashMap<int, bool> IsolatedWorldContentSecurityPolicyMap;
 static IsolatedWorldContentSecurityPolicyMap& isolatedWorldContentSecurityPolicies()
 {
     ASSERT(isMainThread());
     DEFINE_STATIC_LOCAL(IsolatedWorldContentSecurityPolicyMap, map, ());
     return map;
 }
 
 bool DOMWrapperWorld::isolatedWorldHasContentSecurityPolicy()
 {
     ASSERT(this->isIsolatedWorld());
     IsolatedWorldContentSecurityPolicyMap& policies = isolatedWorldContentSecurityPolicies();
     IsolatedWorldContentSecurityPolicyMap::iterator it = policies.find(worldId());
     return it == policies.end() ? false : it->value;
 }
 
 void DOMWrapperWorld::setIsolatedWorldContentSecurityPolicy(int worldId, const String& policy)
 {
-    ASSERT(DOMWrapperWorld::isIsolatedWorldId(worldId));
+    ASSERT(isIsolatedWorldId(worldId));
     if (!policy.isEmpty())
         isolatedWorldContentSecurityPolicies().set(worldId, true);
     else
         isolatedWorldContentSecurityPolicies().remove(worldId);
 }
 
 void DOMWrapperWorld::clearIsolatedWorldContentSecurityPolicy(int worldId)
 {
-    ASSERT(DOMWrapperWorld::isIsolatedWorldId(worldId));
+    ASSERT(isIsolatedWorldId(worldId));
     isolatedWorldContentSecurityPolicies().remove(worldId);
 }
 
 typedef HashMap<int, OwnPtr<V8DOMActivityLogger>, WTF::IntHash<int>, WTF::UnsignedWithZeroKeyHashTraits<int> > DOMActivityLoggerMap;
 static DOMActivityLoggerMap& domActivityLoggers()
 {
     ASSERT(isMainThread());
     DEFINE_STATIC_LOCAL(DOMActivityLoggerMap, map, ());
     return map;
 }
 
 void DOMWrapperWorld::setActivityLogger(int worldId, PassOwnPtr<V8DOMActivityLogger> logger)
 {
     domActivityLoggers().set(worldId, logger);
 }
 
 V8DOMActivityLogger* DOMWrapperWorld::activityLogger(int worldId)
 {
     DOMActivityLoggerMap& loggers = domActivityLoggers();
     DOMActivityLoggerMap::iterator it = loggers.find(worldId);
     return it == loggers.end() ? 0 : it->value.get();
 }
 
 bool DOMWrapperWorld::contextHasCorrectPrototype(v8::Handle<v8::Context> context)
 {
     return V8WindowShell::contextHasCorrectPrototype(context);
 }
 
 } // namespace WebCore