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

Side by Side Diff: Source/core/xml/XMLHttpRequest.cpp

Issue 23437013: Consider "mixed content XHR" as mixed script instead of mixed display. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Tidy. Created 7 years, 3 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
« no previous file with comments | « Source/core/loader/DocumentThreadableLoader.cpp ('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 730 matching lines...) Expand 10 before | Expand all | Expand 10 after
741 ThreadableLoaderOptions options; 741 ThreadableLoaderOptions options;
742 options.sendLoadCallbacks = SendCallbacks; 742 options.sendLoadCallbacks = SendCallbacks;
743 options.sniffContent = DoNotSniffContent; 743 options.sniffContent = DoNotSniffContent;
744 options.preflightPolicy = uploadEvents ? ForcePreflight : ConsiderPreflight; 744 options.preflightPolicy = uploadEvents ? ForcePreflight : ConsiderPreflight;
745 options.allowCredentials = (m_sameOriginRequest || m_includeCredentials) ? A llowStoredCredentials : DoNotAllowStoredCredentials; 745 options.allowCredentials = (m_sameOriginRequest || m_includeCredentials) ? A llowStoredCredentials : DoNotAllowStoredCredentials;
746 options.credentialsRequested = m_includeCredentials ? ClientRequestedCredent ials : ClientDidNotRequestCredentials; 746 options.credentialsRequested = m_includeCredentials ? ClientRequestedCredent ials : ClientDidNotRequestCredentials;
747 options.crossOriginRequestPolicy = m_allowCrossOriginRequests ? AllowCrossOr iginRequests : UseAccessControl; 747 options.crossOriginRequestPolicy = m_allowCrossOriginRequests ? AllowCrossOr iginRequests : UseAccessControl;
748 options.securityOrigin = securityOrigin(); 748 options.securityOrigin = securityOrigin();
749 options.initiator = FetchInitiatorTypeNames::xmlhttprequest; 749 options.initiator = FetchInitiatorTypeNames::xmlhttprequest;
750 options.contentSecurityPolicyEnforcement = ContentSecurityPolicy::shouldBypa ssMainWorld(scriptExecutionContext()) ? DoNotEnforceContentSecurityPolicy : Enfo rceConnectSrcDirective; 750 options.contentSecurityPolicyEnforcement = ContentSecurityPolicy::shouldBypa ssMainWorld(scriptExecutionContext()) ? DoNotEnforceContentSecurityPolicy : Enfo rceConnectSrcDirective;
751 options.mixedContentBlockingTreatment = TreatAsActiveContent;
751 options.timeoutMilliseconds = m_timeoutMilliseconds; 752 options.timeoutMilliseconds = m_timeoutMilliseconds;
752 753
753 m_exceptionCode = 0; 754 m_exceptionCode = 0;
754 m_error = false; 755 m_error = false;
755 756
756 if (m_async) { 757 if (m_async) {
757 if (m_upload) 758 if (m_upload)
758 request.setReportUploadProgress(true); 759 request.setReportUploadProgress(true);
759 760
760 // ThreadableLoader::create can return null here, for example if we're n o longer attached to a page. 761 // ThreadableLoader::create can return null here, for example if we're n o longer attached to a page.
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
1257 { 1258 {
1258 return eventNames().interfaceForXMLHttpRequest; 1259 return eventNames().interfaceForXMLHttpRequest;
1259 } 1260 }
1260 1261
1261 ScriptExecutionContext* XMLHttpRequest::scriptExecutionContext() const 1262 ScriptExecutionContext* XMLHttpRequest::scriptExecutionContext() const
1262 { 1263 {
1263 return ActiveDOMObject::scriptExecutionContext(); 1264 return ActiveDOMObject::scriptExecutionContext();
1264 } 1265 }
1265 1266
1266 } // namespace WebCore 1267 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/loader/DocumentThreadableLoader.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698