| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "core/streams/UnderlyingSourceBase.h" | 5 #include "core/streams/UnderlyingSourceBase.h" |
| 6 | 6 |
| 7 #include "bindings/core/v8/ScriptPromise.h" | 7 #include "bindings/core/v8/ScriptPromise.h" |
| 8 #include "bindings/core/v8/ScriptState.h" | 8 #include "bindings/core/v8/ScriptState.h" |
| 9 #include "bindings/core/v8/ScriptValue.h" | 9 #include "bindings/core/v8/ScriptValue.h" |
| 10 #include "core/streams/ReadableStreamController.h" | 10 #include "core/streams/ReadableStreamController.h" |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 { | 60 { |
| 61 // This will return false within a finite time period _assuming_ that | 61 // This will return false within a finite time period _assuming_ that |
| 62 // consumers use the controller to close or error the stream. | 62 // consumers use the controller to close or error the stream. |
| 63 // Browser-created readable streams should always close or error within a | 63 // Browser-created readable streams should always close or error within a |
| 64 // finite time period, due to timeouts etc. | 64 // finite time period, due to timeouts etc. |
| 65 return m_controller && m_controller->isActive() && m_isStreamLocked; | 65 return m_controller && m_controller->isActive() && m_isStreamLocked; |
| 66 } | 66 } |
| 67 | 67 |
| 68 void UnderlyingSourceBase::stop() | 68 void UnderlyingSourceBase::stop() |
| 69 { | 69 { |
| 70 m_controller->noteHasBeenCanceled(); | 70 if (m_controller) { |
| 71 m_controller.clear(); | 71 m_controller->noteHasBeenCanceled(); |
| 72 m_controller.clear(); |
| 73 } |
| 72 } | 74 } |
| 73 | 75 |
| 74 DEFINE_TRACE(UnderlyingSourceBase) | 76 DEFINE_TRACE(UnderlyingSourceBase) |
| 75 { | 77 { |
| 76 ActiveDOMObject::trace(visitor); | 78 ActiveDOMObject::trace(visitor); |
| 77 visitor->trace(m_controller); | 79 visitor->trace(m_controller); |
| 78 } | 80 } |
| 79 | 81 |
| 80 } // namespace blink | 82 } // namespace blink |
| OLD | NEW |