Bindings: Remove DOMWrapperWorld::fromWorldId() for cleanup

third_party/WebKit/Source/web/WebLocalFrameImpl.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 736 matching lines @@
   return frame()->script().executeScriptInMainWorldAndReturnValue(
       ScriptSourceCode(source.code, source.url, position));
 }
 
 void WebLocalFrameImpl::requestExecuteScriptAndReturnValue(
     const WebScriptSource& source,
     bool userGesture,
     WebScriptExecutionCallback* callback) {
   DCHECK(frame());
 
+  RefPtr<DOMWrapperWorld> mainWorld = &DOMWrapperWorld::mainWorld();
   SuspendableScriptExecutor* executor = SuspendableScriptExecutor::create(
-      frame(), 0, createSourcesVector(&source, 1), userGesture, callback);
+      frame(), std::move(mainWorld), createSourcesVector(&source, 1),
+      userGesture, callback);
   executor->run();
 }
 
 void WebLocalFrameImpl::requestExecuteV8Function(
     v8::Local<v8::Context> context,
     v8::Local<v8::Function> function,
     v8::Local<v8::Value> receiver,
     int argc,
     v8::Local<v8::Value> argv[],
     WebScriptExecutionCallback* callback) {
@@ skipping 34 matching lines @@
     int worldID,
     const WebScriptSource* sourcesIn,
     unsigned numSources,
     bool userGesture,
     ScriptExecutionType option,
     WebScriptExecutionCallback* callback) {
   DCHECK(frame());
   CHECK_GT(worldID, 0);
   CHECK_LT(worldID, DOMWrapperWorld::EmbedderWorldIdLimit);
 
+  RefPtr<DOMWrapperWorld> isolatedWorld =
+      DOMWrapperWorld::ensureIsolatedWorld(toIsolate(frame()), worldID);
   SuspendableScriptExecutor* executor = SuspendableScriptExecutor::create(
-      frame(), worldID, createSourcesVector(sourcesIn, numSources), userGesture,
-      callback);
+      frame(), std::move(isolatedWorld),
+      createSourcesVector(sourcesIn, numSources), userGesture, callback);
   switch (option) {
     case AsynchronousBlockingOnload:
       executor->runAsync(SuspendableScriptExecutor::OnloadBlocking);
       break;
     case Asynchronous:
       executor->runAsync(SuspendableScriptExecutor::NonBlocking);
       break;
     case Synchronous:
       executor->run();
       break;
@@ skipping 1650 matching lines @@
         createMarkup(startPosition, endPosition, AnnotateForInterchange,
                      ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
   } else {
     clipHtml =
         createMarkup(endPosition, startPosition, AnnotateForInterchange,
                      ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
   }
 }
 
 }  // namespace blink