Move ScriptState::forWorld/ScriptState::forMainWorld (Part 2)

third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp

 /*
  * Copyright (C) 2012 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 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "modules/indexeddb/InspectorIndexedDBAgent.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptController.h"
 #include "bindings/core/v8/ScriptState.h"
+#include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8PerIsolateData.h"
 #include "core/dom/DOMStringList.h"
 #include "core/dom/Document.h"
 #include "core/events/EventListener.h"
 #include "core/frame/LocalFrame.h"
 #include "core/inspector/InspectedFrames.h"
 #include "core/inspector/V8InspectorString.h"
 #include "modules/IndexedDBNames.h"
 #include "modules/indexeddb/GlobalIndexedDB.h"
 #include "modules/indexeddb/IDBCursor.h"
@@ skipping 716 matching lines @@
     requestCallback->sendFailure(Response::Error(kNoDocumentError));
     return;
   }
   IDBFactory* idbFactory = nullptr;
   Response response = assertIDBFactory(document, idbFactory);
   if (!response.isSuccess()) {
     requestCallback->sendFailure(response);
     return;
   }
 
-  ScriptState* scriptState = ScriptState::forMainWorld(frame);
+  ScriptState* scriptState = toScriptStateForMainWorld(frame);
   if (!scriptState) {
     requestCallback->sendFailure(Response::InternalError());
     return;
   }
   ScriptState::Scope scope(scriptState);
   DummyExceptionStateForTesting exceptionState;
   IDBRequest* idbRequest =
       idbFactory->getDatabaseNames(scriptState, exceptionState);
   if (exceptionState.hadException()) {
     requestCallback->sendFailure(
@@ skipping 19 matching lines @@
     requestCallback->sendFailure(Response::Error(kNoDocumentError));
     return;
   }
   IDBFactory* idbFactory = nullptr;
   Response response = assertIDBFactory(document, idbFactory);
   if (!response.isSuccess()) {
     requestCallback->sendFailure(response);
     return;
   }
 
-  ScriptState* scriptState = ScriptState::forMainWorld(frame);
+  ScriptState* scriptState = toScriptStateForMainWorld(frame);
   if (!scriptState) {
     requestCallback->sendFailure(Response::InternalError());
     return;
   }
 
   ScriptState::Scope scope(scriptState);
   RefPtr<DatabaseLoader> databaseLoader =
       DatabaseLoader::create(scriptState, std::move(requestCallback));
   databaseLoader->start(idbFactory, document->getSecurityOrigin(),
                         databaseName);
@@ skipping 23 matching lines @@
   }
 
   IDBKeyRange* idbKeyRange = keyRange.isJust()
                                  ? idbKeyRangeFromKeyRange(keyRange.fromJust())
                                  : nullptr;
   if (keyRange.isJust() && !idbKeyRange) {
     requestCallback->sendFailure(Response::Error("Can not parse key range."));
     return;
   }
 
-  ScriptState* scriptState = ScriptState::forMainWorld(frame);
+  ScriptState* scriptState = toScriptStateForMainWorld(frame);
   if (!scriptState) {
     requestCallback->sendFailure(Response::InternalError());
     return;
   }
 
   ScriptState::Scope scope(scriptState);
   RefPtr<DataLoader> dataLoader = DataLoader::create(
       m_v8Session, scriptState, std::move(requestCallback), objectStoreName,
       indexName, idbKeyRange, skipCount, pageSize);
   dataLoader->start(idbFactory, document->getSecurityOrigin(), databaseName);
@@ skipping 105 matching lines @@
     requestCallback->sendFailure(Response::Error(kNoDocumentError));
     return;
   }
   IDBFactory* idbFactory = nullptr;
   Response response = assertIDBFactory(document, idbFactory);
   if (!response.isSuccess()) {
     requestCallback->sendFailure(response);
     return;
   }
 
-  ScriptState* scriptState = ScriptState::forMainWorld(frame);
+  ScriptState* scriptState = toScriptStateForMainWorld(frame);
   if (!scriptState) {
     requestCallback->sendFailure(Response::InternalError());
     return;
   }
 
   ScriptState::Scope scope(scriptState);
   RefPtr<ClearObjectStore> clearObjectStore = ClearObjectStore::create(
       scriptState, objectStoreName, std::move(requestCallback));
   clearObjectStore->start(idbFactory, document->getSecurityOrigin(),
                           databaseName);
@@ skipping 10 matching lines @@
     requestCallback->sendFailure(Response::Error(kNoDocumentError));
     return;
   }
   IDBFactory* idbFactory = nullptr;
   Response response = assertIDBFactory(document, idbFactory);
   if (!response.isSuccess()) {
     requestCallback->sendFailure(response);
     return;
   }
 
-  ScriptState* scriptState = ScriptState::forMainWorld(frame);
+  ScriptState* scriptState = toScriptStateForMainWorld(frame);
   if (!scriptState) {
     requestCallback->sendFailure(Response::InternalError());
     return;
   }
   ScriptState::Scope scope(scriptState);
   DummyExceptionStateForTesting exceptionState;
   IDBRequest* idbRequest = idbFactory->closeConnectionsAndDeleteDatabase(
       scriptState, databaseName, exceptionState);
   if (exceptionState.hadException()) {
     requestCallback->sendFailure(Response::Error("Could not delete database."));
     return;
   }
   idbRequest->addEventListener(
       EventTypeNames::success,
       DeleteCallback::create(std::move(requestCallback),
                              document->getSecurityOrigin()->toRawString()),
       false);
 }
 
 DEFINE_TRACE(InspectorIndexedDBAgent) {
   visitor->trace(m_inspectedFrames);
   InspectorBaseAgent::trace(visitor);
 }
 
 }  // namespace blink