| 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 #include "core/page/FocusController.h" | 47 #include "core/page/FocusController.h" |
| 48 #include "core/page/PointerLockController.h" | 48 #include "core/page/PointerLockController.h" |
| 49 #include "core/page/ScopedPageLoadDeferrer.h" | 49 #include "core/page/ScopedPageLoadDeferrer.h" |
| 50 #include "core/page/ValidationMessageClient.h" | 50 #include "core/page/ValidationMessageClient.h" |
| 51 #include "core/page/scrolling/ScrollingCoordinator.h" | 51 #include "core/page/scrolling/ScrollingCoordinator.h" |
| 52 #include "core/paint/PaintLayer.h" | 52 #include "core/paint/PaintLayer.h" |
| 53 #include "platform/graphics/GraphicsLayer.h" | 53 #include "platform/graphics/GraphicsLayer.h" |
| 54 #include "platform/plugins/PluginData.h" | 54 #include "platform/plugins/PluginData.h" |
| 55 #include "platform/text/CompressibleString.h" | 55 #include "platform/text/CompressibleString.h" |
| 56 #include "public/platform/Platform.h" | 56 #include "public/platform/Platform.h" |
| 57 #include "public/platform/WebSecurityOrigin.h" |
| 57 | 58 |
| 58 namespace blink { | 59 namespace blink { |
| 59 | 60 |
| 60 // Set of all live pages; includes internal Page objects that are | 61 // Set of all live pages; includes internal Page objects that are |
| 61 // not observable from scripts. | 62 // not observable from scripts. |
| 62 static Page::PageSet& allPages() | 63 static Page::PageSet& allPages() |
| 63 { | 64 { |
| 64 DEFINE_STATIC_LOCAL(Page::PageSet, allPages, ()); | 65 DEFINE_STATIC_LOCAL(Page::PageSet, allPages, ()); |
| 65 return allPages; | 66 return allPages; |
| 66 } | 67 } |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 238 | 239 |
| 239 for (const Page* page : allPages()) { | 240 for (const Page* page : allPages()) { |
| 240 // Clear out the page's plugin data. | 241 // Clear out the page's plugin data. |
| 241 if (page->m_pluginData) | 242 if (page->m_pluginData) |
| 242 page->m_pluginData = nullptr; | 243 page->m_pluginData = nullptr; |
| 243 } | 244 } |
| 244 } | 245 } |
| 245 | 246 |
| 246 PluginData* Page::pluginData() const | 247 PluginData* Page::pluginData() const |
| 247 { | 248 { |
| 249 WebSecurityOrigin origin(mainFrame()->securityContext()->getSecurityOrigin()
); |
| 248 if (!m_pluginData) | 250 if (!m_pluginData) |
| 249 m_pluginData = PluginData::create(this); | 251 m_pluginData = PluginData::create(origin); |
| 252 else |
| 253 m_pluginData->checkOriginChange(origin); |
| 250 return m_pluginData.get(); | 254 return m_pluginData.get(); |
| 251 } | 255 } |
| 252 | 256 |
| 253 void Page::setValidationMessageClient(ValidationMessageClient* client) | 257 void Page::setValidationMessageClient(ValidationMessageClient* client) |
| 254 { | 258 { |
| 255 m_validationMessageClient = client; | 259 m_validationMessageClient = client; |
| 256 } | 260 } |
| 257 | 261 |
| 258 void Page::setDefersLoading(bool defers) | 262 void Page::setDefersLoading(bool defers) |
| 259 { | 263 { |
| (...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 551 { | 555 { |
| 552 } | 556 } |
| 553 | 557 |
| 554 Page::PageClients::~PageClients() | 558 Page::PageClients::~PageClients() |
| 555 { | 559 { |
| 556 } | 560 } |
| 557 | 561 |
| 558 template class CORE_TEMPLATE_EXPORT Supplement<Page>; | 562 template class CORE_TEMPLATE_EXPORT Supplement<Page>; |
| 559 | 563 |
| 560 } // namespace blink | 564 } // namespace blink |
| OLD | NEW |