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

Side by Side Diff: Source/core/fileapi/FileReaderLoader.cpp

Issue 301243015: Refactor ThreadableLoaderOptions for readability (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 BlobRegistry::registerStreamURL(executionContext.securityOrigin(), m_url ForReading, stream->url()); 98 BlobRegistry::registerStreamURL(executionContext.securityOrigin(), m_url ForReading, stream->url());
99 } 99 }
100 100
101 // Construct and load the request. 101 // Construct and load the request.
102 ResourceRequest request(m_urlForReading); 102 ResourceRequest request(m_urlForReading);
103 request.setHTTPMethod("GET"); 103 request.setHTTPMethod("GET");
104 if (m_hasRange) 104 if (m_hasRange)
105 request.setHTTPHeaderField("Range", AtomicString(String::format("bytes=% d-%d", m_rangeStart, m_rangeEnd))); 105 request.setHTTPHeaderField("Range", AtomicString(String::format("bytes=% d-%d", m_rangeStart, m_rangeEnd)));
106 106
107 ThreadableLoaderOptions options; 107 ThreadableLoaderOptions options;
108 options.sniffContent = DoNotSniffContent;
109 options.preflightPolicy = ConsiderPreflight; 108 options.preflightPolicy = ConsiderPreflight;
110 options.allowCredentials = AllowStoredCredentials;
111 options.crossOriginRequestPolicy = DenyCrossOriginRequests; 109 options.crossOriginRequestPolicy = DenyCrossOriginRequests;
112 // FIXME: Is there a directive to which this load should be subject? 110 // FIXME: Is there a directive to which this load should be subject?
113 options.contentSecurityPolicyEnforcement = DoNotEnforceContentSecurityPolicy ; 111 options.contentSecurityPolicyEnforcement = DoNotEnforceContentSecurityPolicy ;
114 // Use special initiator to hide the request from the inspector. 112 // Use special initiator to hide the request from the inspector.
115 options.initiator = FetchInitiatorTypeNames::internal; 113 options.initiator = FetchInitiatorTypeNames::internal;
116 114
115 ResourceLoaderOptions resourceLoaderOptions;
116 resourceLoaderOptions.sniffContent = DoNotSniffContent;
tkent 2014/06/02 08:08:56 This line is unnecessary. DoNotSniffContent is th
tyoshino (SeeGerritForStatus) 2014/06/02 08:21:35 Done.
117 resourceLoaderOptions.allowCredentials = AllowStoredCredentials;
118
117 if (m_client) 119 if (m_client)
118 m_loader = ThreadableLoader::create(executionContext, this, request, opt ions); 120 m_loader = ThreadableLoader::create(executionContext, this, request, opt ions, resourceLoaderOptions);
119 else 121 else
120 ThreadableLoader::loadResourceSynchronously(executionContext, request, * this, options); 122 ThreadableLoader::loadResourceSynchronously(executionContext, request, * this, options, resourceLoaderOptions);
121 } 123 }
122 124
123 void FileReaderLoader::start(ExecutionContext* executionContext, PassRefPtr<Blob DataHandle> blobData) 125 void FileReaderLoader::start(ExecutionContext* executionContext, PassRefPtr<Blob DataHandle> blobData)
124 { 126 {
125 ASSERT(executionContext); 127 ASSERT(executionContext);
126 m_urlForReadingIsStream = false; 128 m_urlForReadingIsStream = false;
127 startInternal(*executionContext, 0, blobData); 129 startInternal(*executionContext, 0, blobData);
128 } 130 }
129 131
130 void FileReaderLoader::start(ExecutionContext* executionContext, const Stream& s tream, unsigned readSize) 132 void FileReaderLoader::start(ExecutionContext* executionContext, const Stream& s tream, unsigned readSize)
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 m_stringResult = builder.toString(); 398 m_stringResult = builder.toString();
397 } 399 }
398 400
399 void FileReaderLoader::setEncoding(const String& encoding) 401 void FileReaderLoader::setEncoding(const String& encoding)
400 { 402 {
401 if (!encoding.isEmpty()) 403 if (!encoding.isEmpty())
402 m_encoding = WTF::TextEncoding(encoding); 404 m_encoding = WTF::TextEncoding(encoding);
403 } 405 }
404 406
405 } // namespace WebCore 407 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/inspector/InspectorResourceAgent.cpp » ('j') | Source/core/page/EventSource.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698