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

Side by Side Diff: third_party/WebKit/Source/modules/fetch/FetchRequestData.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/FetchRequestData.h" 5 #include "modules/fetch/FetchRequestData.h"
6 6
7 #include "bindings/core/v8/ScriptState.h" 7 #include "bindings/core/v8/ScriptState.h"
8 #include "core/dom/ExecutionContext.h" 8 #include "core/dom/ExecutionContext.h"
9 #include "core/loader/ThreadableLoader.h" 9 #include "core/loader/ThreadableLoader.h"
10 #include "modules/credentialmanager/PasswordCredential.h" 10 #include "modules/credentialmanager/PasswordCredential.h"
(...skipping 15 matching lines...) Expand all
26 26
27 FetchRequestData* FetchRequestData::Create( 27 FetchRequestData* FetchRequestData::Create(
28 ScriptState* script_state, 28 ScriptState* script_state,
29 const WebServiceWorkerRequest& web_request) { 29 const WebServiceWorkerRequest& web_request) {
30 FetchRequestData* request = FetchRequestData::Create(); 30 FetchRequestData* request = FetchRequestData::Create();
31 request->url_ = web_request.Url(); 31 request->url_ = web_request.Url();
32 request->method_ = web_request.Method(); 32 request->method_ = web_request.Method();
33 for (HTTPHeaderMap::const_iterator it = web_request.Headers().begin(); 33 for (HTTPHeaderMap::const_iterator it = web_request.Headers().begin();
34 it != web_request.Headers().end(); ++it) 34 it != web_request.Headers().end(); ++it)
35 request->header_list_->Append(it->key, it->value); 35 request->header_list_->Append(it->key, it->value);
36 if (web_request.GetBlobDataHandle()) { 36 if (web_request.GetBlobDataHandle())
37 request->SetBuffer(new BodyStreamBuffer( 37 request->SetBuffer(new BodyStreamBuffer(
38 script_state, 38 script_state, new BlobBytesConsumer(script_state->GetExecutionContext(),
39 new BlobBytesConsumer(ExecutionContext::From(script_state), 39 web_request.GetBlobDataHandle())));
40 web_request.GetBlobDataHandle())));
41 }
42 request->SetContext(web_request.GetRequestContext()); 40 request->SetContext(web_request.GetRequestContext());
43 request->SetReferrer( 41 request->SetReferrer(
44 Referrer(web_request.ReferrerUrl().GetString(), 42 Referrer(web_request.ReferrerUrl().GetString(),
45 static_cast<ReferrerPolicy>(web_request.GetReferrerPolicy()))); 43 static_cast<ReferrerPolicy>(web_request.GetReferrerPolicy())));
46 request->SetMode(web_request.Mode()); 44 request->SetMode(web_request.Mode());
47 request->SetCredentials(web_request.CredentialsMode()); 45 request->SetCredentials(web_request.CredentialsMode());
48 request->SetCacheMode(web_request.CacheMode()); 46 request->SetCacheMode(web_request.CacheMode());
49 request->SetRedirect(web_request.RedirectMode()); 47 request->SetRedirect(web_request.RedirectMode());
50 request->SetMIMEType(request->header_list_->ExtractMIMEType()); 48 request->SetMIMEType(request->header_list_->ExtractMIMEType());
51 return request; 49 return request;
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 if (credentials_ != WebURLRequest::kFetchCredentialsModePassword) 113 if (credentials_ != WebURLRequest::kFetchCredentialsModePassword)
116 attached_credential_.Clear(); 114 attached_credential_.Clear();
117 } 115 }
118 116
119 DEFINE_TRACE(FetchRequestData) { 117 DEFINE_TRACE(FetchRequestData) {
120 visitor->Trace(buffer_); 118 visitor->Trace(buffer_);
121 visitor->Trace(header_list_); 119 visitor->Trace(header_list_);
122 } 120 }
123 121
124 } // namespace blink 122 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/modules/fetch/FetchManager.cpp ('k') | third_party/WebKit/Source/modules/fetch/Request.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698