| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google, Inc. All Rights Reserved. | 2 * Copyright (C) 2010 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 | 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 |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "core/dom/PendingScript.h" | 26 #include "core/dom/PendingScript.h" |
| 27 | 27 |
| 28 #include "bindings/core/v8/ScriptSourceCode.h" | 28 #include "bindings/core/v8/ScriptSourceCode.h" |
| 29 #include "core/dom/ClassicScript.h" |
| 29 #include "core/dom/ScriptElementBase.h" | 30 #include "core/dom/ScriptElementBase.h" |
| 30 #include "core/frame/SubresourceIntegrity.h" | 31 #include "core/frame/SubresourceIntegrity.h" |
| 31 #include "platform/SharedBuffer.h" | 32 #include "platform/SharedBuffer.h" |
| 32 #include "wtf/CurrentTime.h" | 33 #include "wtf/CurrentTime.h" |
| 33 | 34 |
| 34 namespace blink { | 35 namespace blink { |
| 35 | 36 |
| 36 PendingScript* PendingScript::create(ScriptElementBase* element, | 37 PendingScript* PendingScript::create(ScriptElementBase* element, |
| 37 ScriptResource* resource) { | 38 ScriptResource* resource) { |
| 38 return new PendingScript(element, resource, TextPosition()); | 39 return new PendingScript(element, resource, TextPosition()); |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 } | 219 } |
| 219 | 220 |
| 220 DEFINE_TRACE(PendingScript) { | 221 DEFINE_TRACE(PendingScript) { |
| 221 visitor->trace(m_element); | 222 visitor->trace(m_element); |
| 222 visitor->trace(m_streamer); | 223 visitor->trace(m_streamer); |
| 223 visitor->trace(m_client); | 224 visitor->trace(m_client); |
| 224 ResourceOwner<ScriptResource>::trace(visitor); | 225 ResourceOwner<ScriptResource>::trace(visitor); |
| 225 MemoryCoordinatorClient::trace(visitor); | 226 MemoryCoordinatorClient::trace(visitor); |
| 226 } | 227 } |
| 227 | 228 |
| 228 ScriptSourceCode PendingScript::getSource(const KURL& documentURL, | 229 ClassicScript* PendingScript::getSource(const KURL& documentURL, |
| 229 bool& errorOccurred) const { | 230 bool& errorOccurred) const { |
| 230 checkState(); | 231 checkState(); |
| 231 | 232 |
| 232 errorOccurred = this->errorOccurred(); | 233 errorOccurred = this->errorOccurred(); |
| 233 if (resource()) { | 234 if (resource()) { |
| 234 DCHECK(resource()->isLoaded()); | 235 DCHECK(resource()->isLoaded()); |
| 235 if (m_streamer && !m_streamer->streamingSuppressed()) | 236 if (m_streamer && !m_streamer->streamingSuppressed()) |
| 236 return ScriptSourceCode(m_streamer, resource()); | 237 return ClassicScript::create(ScriptSourceCode(m_streamer, resource())); |
| 237 return ScriptSourceCode(resource()); | 238 return ClassicScript::create(ScriptSourceCode(resource())); |
| 238 } | 239 } |
| 239 | 240 |
| 240 return ScriptSourceCode(m_element->textContent(), documentURL, | 241 return ClassicScript::create(ScriptSourceCode( |
| 241 startingPosition()); | 242 m_element->textContent(), documentURL, startingPosition())); |
| 242 } | 243 } |
| 243 | 244 |
| 244 void PendingScript::setStreamer(ScriptStreamer* streamer) { | 245 void PendingScript::setStreamer(ScriptStreamer* streamer) { |
| 245 DCHECK(!m_streamer); | 246 DCHECK(!m_streamer); |
| 246 DCHECK(!m_watchingForLoad); | 247 DCHECK(!m_watchingForLoad); |
| 247 m_streamer = streamer; | 248 m_streamer = streamer; |
| 248 checkState(); | 249 checkState(); |
| 249 } | 250 } |
| 250 | 251 |
| 251 bool PendingScript::isReady() const { | 252 bool PendingScript::isReady() const { |
| (...skipping 15 matching lines...) Expand all Loading... |
| 267 | 268 |
| 268 void PendingScript::onPurgeMemory() { | 269 void PendingScript::onPurgeMemory() { |
| 269 checkState(); | 270 checkState(); |
| 270 if (!m_streamer) | 271 if (!m_streamer) |
| 271 return; | 272 return; |
| 272 m_streamer->cancel(); | 273 m_streamer->cancel(); |
| 273 m_streamer = nullptr; | 274 m_streamer = nullptr; |
| 274 } | 275 } |
| 275 | 276 |
| 276 } // namespace blink | 277 } // namespace blink |
| OLD | NEW |