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

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

Issue 204983007: Make ThreadableLoader class to use references (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Added asserts Created 6 years, 9 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 /* 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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
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;
116 116
117 if (m_client) 117 if (m_client)
118 m_loader = ThreadableLoader::create(executionContext, this, request, opt ions); 118 m_loader = ThreadableLoader::create(*executionContext, this, request, op tions);
119 else 119 else
120 ThreadableLoader::loadResourceSynchronously(executionContext, request, * this, options); 120 ThreadableLoader::loadResourceSynchronously(*executionContext, request, *this, options);
121 } 121 }
122 122
123 void FileReaderLoader::start(ExecutionContext* executionContext, PassRefPtr<Blob DataHandle> blobData) 123 void FileReaderLoader::start(ExecutionContext* executionContext, PassRefPtr<Blob DataHandle> blobData)
124 { 124 {
125 ASSERT(executionContext);
Inactive 2014/03/31 17:43:26 Is it a lot of work to update the callers?
maheshkk 2014/03/31 20:46:49 I have changed the startInternal to use reference.
125 m_urlForReadingIsStream = false; 126 m_urlForReadingIsStream = false;
126 startInternal(executionContext, 0, blobData); 127 startInternal(executionContext, 0, blobData);
127 } 128 }
128 129
129 void FileReaderLoader::start(ExecutionContext* executionContext, const Stream& s tream, unsigned readSize) 130 void FileReaderLoader::start(ExecutionContext* executionContext, const Stream& s tream, unsigned readSize)
130 { 131 {
132 ASSERT(executionContext);
Inactive 2014/03/31 17:43:26 Ditto.
131 if (readSize > 0) { 133 if (readSize > 0) {
132 m_hasRange = true; 134 m_hasRange = true;
133 m_rangeStart = 0; 135 m_rangeStart = 0;
134 m_rangeEnd = readSize - 1; // End is inclusive so (0,0) is a 1-byte read . 136 m_rangeEnd = readSize - 1; // End is inclusive so (0,0) is a 1-byte read .
135 } 137 }
136 138
137 m_urlForReadingIsStream = true; 139 m_urlForReadingIsStream = true;
138 startInternal(executionContext, &stream, nullptr); 140 startInternal(executionContext, &stream, nullptr);
139 } 141 }
140 142
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 m_stringResult = builder.toString(); 396 m_stringResult = builder.toString();
395 } 397 }
396 398
397 void FileReaderLoader::setEncoding(const String& encoding) 399 void FileReaderLoader::setEncoding(const String& encoding)
398 { 400 {
399 if (!encoding.isEmpty()) 401 if (!encoding.isEmpty())
400 m_encoding = WTF::TextEncoding(encoding); 402 m_encoding = WTF::TextEncoding(encoding);
401 } 403 }
402 404
403 } // namespace WebCore 405 } // 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