| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2008 Apple 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 return m_pluginNode.get(); | 175 return m_pluginNode.get(); |
| 176 } | 176 } |
| 177 | 177 |
| 178 void PluginDocument::detach(const AttachContext& context) | 178 void PluginDocument::detach(const AttachContext& context) |
| 179 { | 179 { |
| 180 // Release the plugin node so that we don't have a circular reference. | 180 // Release the plugin node so that we don't have a circular reference. |
| 181 m_pluginNode = nullptr; | 181 m_pluginNode = nullptr; |
| 182 HTMLDocument::detach(context); | 182 HTMLDocument::detach(context); |
| 183 } | 183 } |
| 184 | 184 |
| 185 void PluginDocument::cancelManualPluginLoad() | |
| 186 { | |
| 187 // PluginDocument::cancelManualPluginLoad should only be called once, but th
ere are issues | |
| 188 // with how many times we call beforeload on object elements. <rdar://proble
m/8441094>. | |
| 189 if (!shouldLoadPluginManually()) | |
| 190 return; | |
| 191 | |
| 192 DocumentLoader* documentLoader = frame()->loader().documentLoader(); | |
| 193 documentLoader->cancelMainResourceLoad(ResourceError::cancelledError(documen
tLoader->request().url())); | |
| 194 setShouldLoadPluginManually(false); | |
| 195 } | 185 } |
| 196 | |
| 197 } | |
| OLD | NEW |