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

Unified Diff: Source/core/inspector/InspectorResourceAgent.cpp

Issue 1299493003: Attach mixed content status to resource requests when sent to devtools (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: mkwst comments Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/fetch/ResourceFetcherTest.cpp ('k') | Source/core/loader/BeaconLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorResourceAgent.cpp
diff --git a/Source/core/inspector/InspectorResourceAgent.cpp b/Source/core/inspector/InspectorResourceAgent.cpp
index 8b960c256016f536a7931138cf93f1a535fa6653..00cbd0d336a4d6b152efb0c6203d8915636130c3 100644
--- a/Source/core/inspector/InspectorResourceAgent.cpp
+++ b/Source/core/inspector/InspectorResourceAgent.cpp
@@ -204,12 +204,30 @@ static PassRefPtr<TypeBuilder::Network::ResourceTiming> buildObjectForTiming(con
.release();
}
+TypeBuilder::Network::Request::MixedContentStatus::Enum getMixedContentStatus(const ResourceRequest& request)
+{
+ if (!request.isMixedContent())
+ return TypeBuilder::Network::Request::MixedContentStatus::None;
+
+ switch (request.contextType()) {
+ case ResourceRequest::ContextTypeBlockable:
+ return TypeBuilder::Network::Request::MixedContentStatus::Active;
estark 2015/08/17 17:20:12 Mike, do you think we should stick with the blocka
+ case ResourceRequest::ContextTypeOptionallyBlockable:
+ case ResourceRequest::ContextTypeShouldBeBlockable:
+ return TypeBuilder::Network::Request::MixedContentStatus::Passive;
+ }
+
+ return TypeBuilder::Network::Request::MixedContentStatus::None;
+}
+
static PassRefPtr<TypeBuilder::Network::Request> buildObjectForResourceRequest(const ResourceRequest& request)
{
RefPtr<TypeBuilder::Network::Request> requestObject = TypeBuilder::Network::Request::create()
.setUrl(urlWithoutFragment(request.url()).string())
.setMethod(request.httpMethod())
.setHeaders(buildObjectForHeaders(request.httpHeaderFields()));
+ requestObject->setMixedContentStatus(getMixedContentStatus(request));
+
if (request.httpBody() && !request.httpBody()->isEmpty()) {
Vector<char> bytes;
request.httpBody()->flatten(bytes);
« no previous file with comments | « Source/core/fetch/ResourceFetcherTest.cpp ('k') | Source/core/loader/BeaconLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698