| Index: third_party/WebKit/Source/modules/indexeddb/IDBObjectStore.cpp
|
| diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBObjectStore.cpp b/third_party/WebKit/Source/modules/indexeddb/IDBObjectStore.cpp
|
| index 164b7cc2e57c0c5fd3c848dc0f0cce0e2bf5e4ab..9cbf73a52a0311d71df87c2273b4f572417ed850 100644
|
| --- a/third_party/WebKit/Source/modules/indexeddb/IDBObjectStore.cpp
|
| +++ b/third_party/WebKit/Source/modules/indexeddb/IDBObjectStore.cpp
|
| @@ -153,7 +153,7 @@
|
| return nullptr;
|
| }
|
| IDBKeyRange* key_range = IDBKeyRange::FromScriptValue(
|
| - script_state->GetExecutionContext(), key, exception_state);
|
| + ExecutionContext::From(script_state), key, exception_state);
|
| if (exception_state.HadException())
|
| return nullptr;
|
| if (!key_range) {
|
| @@ -197,7 +197,7 @@
|
| return nullptr;
|
| }
|
| IDBKeyRange* key_range = IDBKeyRange::FromScriptValue(
|
| - script_state->GetExecutionContext(), key, exception_state);
|
| + ExecutionContext::From(script_state), key, exception_state);
|
| if (exception_state.HadException())
|
| return nullptr;
|
| if (!key_range) {
|
| @@ -252,7 +252,7 @@
|
| return nullptr;
|
| }
|
| IDBKeyRange* range = IDBKeyRange::FromScriptValue(
|
| - script_state->GetExecutionContext(), key_range, exception_state);
|
| + ExecutionContext::From(script_state), key_range, exception_state);
|
| if (exception_state.HadException())
|
| return nullptr;
|
| if (!BackendDB()) {
|
| @@ -302,7 +302,7 @@
|
| return nullptr;
|
| }
|
| IDBKeyRange* range = IDBKeyRange::FromScriptValue(
|
| - script_state->GetExecutionContext(), key_range, exception_state);
|
| + ExecutionContext::From(script_state), key_range, exception_state);
|
| if (exception_state.HadException())
|
| return nullptr;
|
| if (!BackendDB()) {
|
| @@ -422,7 +422,7 @@
|
| SerializedScriptValue::SerializeOptions options;
|
| options.blob_info = &blob_info;
|
| options.write_wasm_to_stream =
|
| - script_state->GetExecutionContext()->IsSecureContext();
|
| + ExecutionContext::From(script_state)->IsSecureContext();
|
| RefPtr<SerializedScriptValue> serialized_value =
|
| SerializedScriptValue::Serialize(isolate, value.V8Value(), options,
|
| exception_state);
|
| @@ -583,7 +583,7 @@
|
| }
|
|
|
| IDBKeyRange* key_range = IDBKeyRange::FromScriptValue(
|
| - script_state->GetExecutionContext(), key, exception_state);
|
| + ExecutionContext::From(script_state), key, exception_state);
|
| if (exception_state.HadException())
|
| return nullptr;
|
| if (!key_range) {
|
| @@ -689,7 +689,7 @@
|
| if (!script_state_->ContextIsValid())
|
| return;
|
|
|
| - DCHECK_EQ(script_state_->GetExecutionContext(), execution_context);
|
| + DCHECK_EQ(ExecutionContext::From(script_state_.Get()), execution_context);
|
| DCHECK_EQ(event->type(), EventTypeNames::success);
|
| EventTarget* target = event->target();
|
| IDBRequest* request = static_cast<IDBRequest*>(target);
|
| @@ -930,7 +930,7 @@
|
| WebIDBCursorDirection direction =
|
| IDBCursor::StringToDirection(direction_string);
|
| IDBKeyRange* key_range = IDBKeyRange::FromScriptValue(
|
| - script_state->GetExecutionContext(), range, exception_state);
|
| + ExecutionContext::From(script_state), range, exception_state);
|
| if (exception_state.HadException())
|
| return nullptr;
|
|
|
| @@ -983,7 +983,7 @@
|
| WebIDBCursorDirection direction =
|
| IDBCursor::StringToDirection(direction_string);
|
| IDBKeyRange* key_range = IDBKeyRange::FromScriptValue(
|
| - script_state->GetExecutionContext(), range, exception_state);
|
| + ExecutionContext::From(script_state), range, exception_state);
|
| if (exception_state.HadException())
|
| return nullptr;
|
|
|
| @@ -1027,7 +1027,7 @@
|
| }
|
|
|
| IDBKeyRange* key_range = IDBKeyRange::FromScriptValue(
|
| - script_state->GetExecutionContext(), range, exception_state);
|
| + ExecutionContext::From(script_state), range, exception_state);
|
| if (exception_state.HadException())
|
| return nullptr;
|
|
|
|
|