Make DOMWrapperWorlds easier to use

Source/bindings/v8/V8Binding.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 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 327 matching lines @@
     } else if (context->isWorkerContext()) {
         if (WorkerScriptController* script = static_cast<WorkerContext*>(context)->script())
             return script->context();
     }
     return v8::Local<v8::Context>();
 }
 
 v8::Local<v8::Context> toV8Context(ScriptExecutionContext* context, DOMWrapperWorld* world)
 {
     if (context->isDocument()) {
-        if (Frame* frame = toDocument(context)->frame()) {
-            // FIXME: Store the DOMWrapperWorld for the main world in the v8::Context so callers
-            // that are looking up their world with DOMWrapperWorld::isolatedWorld(v8::Context::GetCurrent())
-            // won't end up passing null here when later trying to get their v8::Context back.
-            if (!world)
-                return frame->script()->mainWorldContext();
+        ASSERT(world);
+        if (Frame* frame = toDocument(context)->frame())
             return v8::Local<v8::Context>::New(frame->script()->windowShell(world)->context());
-        }
     } else if (context->isWorkerContext()) {
+        ASSERT(!world);
         if (WorkerScriptController* script = static_cast<WorkerContext*>(context)->script())
             return script->context();
     }
     return v8::Local<v8::Context>();
 }
 
 bool handleOutOfMemory()
 {
     v8::Local<v8::Context> context = v8::Context::GetCurrent();
 
@@ skipping 42 matching lines @@
     if (!DOMWrapperWorld::isolatedWorldsExist())
         return MainWorld;
     ASSERT(!v8::Context::GetEntered().IsEmpty());
     DOMWrapperWorld* isolatedWorld = DOMWrapperWorld::isolatedWorld(v8::Context::GetEntered());
     if (isolatedWorld)
         return IsolatedWorld;
     return MainWorld;
 }
 
 } // namespace WebCore