Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Side by Side Diff: third_party/WebKit/Source/modules/fetch/FetchManager.cpp

Issue 2821443002: Revert of Move ScriptState::GetExecutionContext (Part 5) (Closed)
Patch Set: Revert Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "modules/fetch/FetchManager.h" 5 #include "modules/fetch/FetchManager.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include "bindings/core/v8/ExceptionState.h" 8 #include "bindings/core/v8/ExceptionState.h"
9 #include "bindings/core/v8/ScriptPromiseResolver.h" 9 #include "bindings/core/v8/ScriptPromiseResolver.h"
10 #include "bindings/core/v8/ScriptState.h" 10 #include "bindings/core/v8/ScriptState.h"
11 #include "bindings/core/v8/V8ThrowException.h" 11 #include "bindings/core/v8/V8ThrowException.h"
12 #include "core/dom/DOMArrayBuffer.h" 12 #include "core/dom/DOMArrayBuffer.h"
13 #include "core/dom/Document.h" 13 #include "core/dom/Document.h"
14 #include "core/dom/ExecutionContext.h"
15 #include "core/fileapi/Blob.h" 14 #include "core/fileapi/Blob.h"
16 #include "core/frame/Frame.h" 15 #include "core/frame/Frame.h"
17 #include "core/frame/SubresourceIntegrity.h" 16 #include "core/frame/SubresourceIntegrity.h"
18 #include "core/frame/csp/ContentSecurityPolicy.h" 17 #include "core/frame/csp/ContentSecurityPolicy.h"
19 #include "core/inspector/ConsoleMessage.h" 18 #include "core/inspector/ConsoleMessage.h"
20 #include "core/loader/ThreadableLoader.h" 19 #include "core/loader/ThreadableLoader.h"
21 #include "core/loader/ThreadableLoaderClient.h" 20 #include "core/loader/ThreadableLoaderClient.h"
22 #include "core/page/ChromeClient.h" 21 #include "core/page/ChromeClient.h"
23 #include "core/page/Page.h" 22 #include "core/page/Page.h"
24 #include "core/probe/CoreProbes.h" 23 #include "core/probe/CoreProbes.h"
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 break; 418 break;
420 } 419 }
421 } 420 }
422 421
423 FetchResponseData* response_data = nullptr; 422 FetchResponseData* response_data = nullptr;
424 SRIBytesConsumer* sri_consumer = nullptr; 423 SRIBytesConsumer* sri_consumer = nullptr;
425 if (request_->Integrity().IsEmpty()) { 424 if (request_->Integrity().IsEmpty()) {
426 response_data = FetchResponseData::CreateWithBuffer(new BodyStreamBuffer( 425 response_data = FetchResponseData::CreateWithBuffer(new BodyStreamBuffer(
427 script_state, 426 script_state,
428 new BytesConsumerForDataConsumerHandle( 427 new BytesConsumerForDataConsumerHandle(
429 ExecutionContext::From(script_state), std::move(handle)))); 428 script_state->GetExecutionContext(), std::move(handle))));
430 } else { 429 } else {
431 sri_consumer = new SRIBytesConsumer(); 430 sri_consumer = new SRIBytesConsumer();
432 response_data = FetchResponseData::CreateWithBuffer( 431 response_data = FetchResponseData::CreateWithBuffer(
433 new BodyStreamBuffer(script_state, sri_consumer)); 432 new BodyStreamBuffer(script_state, sri_consumer));
434 } 433 }
435 response_data->SetStatus(response.HttpStatusCode()); 434 response_data->SetStatus(response.HttpStatusCode());
436 response_data->SetStatusMessage(response.HttpStatusText()); 435 response_data->SetStatusMessage(response.HttpStatusText());
437 for (auto& it : response.HttpHeaderFields()) 436 for (auto& it : response.HttpHeaderFields())
438 response_data->HeaderList()->Append(it.key, it.value); 437 response_data->HeaderList()->Append(it.key, it.value);
439 if (response.UrlListViaServiceWorker().IsEmpty()) { 438 if (response.UrlListViaServiceWorker().IsEmpty()) {
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
923 loaders_.erase(loader); 922 loaders_.erase(loader);
924 loader->Dispose(); 923 loader->Dispose();
925 } 924 }
926 925
927 DEFINE_TRACE(FetchManager) { 926 DEFINE_TRACE(FetchManager) {
928 visitor->Trace(loaders_); 927 visitor->Trace(loaders_);
929 ContextLifecycleObserver::Trace(visitor); 928 ContextLifecycleObserver::Trace(visitor);
930 } 929 }
931 930
932 } // namespace blink 931 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698