OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All R
ights Reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All R
ights Reserved. |
3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) | 3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) |
4 * | 4 * |
5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
238 | 238 |
239 for (const Page* page : allPages()) { | 239 for (const Page* page : allPages()) { |
240 // Clear out the page's plugin data. | 240 // Clear out the page's plugin data. |
241 if (page->m_pluginData) | 241 if (page->m_pluginData) |
242 page->m_pluginData = nullptr; | 242 page->m_pluginData = nullptr; |
243 } | 243 } |
244 } | 244 } |
245 | 245 |
246 PluginData* Page::pluginData() const | 246 PluginData* Page::pluginData() const |
247 { | 247 { |
248 if (!m_pluginData) | 248 RefPtr<SecurityOrigin> mainFrameOrigin = mainFrame()->securityContext()->get
SecurityOrigin(); |
249 m_pluginData = PluginData::create(this); | 249 |
| 250 if (!m_pluginData || !mainFrameOrigin->isSameSchemeHostPort(m_pluginData->or
igin())) |
| 251 m_pluginData = PluginData::create(mainFrameOrigin); |
250 return m_pluginData.get(); | 252 return m_pluginData.get(); |
251 } | 253 } |
252 | 254 |
253 void Page::setValidationMessageClient(ValidationMessageClient* client) | 255 void Page::setValidationMessageClient(ValidationMessageClient* client) |
254 { | 256 { |
255 m_validationMessageClient = client; | 257 m_validationMessageClient = client; |
256 } | 258 } |
257 | 259 |
258 void Page::setDefersLoading(bool defers) | 260 void Page::setDefersLoading(bool defers) |
259 { | 261 { |
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
551 { | 553 { |
552 } | 554 } |
553 | 555 |
554 Page::PageClients::~PageClients() | 556 Page::PageClients::~PageClients() |
555 { | 557 { |
556 } | 558 } |
557 | 559 |
558 template class CORE_TEMPLATE_EXPORT Supplement<Page>; | 560 template class CORE_TEMPLATE_EXPORT Supplement<Page>; |
559 | 561 |
560 } // namespace blink | 562 } // namespace blink |
OLD | NEW |