Chromium Code Reviews| 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 f202d21f93fa784410b74e0e3d971ba9f764278b..46a4104822ad43de2d62c25436432e42d2103f13 100644 |
| --- a/third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.cpp |
| +++ b/third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.cpp |
| @@ -1264,7 +1264,16 @@ bool CSPDirectiveList::subsumes(const CSPDirectiveListVector& other) { |
| return false; |
| } |
| - return true; |
| + if (!m_pluginTypes.get()) |
| + return true; |
| + |
| + std::vector<MediaListDirective*> pluginTypesOther; |
|
amalika
2016/12/09 10:24:40
oilpan-reviews@ maybe this should be HeapVector<Me
jochen (gone - plz use gerrit)
2016/12/12 07:40:15
MediaListDirective isn't on the oilpan heap, so yo
|
| + for (const auto& policy : other) { |
| + if (policy->m_pluginTypes.get()) |
| + pluginTypesOther.push_back(policy->m_pluginTypes.get()); |
| + } |
| + |
| + return m_pluginTypes->subsumes(pluginTypesOther); |
| } |
| DEFINE_TRACE(CSPDirectiveList) { |