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

Side by Side Diff: third_party/WebKit/Source/core/fetch/ResourceLoader.cpp

Issue 1738623004: Rename enums/functions that collide in chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-4
Patch Set: get-names-5: rebase-and-stuff Created 4 years, 10 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) 2006, 2007, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2010, 2011 Apple Inc. All rights reserved.
3 * (C) 2007 Graham Dennis (graham.dennis@gmail.com) 3 * (C) 2007 Graham Dennis (graham.dennis@gmail.com)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 if (m_state == Terminated) 359 if (m_state == Terminated)
360 return; 360 return;
361 361
362 m_fetcher->didReceiveResponse(m_resource.get(), resourceResponse); 362 m_fetcher->didReceiveResponse(m_resource.get(), resourceResponse);
363 if (m_state == Terminated) 363 if (m_state == Terminated)
364 return; 364 return;
365 365
366 if (response.toResourceResponse().isMultipart()) { 366 if (response.toResourceResponse().isMultipart()) {
367 // We only support multipart for images, though the image may be loaded 367 // We only support multipart for images, though the image may be loaded
368 // as a main resource that we end up displaying through an ImageDocument . 368 // as a main resource that we end up displaying through an ImageDocument .
369 if (!m_resource->isImage() && m_resource->type() != Resource::MainResour ce) { 369 if (!m_resource->isImage() && m_resource->getType() != Resource::MainRes ource) {
370 cancel(); 370 cancel();
371 return; 371 return;
372 } 372 }
373 m_loadingMultipartContent = true; 373 m_loadingMultipartContent = true;
374 } else if (isMultipartPayload) { 374 } else if (isMultipartPayload) {
375 // Since a subresource loader does not load multipart sections progressi vely, data was delivered to the loader all at once. 375 // Since a subresource loader does not load multipart sections progressi vely, data was delivered to the loader all at once.
376 // After the first multipart section is complete, signal to delegates th at this load is "finished" 376 // After the first multipart section is complete, signal to delegates th at this load is "finished"
377 m_fetcher->subresourceLoaderFinishedLoadingOnePart(this); 377 m_fetcher->subresourceLoaderFinishedLoadingOnePart(this);
378 didFinishLoadingOnePart(0, WebURLLoaderClient::kUnknownEncodedDataLength ); 378 didFinishLoadingOnePart(0, WebURLLoaderClient::kUnknownEncodedDataLength );
379 } 379 }
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
521 didFinishLoading(0, monotonicallyIncreasingTime(), encodedDataLength); 521 didFinishLoading(0, monotonicallyIncreasingTime(), encodedDataLength);
522 } 522 }
523 523
524 ResourceRequest& ResourceLoader::applyOptions(ResourceRequest& request) const 524 ResourceRequest& ResourceLoader::applyOptions(ResourceRequest& request) const
525 { 525 {
526 request.setAllowStoredCredentials(m_options.allowCredentials == AllowStoredC redentials); 526 request.setAllowStoredCredentials(m_options.allowCredentials == AllowStoredC redentials);
527 return request; 527 return request;
528 } 528 }
529 529
530 } // namespace blink 530 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp ('k') | third_party/WebKit/Source/core/fetch/ScriptResource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698