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

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

Issue 123503002: Mark the AtomicString(const String&) constructor as explicit (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 11 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
« no previous file with comments | « Source/core/css/resolver/StyleBuilderCustom.cpp ('k') | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 BlobRegistry::registerPublicBlobURL(executionContext->securityOrigin(), m_urlForReading, blobData); 95 BlobRegistry::registerPublicBlobURL(executionContext->securityOrigin(), m_urlForReading, blobData);
96 } else { 96 } else {
97 ASSERT(stream); 97 ASSERT(stream);
98 BlobRegistry::registerStreamURL(executionContext->securityOrigin(), m_ur lForReading, stream->url()); 98 BlobRegistry::registerStreamURL(executionContext->securityOrigin(), m_ur lForReading, 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", String::format("bytes=%d-%d", m_rang eStart, 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; 108 options.sniffContent = DoNotSniffContent;
109 options.preflightPolicy = ConsiderPreflight; 109 options.preflightPolicy = ConsiderPreflight;
110 options.allowCredentials = AllowStoredCredentials; 110 options.allowCredentials = AllowStoredCredentials;
111 options.crossOriginRequestPolicy = DenyCrossOriginRequests; 111 options.crossOriginRequestPolicy = DenyCrossOriginRequests;
112 // FIXME: Is there a directive to which this load should be subject? 112 // FIXME: Is there a directive to which this load should be subject?
113 options.contentSecurityPolicyEnforcement = DoNotEnforceContentSecurityPolicy ; 113 options.contentSecurityPolicyEnforcement = DoNotEnforceContentSecurityPolicy ;
114 // Use special initiator to hide the request from the inspector. 114 // Use special initiator to hide the request from the inspector.
115 options.initiator = FetchInitiatorTypeNames::internal; 115 options.initiator = FetchInitiatorTypeNames::internal;
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 m_stringResult = builder.toString(); 392 m_stringResult = builder.toString();
393 } 393 }
394 394
395 void FileReaderLoader::setEncoding(const String& encoding) 395 void FileReaderLoader::setEncoding(const String& encoding)
396 { 396 {
397 if (!encoding.isEmpty()) 397 if (!encoding.isEmpty())
398 m_encoding = WTF::TextEncoding(encoding); 398 m_encoding = WTF::TextEncoding(encoding);
399 } 399 }
400 400
401 } // namespace WebCore 401 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleBuilderCustom.cpp ('k') | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698