| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2014 Opera Software ASA. All rights reserved. | 3 * Copyright (C) 2014 Opera Software ASA. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 684 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 695 #else | 695 #else |
| 696 dispose(); | 696 dispose(); |
| 697 #endif | 697 #endif |
| 698 } | 698 } |
| 699 | 699 |
| 700 void WebPluginContainerImpl::dispose() | 700 void WebPluginContainerImpl::dispose() |
| 701 { | 701 { |
| 702 if (m_element && m_touchEventRequestType != TouchEventRequestTypeNone && m_e
lement->document().frameHost()) | 702 if (m_element && m_touchEventRequestType != TouchEventRequestTypeNone && m_e
lement->document().frameHost()) |
| 703 m_element->document().frameHost()->eventHandlerRegistry().didRemoveEvent
Handler(*m_element, EventHandlerRegistry::TouchEvent); | 703 m_element->document().frameHost()->eventHandlerRegistry().didRemoveEvent
Handler(*m_element, EventHandlerRegistry::TouchEvent); |
| 704 | 704 |
| 705 ScriptForbiddenScope::AllowSuperUnsafeScript thisShouldBeRemoved; | |
| 706 | |
| 707 for (size_t i = 0; i < m_pluginLoadObservers.size(); ++i) | 705 for (size_t i = 0; i < m_pluginLoadObservers.size(); ++i) |
| 708 m_pluginLoadObservers[i]->clearPluginContainer(); | 706 m_pluginLoadObservers[i]->clearPluginContainer(); |
| 709 m_webPlugin->destroy(); | 707 m_webPlugin->destroy(); |
| 710 m_webPlugin = nullptr; | 708 m_webPlugin = nullptr; |
| 711 | 709 |
| 712 if (m_webLayer) | 710 if (m_webLayer) |
| 713 GraphicsLayer::unregisterContentsLayer(m_webLayer); | 711 GraphicsLayer::unregisterContentsLayer(m_webLayer); |
| 714 | 712 |
| 715 m_pluginLoadObservers.clear(); | 713 m_pluginLoadObservers.clear(); |
| 716 m_scrollbarGroup.clear(); | 714 m_scrollbarGroup.clear(); |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 977 | 975 |
| 978 return clipRect; | 976 return clipRect; |
| 979 } | 977 } |
| 980 | 978 |
| 981 bool WebPluginContainerImpl::pluginShouldPersist() const | 979 bool WebPluginContainerImpl::pluginShouldPersist() const |
| 982 { | 980 { |
| 983 return m_webPlugin->shouldPersist(); | 981 return m_webPlugin->shouldPersist(); |
| 984 } | 982 } |
| 985 | 983 |
| 986 } // namespace blink | 984 } // namespace blink |
| OLD | NEW |