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

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: Add missing test expectation file. 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
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 732 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 ThreadableLoaderOptions options; 743 ThreadableLoaderOptions options;
744 options.sendLoadCallbacks = SendCallbacks; 744 options.sendLoadCallbacks = SendCallbacks;
745 options.sniffContent = DoNotSniffContent; 745 options.sniffContent = DoNotSniffContent;
746 options.preflightPolicy = uploadEvents ? ForcePreflight : ConsiderPreflight; 746 options.preflightPolicy = uploadEvents ? ForcePreflight : ConsiderPreflight;
747 options.allowCredentials = (m_sameOriginRequest || m_includeCredentials) ? A llowStoredCredentials : DoNotAllowStoredCredentials; 747 options.allowCredentials = (m_sameOriginRequest || m_includeCredentials) ? A llowStoredCredentials : DoNotAllowStoredCredentials;
748 options.credentialsRequested = m_includeCredentials ? ClientRequestedCredent ials : ClientDidNotRequestCredentials; 748 options.credentialsRequested = m_includeCredentials ? ClientRequestedCredent ials : ClientDidNotRequestCredentials;
749 options.crossOriginRequestPolicy = m_allowCrossOriginRequests ? AllowCrossOr iginRequests : UseAccessControl; 749 options.crossOriginRequestPolicy = m_allowCrossOriginRequests ? AllowCrossOr iginRequests : UseAccessControl;
750 options.securityOrigin = securityOrigin(); 750 options.securityOrigin = securityOrigin();
751 options.initiator = FetchInitiatorTypeNames::xmlhttprequest; 751 options.initiator = FetchInitiatorTypeNames::xmlhttprequest;
752 options.contentSecurityPolicyEnforcement = ContentSecurityPolicy::shouldBypa ssMainWorld(scriptExecutionContext()) ? DoNotEnforceContentSecurityPolicy : Enfo rceConnectSrcDirective; 752 options.contentSecurityPolicyEnforcement = ContentSecurityPolicy::shouldBypa ssMainWorld(scriptExecutionContext()) ? DoNotEnforceContentSecurityPolicy : Enfo rceConnectSrcDirective;
753 options.mixedRawContentBlockingOption = TreatAsActiveContent;
753 options.timeoutMilliseconds = m_timeoutMilliseconds; 754 options.timeoutMilliseconds = m_timeoutMilliseconds;
754 755
755 m_exceptionCode = 0; 756 m_exceptionCode = 0;
756 m_error = false; 757 m_error = false;
757 758
758 if (m_async) { 759 if (m_async) {
759 if (m_upload) 760 if (m_upload)
760 request.setReportUploadProgress(true); 761 request.setReportUploadProgress(true);
761 762
762 // ThreadableLoader::create can return null here, for example if we're n o longer attached to a page. 763 // 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
1259 { 1260 {
1260 return eventNames().interfaceForXMLHttpRequest; 1261 return eventNames().interfaceForXMLHttpRequest;
1261 } 1262 }
1262 1263
1263 ScriptExecutionContext* XMLHttpRequest::scriptExecutionContext() const 1264 ScriptExecutionContext* XMLHttpRequest::scriptExecutionContext() const
1264 { 1265 {
1265 return ActiveDOMObject::scriptExecutionContext(); 1266 return ActiveDOMObject::scriptExecutionContext();
1266 } 1267 }
1267 1268
1268 } // namespace WebCore 1269 } // namespace WebCore
OLDNEW
« Source/core/fetch/ResourceLoaderOptions.h ('K') | « Source/core/loader/DocumentThreadableLoader.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698