Chromium Code Reviews| 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 "config.h" | 26 #include "config.h" |
| 27 #include "core/dom/PendingScript.h" | 27 #include "core/dom/PendingScript.h" |
| 28 | 28 |
| 29 #include "bindings/core/v8/V8ScriptStreamer.h" | |
| 29 #include "core/dom/Element.h" | 30 #include "core/dom/Element.h" |
| 30 #include "core/fetch/ScriptResource.h" | 31 #include "core/fetch/ScriptResource.h" |
| 31 | 32 |
| 32 namespace blink { | 33 namespace blink { |
| 33 | 34 |
| 34 PendingScript::~PendingScript() | 35 PendingScript::~PendingScript() |
| 35 { | 36 { |
| 37 if (m_streamer) | |
| 38 m_streamer->cancel(); | |
|
haraken
2014/08/17 16:05:28
Doing something non-trivial in a destructor is lik
marja
2014/08/20 11:45:56
This code turned out to be unnecessary after I ref
| |
| 36 } | 39 } |
| 37 | 40 |
| 38 PassRefPtrWillBeRawPtr<Element> PendingScript::releaseElementAndClear() | 41 PassRefPtrWillBeRawPtr<Element> PendingScript::releaseElementAndClear() |
| 39 { | 42 { |
| 40 setScriptResource(0); | 43 setScriptResource(0); |
| 41 m_watchingForLoad = false; | 44 m_watchingForLoad = false; |
| 42 m_startingPosition = TextPosition::belowRangePosition(); | 45 m_startingPosition = TextPosition::belowRangePosition(); |
| 43 return m_element.release(); | 46 return m_element.release(); |
| 44 } | 47 } |
| 45 | 48 |
| 46 void PendingScript::setScriptResource(ScriptResource* resource) | 49 void PendingScript::setScriptResource(ScriptResource* resource) |
| 47 { | 50 { |
| 51 ASSERT(!m_streamer); | |
| 48 setResource(resource); | 52 setResource(resource); |
| 49 } | 53 } |
| 50 | 54 |
| 51 void PendingScript::notifyFinished(Resource*) | 55 void PendingScript::notifyFinished(Resource*) |
| 52 { | 56 { |
| 57 if (m_streamer) { | |
| 58 m_streamer->notifyFinished(); | |
| 59 } | |
| 60 } | |
| 61 | |
| 62 void PendingScript::notifyAppendData(ScriptResource*) | |
| 63 { | |
| 64 if (m_streamer) { | |
| 65 m_streamer->notifyAppendData(); | |
| 66 } | |
| 53 } | 67 } |
| 54 | 68 |
| 55 void PendingScript::trace(Visitor* visitor) | 69 void PendingScript::trace(Visitor* visitor) |
| 56 { | 70 { |
| 57 visitor->trace(m_element); | 71 visitor->trace(m_element); |
| 58 } | 72 } |
| 59 | 73 |
| 74 bool PendingScript::isStreaming() const | |
| 75 { | |
| 76 return m_streamer && m_streamer->streamingInProgress(); | |
| 60 } | 77 } |
| 78 | |
| 79 } | |
| OLD | NEW |