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

Side by Side Diff: third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp

Issue 1743863002: Rename enums/functions that collide in chromium style in core/svg,xml (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: get-names-10: rebase Created 4 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
« no previous file with comments | « third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.h ('k') | no next file » | 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) 2004, 2006, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2005-2007 Alexey Proskuryakov <ap@webkit.org> 3 * Copyright (C) 2005-2007 Alexey Proskuryakov <ap@webkit.org>
4 * Copyright (C) 2007, 2008 Julien Chaffraix <jchaffraix@webkit.org> 4 * Copyright (C) 2007, 2008 Julien Chaffraix <jchaffraix@webkit.org>
5 * Copyright (C) 2008, 2011 Google Inc. All rights reserved. 5 * Copyright (C) 2008, 2011 Google Inc. All rights reserved.
6 * Copyright (C) 2012 Intel Corporation 6 * Copyright (C) 2012 Intel Corporation
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 889 matching lines...) Expand 10 before | Expand all | Expand 10 after
900 options.contentSecurityPolicyEnforcement = ContentSecurityPolicy::shouldBypa ssMainWorld(&executionContext) ? DoNotEnforceContentSecurityPolicy : EnforceCont entSecurityPolicy; 900 options.contentSecurityPolicyEnforcement = ContentSecurityPolicy::shouldBypa ssMainWorld(&executionContext) ? DoNotEnforceContentSecurityPolicy : EnforceCont entSecurityPolicy;
901 options.timeoutMilliseconds = m_timeoutMilliseconds; 901 options.timeoutMilliseconds = m_timeoutMilliseconds;
902 902
903 ResourceLoaderOptions resourceLoaderOptions; 903 ResourceLoaderOptions resourceLoaderOptions;
904 resourceLoaderOptions.allowCredentials = (m_sameOriginRequest || m_includeCr edentials) ? AllowStoredCredentials : DoNotAllowStoredCredentials; 904 resourceLoaderOptions.allowCredentials = (m_sameOriginRequest || m_includeCr edentials) ? AllowStoredCredentials : DoNotAllowStoredCredentials;
905 resourceLoaderOptions.credentialsRequested = m_includeCredentials ? ClientRe questedCredentials : ClientDidNotRequestCredentials; 905 resourceLoaderOptions.credentialsRequested = m_includeCredentials ? ClientRe questedCredentials : ClientDidNotRequestCredentials;
906 resourceLoaderOptions.securityOrigin = securityOrigin(); 906 resourceLoaderOptions.securityOrigin = securityOrigin();
907 907
908 // When responseType is set to "blob", we redirect the downloaded data to a 908 // When responseType is set to "blob", we redirect the downloaded data to a
909 // file-handle directly. 909 // file-handle directly.
910 m_downloadingToFile = responseTypeCode() == ResponseTypeBlob; 910 m_downloadingToFile = getResponseTypeCode() == ResponseTypeBlob;
911 if (m_downloadingToFile) { 911 if (m_downloadingToFile) {
912 request.setDownloadToFile(true); 912 request.setDownloadToFile(true);
913 resourceLoaderOptions.dataBufferingPolicy = DoNotBufferData; 913 resourceLoaderOptions.dataBufferingPolicy = DoNotBufferData;
914 } 914 }
915 915
916 m_exceptionCode = 0; 916 m_exceptionCode = 0;
917 m_error = false; 917 m_error = false;
918 918
919 if (m_async) { 919 if (m_async) {
920 UseCounter::count(&executionContext, UseCounter::XMLHttpRequestAsynchron ous); 920 UseCounter::count(&executionContext, UseCounter::XMLHttpRequestAsynchron ous);
(...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after
1701 visitor->trace(m_responseDocumentParser); 1701 visitor->trace(m_responseDocumentParser);
1702 visitor->trace(m_progressEventThrottle); 1702 visitor->trace(m_progressEventThrottle);
1703 visitor->trace(m_upload); 1703 visitor->trace(m_upload);
1704 visitor->trace(m_blobLoader); 1704 visitor->trace(m_blobLoader);
1705 XMLHttpRequestEventTarget::trace(visitor); 1705 XMLHttpRequestEventTarget::trace(visitor);
1706 DocumentParserClient::trace(visitor); 1706 DocumentParserClient::trace(visitor);
1707 ActiveDOMObject::trace(visitor); 1707 ActiveDOMObject::trace(visitor);
1708 } 1708 }
1709 1709
1710 } // namespace blink 1710 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698