| 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 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 } | 172 } |
| 173 | 173 |
| 174 void PluginDocument::cancelManualPluginLoad() | 174 void PluginDocument::cancelManualPluginLoad() |
| 175 { | 175 { |
| 176 // PluginDocument::cancelManualPluginLoad should only be called once, but th
ere are issues | 176 // PluginDocument::cancelManualPluginLoad should only be called once, but th
ere are issues |
| 177 // with how many times we call beforeload on object elements. <rdar://proble
m/8441094>. | 177 // with how many times we call beforeload on object elements. <rdar://proble
m/8441094>. |
| 178 if (!shouldLoadPluginManually()) | 178 if (!shouldLoadPluginManually()) |
| 179 return; | 179 return; |
| 180 | 180 |
| 181 DocumentLoader* documentLoader = frame()->loader()->activeDocumentLoader(); | 181 DocumentLoader* documentLoader = frame()->loader()->activeDocumentLoader(); |
| 182 documentLoader->cancelMainResourceLoad(frame()->loader()->cancelledError(doc
umentLoader->request())); | 182 documentLoader->cancelMainResourceLoad(ResourceError::cancelledError(documen
tLoader->request().url())); |
| 183 setShouldLoadPluginManually(false); | 183 setShouldLoadPluginManually(false); |
| 184 } | 184 } |
| 185 | 185 |
| 186 } | 186 } |
| OLD | NEW |