| Index: third_party/WebKit/Source/core/page/Page.cpp
|
| diff --git a/third_party/WebKit/Source/core/page/Page.cpp b/third_party/WebKit/Source/core/page/Page.cpp
|
| index 4e2a89a2e20ff22690e5f00de814170cd6d4b0ce..5d5f186c7ed67bfc887c7dd2041e28f0f169a083 100644
|
| --- a/third_party/WebKit/Source/core/page/Page.cpp
|
| +++ b/third_party/WebKit/Source/core/page/Page.cpp
|
| @@ -54,6 +54,7 @@
|
| #include "platform/plugins/PluginData.h"
|
| #include "platform/text/CompressibleString.h"
|
| #include "public/platform/Platform.h"
|
| +#include "public/platform/WebSecurityOrigin.h"
|
|
|
| namespace blink {
|
|
|
| @@ -243,10 +244,14 @@ void Page::refreshPlugins()
|
| }
|
| }
|
|
|
| -PluginData* Page::pluginData() const
|
| +PluginData* Page::pluginData()
|
| {
|
| - if (!m_pluginData)
|
| - m_pluginData = PluginData::create(this);
|
| + RefPtr<SecurityOrigin> mainFrameOrigin = mainFrame()->securityContext()->getSecurityOrigin();
|
| + WebSecurityOrigin webOrigin(mainFrameOrigin.get());
|
| +
|
| + if (!m_pluginData || !mainFrameOrigin->isSameSchemeHostPort(m_mainFrameOrigin.get()))
|
| + m_pluginData = PluginData::create(webOrigin);
|
| + m_mainFrameOrigin = mainFrameOrigin;
|
| return m_pluginData.get();
|
| }
|
|
|
|
|