| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 delete this; | 92 delete this; |
| 93 } | 93 } |
| 94 | 94 |
| 95 void WebHelperPluginImpl::destroy() | 95 void WebHelperPluginImpl::destroy() |
| 96 { | 96 { |
| 97 // Defer deletion so we don't do too much work when called via stopActiveDOM
Objects(). | 97 // Defer deletion so we don't do too much work when called via stopActiveDOM
Objects(). |
| 98 // FIXME: It's not clear why we still need this. The original code held a Pa
ge and a | 98 // FIXME: It's not clear why we still need this. The original code held a Pa
ge and a |
| 99 // WebFrame, and destroying it would cause JavaScript triggered by frame det
ach to run, | 99 // WebFrame, and destroying it would cause JavaScript triggered by frame det
ach to run, |
| 100 // which isn't allowed inside stopActiveDOMObjects(). Removing this causes o
ne Chrome test | 100 // which isn't allowed inside stopActiveDOMObjects(). Removing this causes o
ne Chrome test |
| 101 // to fail with a timeout. | 101 // to fail with a timeout. |
| 102 m_destructionTimer.startOneShot(0); | 102 m_destructionTimer.startOneShot(0, FROM_HERE); |
| 103 } | 103 } |
| 104 | 104 |
| 105 WebPlugin* WebHelperPluginImpl::getPlugin() | 105 WebPlugin* WebHelperPluginImpl::getPlugin() |
| 106 { | 106 { |
| 107 ASSERT(m_pluginContainer); | 107 ASSERT(m_pluginContainer); |
| 108 ASSERT(m_pluginContainer->plugin()); | 108 ASSERT(m_pluginContainer->plugin()); |
| 109 return m_pluginContainer->plugin(); | 109 return m_pluginContainer->plugin(); |
| 110 } | 110 } |
| 111 | 111 |
| 112 } // namespace blink | 112 } // namespace blink |
| OLD | NEW |