Remove an isContextInitialized() check from ScriptController::executeScriptInIsolatedWorld

third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp

 /*
  * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2014 Opera Software ASA. 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
@@ skipping 454 matching lines @@
 void ScriptController::executeScriptInIsolatedWorld(
     int worldID,
     const HeapVector<ScriptSourceCode>& sources,
     int extensionGroup,
     Vector<v8::Local<v8::Value>>* results) {
   ASSERT(worldID > 0);
 
   RefPtr<DOMWrapperWorld> world =
       DOMWrapperWorld::ensureIsolatedWorld(isolate(), worldID, extensionGroup);
   WindowProxy* isolatedWorldWindowProxy = windowProxy(*world);
-  if (!isolatedWorldWindowProxy->isContextInitialized())
+  ScriptState* scriptState = isolatedWorldWindowProxy->getScriptState();
+  if (!scriptState->contextIsValid())
     return;
-
-  ScriptState* scriptState = isolatedWorldWindowProxy->getScriptState();
   v8::Context::Scope scope(scriptState->context());
   v8::Local<v8::Array> resultArray = v8::Array::New(isolate(), sources.size());
 
   for (size_t i = 0; i < sources.size(); ++i) {
     v8::Local<v8::Value> evaluationResult =
         executeScriptAndReturnValue(scriptState->context(), sources[i]);
     if (evaluationResult.IsEmpty())
       evaluationResult =
           v8::Local<v8::Value>::New(isolate(), v8::Undefined(isolate()));
     if (!v8CallBoolean(resultArray->CreateDataProperty(scriptState->context(),
                                                        i, evaluationResult)))
       return;
   }
 
   if (results) {
     for (size_t i = 0; i < resultArray->Length(); ++i) {
       v8::Local<v8::Value> value;
       if (!resultArray->Get(scriptState->context(), i).ToLocal(&value))
         return;
       results->push_back(value);
     }
   }
 }
 
 }  // namespace blink