Index: third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp |
diff --git a/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp b/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp |
index 8a008b845029155eff9d61c4cc38b02ebac3e705..6a3848049fe9ddccdec55282ae44ddcdfb3e795d 100644 |
--- a/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp |
+++ b/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp |
@@ -30,10 +30,13 @@ |
#include "modules/websockets/DOMWebSocket.h" |
+#include "bindings/core/v8/CallbackPromiseAdapter.h" |
#include "bindings/core/v8/ExceptionState.h" |
#include "bindings/core/v8/ScriptController.h" |
#include "bindings/core/v8/SourceLocation.h" |
#include "bindings/modules/v8/StringOrStringSequence.h" |
+#include "bindings/core/v8/ScriptPromiseResolver.h" |
+#include "bindings/modules/v8/UnionTypesModules.h" |
#include "core/dom/DOMArrayBuffer.h" |
#include "core/dom/DOMArrayBufferView.h" |
#include "core/dom/Document.h" |
@@ -56,6 +59,7 @@ |
#include "platform/weborigin/SecurityOrigin.h" |
#include "public/platform/Platform.h" |
#include "public/platform/WebInsecureRequestPolicy.h" |
+#include "public/platform/modules/websockets/WebSocketHandle.h" |
#include "wtf/Assertions.h" |
#include "wtf/HashSet.h" |
#include "wtf/PassOwnPtr.h" |
@@ -713,6 +717,30 @@ void DOMWebSocket::recordReceiveTypeHistogram(WebSocketReceiveType type) |
receiveTypeHistogram.count(type); |
} |
+ScriptPromise DOMWebSocket::loaderTestTransmitChromiumIPC(ScriptState* scriptState, int bucketSize, int bufferSize, int totalSize) |
+{ |
+ ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState); |
+ ScriptPromise promise = resolver->promise(); |
+ if (m_channel) { |
+ m_channel->loaderTestTransmit(WebSocketHandle::ViaChromiumIPC, false, bucketSize, bufferSize, totalSize, new CallbackPromiseAdapter<int, void>(resolver)); |
+ } else { |
+ resolver->reject("channel is null"); |
+ } |
+ return promise; |
+} |
+ |
+ScriptPromise DOMWebSocket::loaderTestTransmitMojo(ScriptState* scriptState, int bucketSize, int bufferSize, int totalSize) |
+{ |
+ ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState); |
+ ScriptPromise promise = resolver->promise(); |
+ if (m_channel) { |
+ m_channel->loaderTestTransmit(WebSocketHandle::ViaMojo, false, bucketSize, bufferSize, totalSize, new CallbackPromiseAdapter<int, void>(resolver)); |
+ } else { |
+ resolver->reject("channel is null"); |
+ } |
+ return promise; |
+} |
+ |
DEFINE_TRACE(DOMWebSocket) |
{ |
visitor->trace(m_channel); |