| 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 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 251 | 251 |
| 252 for (const Page* page : allPages()) { | 252 for (const Page* page : allPages()) { |
| 253 // Clear out the page's plugin data. | 253 // Clear out the page's plugin data. |
| 254 if (page->m_pluginData) | 254 if (page->m_pluginData) |
| 255 page->m_pluginData = nullptr; | 255 page->m_pluginData = nullptr; |
| 256 } | 256 } |
| 257 } | 257 } |
| 258 | 258 |
| 259 PluginData* Page::pluginData() const | 259 PluginData* Page::pluginData() const |
| 260 { | 260 { |
| 261 if (!mainFrame()->isLocalFrame() | |
| 262 || !deprecatedLocalMainFrame()->loader().allowPlugins(NotAboutToInstanti
atePlugin)) | |
| 263 return nullptr; | |
| 264 if (!m_pluginData) | 261 if (!m_pluginData) |
| 265 m_pluginData = PluginData::create(this); | 262 m_pluginData = PluginData::create(this); |
| 266 return m_pluginData.get(); | 263 return m_pluginData.get(); |
| 267 } | 264 } |
| 268 | 265 |
| 269 void Page::unmarkAllTextMatches() | 266 void Page::unmarkAllTextMatches() |
| 270 { | 267 { |
| 271 if (!mainFrame()) | 268 if (!mainFrame()) |
| 272 return; | 269 return; |
| 273 | 270 |
| (...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 576 { | 573 { |
| 577 } | 574 } |
| 578 | 575 |
| 579 Page::PageClients::~PageClients() | 576 Page::PageClients::~PageClients() |
| 580 { | 577 { |
| 581 } | 578 } |
| 582 | 579 |
| 583 template class CORE_TEMPLATE_EXPORT Supplement<Page>; | 580 template class CORE_TEMPLATE_EXPORT Supplement<Page>; |
| 584 | 581 |
| 585 } // namespace blink | 582 } // namespace blink |
| OLD | NEW |