Embedding-CSP: Ports subsumption

third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/frame/csp/CSPDirectiveList.h"
 
 #include "bindings/core/v8/SourceLocation.h"
 #include "core/dom/Document.h"
 #include "core/dom/SecurityContext.h"
 #include "core/dom/SpaceSplitString.h"
@@ skipping 1182 matching lines @@
     case ContentSecurityPolicy::DirectiveType::MediaSrc:
       return operativeDirective(m_mediaSrc.get());
     case ContentSecurityPolicy::DirectiveType::ObjectSrc:
       return operativeDirective(m_objectSrc.get());
     case ContentSecurityPolicy::DirectiveType::ScriptSrc:
       return operativeDirective(m_scriptSrc.get());
     case ContentSecurityPolicy::DirectiveType::StyleSrc:
       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()));
     default:
       return nullptr;
   }
 }
 
 SourceListDirectiveVector CSPDirectiveList::getSourceVector(
     const ContentSecurityPolicy::DirectiveType& type,
@@ skipping 65 matching lines @@
   visitor->trace(m_imgSrc);
   visitor->trace(m_mediaSrc);
   visitor->trace(m_manifestSrc);
   visitor->trace(m_objectSrc);
   visitor->trace(m_scriptSrc);
   visitor->trace(m_styleSrc);
   visitor->trace(m_workerSrc);
 }
 
 }  // namespace blink