Index: third_party/WebKit/Source/modules/serviceworkers/FetchEvent.cpp |
diff --git a/third_party/WebKit/Source/modules/serviceworkers/FetchEvent.cpp b/third_party/WebKit/Source/modules/serviceworkers/FetchEvent.cpp |
index 7688e0742159046bcc6c933760a2ba154c3f9fd1..d1650d9c297c55c41e4d9b8c5c609089b29313c6 100644 |
--- a/third_party/WebKit/Source/modules/serviceworkers/FetchEvent.cpp |
+++ b/third_party/WebKit/Source/modules/serviceworkers/FetchEvent.cpp |
@@ -7,6 +7,7 @@ |
#include "bindings/core/v8/ScriptState.h" |
#include "bindings/core/v8/ToV8ForCore.h" |
#include "bindings/core/v8/V8PrivateProperty.h" |
+#include "core/dom/ExecutionContext.h" |
#include "modules/fetch/BytesConsumerForDataConsumerHandle.h" |
#include "modules/fetch/Request.h" |
#include "modules/fetch/Response.h" |
@@ -75,7 +76,7 @@ |
: ExtendableEvent(type, initializer, wait_until_observer), |
observer_(respond_with_observer), |
preload_response_property_(new PreloadResponseProperty( |
- script_state->GetExecutionContext(), |
+ ExecutionContext::From(script_state), |
this, |
PreloadResponseProperty::kPreloadResponse)) { |
if (!navigation_preload_sent) |
@@ -118,7 +119,7 @@ |
data_consume_handle |
? FetchResponseData::CreateWithBuffer(new BodyStreamBuffer( |
script_state, new BytesConsumerForDataConsumerHandle( |
- script_state->GetExecutionContext(), |
+ ExecutionContext::From(script_state), |
std::move(data_consume_handle)))) |
: FetchResponseData::Create(); |
Vector<KURL> url_list(1); |
@@ -137,7 +138,7 @@ |
? response_data->CreateOpaqueRedirectFilteredResponse() |
: response_data->CreateBasicFilteredResponse(); |
preload_response_property_->Resolve( |
- Response::Create(script_state->GetExecutionContext(), tainted_response)); |
+ Response::Create(ExecutionContext::From(script_state), tainted_response)); |
} |
void FetchEvent::OnNavigationPreloadError( |