Revert of Move ScriptState::GetExecutionContext (Part 5)

third_party/WebKit/Source/modules/indexeddb/IDBKeyRange.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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 12 matching lines @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "modules/indexeddb/IDBKeyRange.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ToV8ForCore.h"
 #include "bindings/modules/v8/ToV8ForModules.h"
 #include "bindings/modules/v8/V8BindingForModules.h"
 #include "core/dom/ExceptionCode.h"
-#include "core/dom/ExecutionContext.h"
 #include "modules/indexeddb/IDBDatabase.h"
 
 namespace blink {
 
 IDBKeyRange* IDBKeyRange::FromScriptValue(ExecutionContext* context,
                                           const ScriptValue& value,
                                           ExceptionState& exception_state) {
   if (value.IsUndefined() || value.IsNull())
     return nullptr;
 
@@ skipping 44 matching lines @@
     return nullptr;
   }
 
   return IDBKeyRange::Create(key, key, kLowerBoundClosed, kUpperBoundClosed);
 }
 
 IDBKeyRange* IDBKeyRange::only(ScriptState* script_state,
                                const ScriptValue& key_value,
                                ExceptionState& exception_state) {
   IDBKey* key =
-      ScriptValue::To<IDBKey*>(ToIsolate(ExecutionContext::From(script_state)),
+      ScriptValue::To<IDBKey*>(ToIsolate(script_state->GetExecutionContext()),
                                key_value, exception_state);
   if (exception_state.HadException())
     return nullptr;
   if (!key || !key->IsValid()) {
     exception_state.ThrowDOMException(kDataError,
                                       IDBDatabase::kNotValidKeyErrorMessage);
     return nullptr;
   }
 
   return IDBKeyRange::Create(key, key, kLowerBoundClosed, kUpperBoundClosed);
 }
 
 IDBKeyRange* IDBKeyRange::lowerBound(ScriptState* script_state,
                                      const ScriptValue& bound_value,
                                      bool open,
                                      ExceptionState& exception_state) {
   IDBKey* bound =
-      ScriptValue::To<IDBKey*>(ToIsolate(ExecutionContext::From(script_state)),
+      ScriptValue::To<IDBKey*>(ToIsolate(script_state->GetExecutionContext()),
                                bound_value, exception_state);
   if (exception_state.HadException())
     return nullptr;
   if (!bound || !bound->IsValid()) {
     exception_state.ThrowDOMException(kDataError,
                                       IDBDatabase::kNotValidKeyErrorMessage);
     return nullptr;
   }
 
   return IDBKeyRange::Create(bound, nullptr,
                              open ? kLowerBoundOpen : kLowerBoundClosed,
                              kUpperBoundOpen);
 }
 
 IDBKeyRange* IDBKeyRange::upperBound(ScriptState* script_state,
                                      const ScriptValue& bound_value,
                                      bool open,
                                      ExceptionState& exception_state) {
   IDBKey* bound =
-      ScriptValue::To<IDBKey*>(ToIsolate(ExecutionContext::From(script_state)),
+      ScriptValue::To<IDBKey*>(ToIsolate(script_state->GetExecutionContext()),
                                bound_value, exception_state);
   if (exception_state.HadException())
     return nullptr;
   if (!bound || !bound->IsValid()) {
     exception_state.ThrowDOMException(kDataError,
                                       IDBDatabase::kNotValidKeyErrorMessage);
     return nullptr;
   }
 
   return IDBKeyRange::Create(nullptr, bound, kLowerBoundOpen,
                              open ? kUpperBoundOpen : kUpperBoundClosed);
 }
 
 IDBKeyRange* IDBKeyRange::bound(ScriptState* script_state,
                                 const ScriptValue& lower_value,
                                 const ScriptValue& upper_value,
                                 bool lower_open,
                                 bool upper_open,
                                 ExceptionState& exception_state) {
   IDBKey* lower =
-      ScriptValue::To<IDBKey*>(ToIsolate(ExecutionContext::From(script_state)),
+      ScriptValue::To<IDBKey*>(ToIsolate(script_state->GetExecutionContext()),
                                lower_value, exception_state);
   if (exception_state.HadException())
     return nullptr;
   if (!lower || !lower->IsValid()) {
     exception_state.ThrowDOMException(kDataError,
                                       IDBDatabase::kNotValidKeyErrorMessage);
     return nullptr;
   }
 
   IDBKey* upper =
-      ScriptValue::To<IDBKey*>(ToIsolate(ExecutionContext::From(script_state)),
+      ScriptValue::To<IDBKey*>(ToIsolate(script_state->GetExecutionContext()),
                                upper_value, exception_state);
   if (exception_state.HadException())
     return nullptr;
   if (!upper || !upper->IsValid()) {
     exception_state.ThrowDOMException(kDataError,
                                       IDBDatabase::kNotValidKeyErrorMessage);
     return nullptr;
   }
 
   if (upper->IsLessThan(lower)) {
@@ skipping 10 matching lines @@
 
   return IDBKeyRange::Create(lower, upper,
                              lower_open ? kLowerBoundOpen : kLowerBoundClosed,
                              upper_open ? kUpperBoundOpen : kUpperBoundClosed);
 }
 
 bool IDBKeyRange::includes(ScriptState* script_state,
                            const ScriptValue& key_value,
                            ExceptionState& exception_state) {
   IDBKey* key =
-      ScriptValue::To<IDBKey*>(ToIsolate(ExecutionContext::From(script_state)),
+      ScriptValue::To<IDBKey*>(ToIsolate(script_state->GetExecutionContext()),
                                key_value, exception_state);
   if (exception_state.HadException())
     return false;
   if (!key || !key->IsValid()) {
     exception_state.ThrowDOMException(kDataError,
                                       IDBDatabase::kNotValidKeyErrorMessage);
     return false;
   }
 
   if (lower_) {
@@ skipping 14 matching lines @@
         return false;
     } else {
       if (c > 0)
         return false;
     }
   }
   return true;
 }
 
 }  // namespace blink