Commit 8956631b authored by zhuoyu.qian's avatar zhuoyu.qian Committed by Commit Bot

Rename ReadableStreamController to ReadableStreamDefaultControllerWrapper

As the comment in ReadableStreamController.h by tyoshino@, rename
ReadableStreamController to ReadableStreamDefaultControllerWrapper,
and related class. Rename the files also.

BUG=
R=tyoshino@chromium.org
Signed-off-by: default avatarzhuoyu.qian <zhuoyu.qian@samsung.com>
Change-Id: I5064095c31540547d3ff21c5ffda7ab20c182e90
Reviewed-on: https://chromium-review.googlesource.com/737310
Commit-Queue: srirama chandra sekhar <srirama.m@samsung.com>
Reviewed-by: default avatarTakeshi Yoshino <tyoshino@chromium.org>
Cr-Commit-Position: refs/heads/master@{#517374}
parent 644e22dc
...@@ -6,7 +6,7 @@ import("//third_party/WebKit/Source/core/core.gni") ...@@ -6,7 +6,7 @@ import("//third_party/WebKit/Source/core/core.gni")
blink_core_sources("streams") { blink_core_sources("streams") {
sources = [ sources = [
"ReadableStreamController.h", "ReadableStreamDefaultControllerWrapper.h",
"ReadableStreamOperations.cpp", "ReadableStreamOperations.cpp",
"ReadableStreamOperations.h", "ReadableStreamOperations.h",
"UnderlyingSourceBase.cpp", "UnderlyingSourceBase.cpp",
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef ReadableStreamController_h #ifndef ReadableStreamDefaultControllerWrapper_h
#define ReadableStreamController_h #define ReadableStreamDefaultControllerWrapper_h
#include "base/memory/scoped_refptr.h" #include "base/memory/scoped_refptr.h"
#include "bindings/core/v8/ScriptValue.h" #include "bindings/core/v8/ScriptValue.h"
...@@ -16,22 +16,21 @@ ...@@ -16,22 +16,21 @@
namespace blink { namespace blink {
// TODO(tyoshino): Rename this to ReadableStreamDefaultControllerWrapper. class CORE_EXPORT ReadableStreamDefaultControllerWrapper final
class CORE_EXPORT ReadableStreamController final : public GarbageCollectedFinalized<ReadableStreamDefaultControllerWrapper> {
: public GarbageCollectedFinalized<ReadableStreamController> {
public: public:
void Trace(blink::Visitor* visitor) {} void Trace(blink::Visitor* visitor) {}
explicit ReadableStreamController(ScriptValue controller) explicit ReadableStreamDefaultControllerWrapper(ScriptValue controller)
: script_state_(controller.GetScriptState()), : script_state_(controller.GetScriptState()),
js_controller_(controller.GetIsolate(), controller.V8Value()) { js_controller_(controller.GetIsolate(), controller.V8Value()) {
js_controller_.SetPhantom(); js_controller_.SetPhantom();
} }
// Users of the ReadableStreamController can call this to note that the stream // Users of the ReadableStreamDefaultControllerWrapper can call this to note
// has been canceled and thus they don't anticipate using the // that the stream has been canceled and thus they don't anticipate using the
// ReadableStreamController anymore. (close/desiredSize/enqueue/error will // ReadableStreamDefaultControllerWrapper anymore.
// become no-ops afterward.) // (close/desiredSize/enqueue/error will become no-ops afterward.)
void NoteHasBeenCanceled() { js_controller_.Clear(); } void NoteHasBeenCanceled() { js_controller_.Clear(); }
bool IsActive() const { return !js_controller_.IsEmpty(); } bool IsActive() const { return !js_controller_.IsEmpty(); }
...@@ -118,4 +117,4 @@ class CORE_EXPORT ReadableStreamController final ...@@ -118,4 +117,4 @@ class CORE_EXPORT ReadableStreamController final
} // namespace blink } // namespace blink
#endif // ReadableStreamController_h #endif // ReadableStreamDefaultControllerWrapper_h
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "bindings/core/v8/V8BindingForTesting.h" #include "bindings/core/v8/V8BindingForTesting.h"
#include "bindings/core/v8/V8IteratorResultValue.h" #include "bindings/core/v8/V8IteratorResultValue.h"
#include "core/dom/Document.h" #include "core/dom/Document.h"
#include "core/streams/ReadableStreamController.h" #include "core/streams/ReadableStreamDefaultControllerWrapper.h"
#include "core/streams/UnderlyingSourceBase.h" #include "core/streams/UnderlyingSourceBase.h"
#include "platform/bindings/ScriptState.h" #include "platform/bindings/ScriptState.h"
#include "platform/bindings/V8BindingMacros.h" #include "platform/bindings/V8BindingMacros.h"
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include "bindings/core/v8/ScriptPromise.h" #include "bindings/core/v8/ScriptPromise.h"
#include "bindings/core/v8/ScriptValue.h" #include "bindings/core/v8/ScriptValue.h"
#include "core/streams/ReadableStreamController.h" #include "core/streams/ReadableStreamDefaultControllerWrapper.h"
#include "platform/bindings/ScriptState.h" #include "platform/bindings/ScriptState.h"
#include "v8/include/v8.h" #include "v8/include/v8.h"
...@@ -18,7 +18,7 @@ ScriptPromise UnderlyingSourceBase::startWrapper(ScriptState* script_state, ...@@ -18,7 +18,7 @@ ScriptPromise UnderlyingSourceBase::startWrapper(ScriptState* script_state,
// construct multiple streams). // construct multiple streams).
DCHECK(!controller_); DCHECK(!controller_);
controller_ = new ReadableStreamController(js_controller); controller_ = new ReadableStreamDefaultControllerWrapper(js_controller);
return Start(script_state); return Start(script_state);
} }
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
namespace blink { namespace blink {
class ReadableStreamController; class ReadableStreamDefaultControllerWrapper;
class CORE_EXPORT UnderlyingSourceBase class CORE_EXPORT UnderlyingSourceBase
: public ScriptWrappable, : public ScriptWrappable,
...@@ -52,10 +52,12 @@ class CORE_EXPORT UnderlyingSourceBase ...@@ -52,10 +52,12 @@ class CORE_EXPORT UnderlyingSourceBase
explicit UnderlyingSourceBase(ScriptState* script_state) explicit UnderlyingSourceBase(ScriptState* script_state)
: ContextLifecycleObserver(ExecutionContext::From(script_state)) {} : ContextLifecycleObserver(ExecutionContext::From(script_state)) {}
ReadableStreamController* Controller() const { return controller_; } ReadableStreamDefaultControllerWrapper* Controller() const {
return controller_;
}
private: private:
Member<ReadableStreamController> controller_; Member<ReadableStreamDefaultControllerWrapper> controller_;
bool is_stream_locked_ = false; bool is_stream_locked_ = false;
}; };
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "bindings/core/v8/ExceptionState.h" #include "bindings/core/v8/ExceptionState.h"
#include "core/dom/ExceptionCode.h" #include "core/dom/ExceptionCode.h"
#include "core/dom/ExecutionContext.h" #include "core/dom/ExecutionContext.h"
#include "core/streams/ReadableStreamController.h" #include "core/streams/ReadableStreamDefaultControllerWrapper.h"
#include "core/streams/ReadableStreamOperations.h" #include "core/streams/ReadableStreamOperations.h"
#include "core/typed_arrays/DOMArrayBuffer.h" #include "core/typed_arrays/DOMArrayBuffer.h"
#include "core/typed_arrays/DOMTypedArray.h" #include "core/typed_arrays/DOMTypedArray.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment