OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
677 // is cleanly detached. If an explicit detach doesn't happen, this | 677 // is cleanly detached. If an explicit detach doesn't happen, this |
678 // container is assumed to have died with the plugin element (and | 678 // container is assumed to have died with the plugin element (and |
679 // its document), hence no unregistration step is needed. | 679 // its document), hence no unregistration step is needed. |
680 // | 680 // |
681 m_element = 0; | 681 m_element = 0; |
682 #else | 682 #else |
683 if (m_touchEventRequestType != TouchEventRequestTypeNone) | 683 if (m_touchEventRequestType != TouchEventRequestTypeNone) |
684 m_element->document().didRemoveTouchEventHandler(m_element); | 684 m_element->document().didRemoveTouchEventHandler(m_element); |
685 #endif | 685 #endif |
686 | 686 |
| 687 ScriptForbiddenScope::AllowSuperUnsafeScript thisShouldBeRemoved; |
| 688 |
687 for (size_t i = 0; i < m_pluginLoadObservers.size(); ++i) | 689 for (size_t i = 0; i < m_pluginLoadObservers.size(); ++i) |
688 m_pluginLoadObservers[i]->clearPluginContainer(); | 690 m_pluginLoadObservers[i]->clearPluginContainer(); |
689 m_webPlugin->destroy(); | 691 m_webPlugin->destroy(); |
690 if (m_webLayer) | 692 if (m_webLayer) |
691 GraphicsLayer::unregisterContentsLayer(m_webLayer); | 693 GraphicsLayer::unregisterContentsLayer(m_webLayer); |
692 } | 694 } |
693 | 695 |
694 #if ENABLE(OILPAN) | 696 #if ENABLE(OILPAN) |
695 void WebPluginContainerImpl::detach() | 697 void WebPluginContainerImpl::detach() |
696 { | 698 { |
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
939 | 941 |
940 return clipRect; | 942 return clipRect; |
941 } | 943 } |
942 | 944 |
943 bool WebPluginContainerImpl::pluginShouldPersist() const | 945 bool WebPluginContainerImpl::pluginShouldPersist() const |
944 { | 946 { |
945 return m_webPlugin->shouldPersist(); | 947 return m_webPlugin->shouldPersist(); |
946 } | 948 } |
947 | 949 |
948 } // namespace blink | 950 } // namespace blink |
OLD | NEW |