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

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: isMixedContent() -> ContextTypeNotMixedContent, and rename devtools protocol enum 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
Index: Source/core/inspector/InspectorResourceAgent.cpp
diff --git a/Source/core/inspector/InspectorResourceAgent.cpp b/Source/core/inspector/InspectorResourceAgent.cpp
index 8b960c256016f536a7931138cf93f1a535fa6653..333b05c1815809de5714d78a1a42b30f6a0d175e 100644
--- a/Source/core/inspector/InspectorResourceAgent.cpp
+++ b/Source/core/inspector/InspectorResourceAgent.cpp
@@ -204,12 +204,29 @@ static PassRefPtr<TypeBuilder::Network::ResourceTiming> buildObjectForTiming(con
.release();
}
+TypeBuilder::Network::Request::MixedContentType::Enum getMixedContentType(const ResourceRequest& request)
pfeldman 2015/08/17 20:32:52 no get prefixes in Blink please.
+{
+ switch (request.contextType()) {
+ case ResourceRequest::ContextTypeNotMixedContent:
+ return TypeBuilder::Network::Request::MixedContentType::None;
+ case ResourceRequest::ContextTypeBlockable:
+ return TypeBuilder::Network::Request::MixedContentType::Blockable;
+ case ResourceRequest::ContextTypeOptionallyBlockable:
+ case ResourceRequest::ContextTypeShouldBeBlockable:
+ return TypeBuilder::Network::Request::MixedContentType::Optionally_blockable;
+ }
+
+ return TypeBuilder::Network::Request::MixedContentType::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->setMixedContentType(getMixedContentType(request));
+
if (request.httpBody() && !request.httpBody()->isEmpty()) {
Vector<char> bytes;
request.httpBody()->flatten(bytes);

Powered by Google App Engine
This is Rietveld 408576698