Move ScriptState::GetExecutionContext (Part 4)

third_party/WebKit/Source/core/fileapi/FileReaderSync.cpp

 /*
  * Copyright (C) 2010 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 "core/fileapi/FileReaderSync.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/DOMArrayBuffer.h"
+#include "core/dom/ExecutionContext.h"
 #include "core/fileapi/Blob.h"
 #include "core/fileapi/FileError.h"
 #include "core/fileapi/FileReaderLoader.h"
 #include "platform/Histogram.h"
 
 namespace blink {
 
 namespace {
 // These values are written to logs.  New enum values can be added, but existing
 // enums must never be renumbered or deleted and reused.
@@ skipping 22 matching lines @@
 }
 
 DOMArrayBuffer* FileReaderSync::readAsArrayBuffer(
     ScriptState* script_state,
     Blob* blob,
     ExceptionState& exception_state) {
   DCHECK(blob);
 
   std::unique_ptr<FileReaderLoader> loader =
       FileReaderLoader::Create(FileReaderLoader::kReadAsArrayBuffer, nullptr);
-  StartLoading(script_state->GetExecutionContext(), *loader, *blob,
+  StartLoading(ExecutionContext::From(script_state), *loader, *blob,
                exception_state);
 
   return loader->ArrayBufferResult();
 }
 
 String FileReaderSync::readAsBinaryString(ScriptState* script_state,
                                           Blob* blob,
                                           ExceptionState& exception_state) {
   DCHECK(blob);
 
   std::unique_ptr<FileReaderLoader> loader =
       FileReaderLoader::Create(FileReaderLoader::kReadAsBinaryString, nullptr);
-  StartLoading(script_state->GetExecutionContext(), *loader, *blob,
+  StartLoading(ExecutionContext::From(script_state), *loader, *blob,
                exception_state);
   return loader->StringResult();
 }
 
 String FileReaderSync::readAsText(ScriptState* script_state,
                                   Blob* blob,
                                   const String& encoding,
                                   ExceptionState& exception_state) {
   DCHECK(blob);
 
   std::unique_ptr<FileReaderLoader> loader =
       FileReaderLoader::Create(FileReaderLoader::kReadAsText, nullptr);
   loader->SetEncoding(encoding);
-  StartLoading(script_state->GetExecutionContext(), *loader, *blob,
+  StartLoading(ExecutionContext::From(script_state), *loader, *blob,
                exception_state);
   return loader->StringResult();
 }
 
 String FileReaderSync::readAsDataURL(ScriptState* script_state,
                                      Blob* blob,
                                      ExceptionState& exception_state) {
   DCHECK(blob);
 
   std::unique_ptr<FileReaderLoader> loader =
       FileReaderLoader::Create(FileReaderLoader::kReadAsDataURL, nullptr);
   loader->SetDataType(blob->type());
-  StartLoading(script_state->GetExecutionContext(), *loader, *blob,
+  StartLoading(ExecutionContext::From(script_state), *loader, *blob,
                exception_state);
   return loader->StringResult();
 }
 
 void FileReaderSync::StartLoading(ExecutionContext* execution_context,
                                   FileReaderLoader& loader,
                                   const Blob& blob,
                                   ExceptionState& exception_state) {
   loader.Start(execution_context, blob.GetBlobDataHandle());
   if (loader.GetErrorCode())
     FileError::ThrowDOMException(exception_state, loader.GetErrorCode());
 }
 
 }  // namespace blink