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

Unified Diff: third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.cpp

Issue 2556713002: Embedding-CSP: Ports subsumption (Closed)
Patch Set: Created 4 years 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: third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.cpp
diff --git a/third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.cpp b/third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.cpp
index 5b5625d989815bc9656598884106cff7f92cf53f..f94a9561439519afd1d668aded04eb814566a884 100644
--- a/third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.cpp
+++ b/third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.cpp
@@ -1200,9 +1200,9 @@ SourceListDirective* CSPDirectiveList::operativeDirective(
return operativeDirective(m_styleSrc.get());
// Directives that default to child-src, which defaults to default-src.
case ContentSecurityPolicy::DirectiveType::FrameSrc:
- return operativeDirective(m_frameSrc,
+ return operativeDirective(m_frameSrc.get(),
operativeDirective(m_childSrc.get()));
- // TODO(mkwst): Reevaluate this
+ // TODO(mkwst): Reevaluate this.
case ContentSecurityPolicy::DirectiveType::WorkerSrc:
return operativeDirective(m_workerSrc.get(),
operativeDirective(m_childSrc.get()));

Powered by Google App Engine
This is Rietveld 408576698