Chromium Code Reviews| Index: Source/modules/presentation/PresentationSession.cpp |
| diff --git a/Source/modules/presentation/PresentationSession.cpp b/Source/modules/presentation/PresentationSession.cpp |
| index 47ba6253b3d33c471419808f6e6918b48f272bdd..4e3733f4c69f48b3236962fd05494f0fa90e0e49 100644 |
| --- a/Source/modules/presentation/PresentationSession.cpp |
| +++ b/Source/modules/presentation/PresentationSession.cpp |
| @@ -5,7 +5,10 @@ |
| #include "config.h" |
| #include "modules/presentation/PresentationSession.h" |
| +#include "core/dom/DOMArrayBuffer.h" |
| +#include "core/dom/DOMArrayBufferView.h" |
| #include "core/dom/Document.h" |
| +#include "core/dom/ExceptionCode.h" |
| #include "core/events/Event.h" |
| #include "core/frame/LocalFrame.h" |
| #include "modules/EventTargetModules.h" |
| @@ -36,6 +39,11 @@ const AtomicString& SessionStateToString(WebPresentationSessionState state) |
| return disconnectedValue; |
| } |
| +void throwPresentationDisconnectedError(ExceptionState& exceptionState) |
| +{ |
| + exceptionState.throwDOMException(InvalidStateError, "Presentation session is disconnected."); |
| +} |
| + |
| } // namespace |
| PresentationSession::PresentationSession(LocalFrame* frame, const String& id, const String& url) |
| @@ -90,8 +98,45 @@ const AtomicString& PresentationSession::state() const |
| return SessionStateToString(m_state); |
| } |
| -void PresentationSession::postMessage(const String& message) |
| +void PresentationSession::send(const String& message, ExceptionState& exceptionState) |
| +{ |
| + if (m_state != WebPresentationSessionState::Connected) { |
|
mlamouri (slow - plz ping)
2015/04/16 10:06:30
In order to follow the specification, could you do
USE s.singapati at gmail.com
2015/04/16 16:10:01
Done.
|
| + throwPresentationDisconnectedError(exceptionState); |
| + return; |
| + } |
| + if (message.isNull() || message.isEmpty()) |
| + return; |
|
mlamouri (slow - plz ping)
2015/04/16 10:06:30
Why are you doing that check? If someone wants to
USE s.singapati at gmail.com
2015/04/16 16:10:02
Done. What about byteLength() for ArrayBuffer/View
mlamouri (slow - plz ping)
2015/04/16 17:14:17
Indeed.
whywhat
2015/04/16 17:29:44
Because that's how WebRTC DataChannel works in Chr
|
| + |
| + PresentationController* controller = presentationController(); |
| + if (controller) |
| + controller->send(m_url, m_id, message); |
| +} |
| + |
| +void PresentationSession::send(PassRefPtr<DOMArrayBuffer> data, ExceptionState& exceptionState) |
| { |
| + ASSERT(data && data->buffer()); |
| + sendInternal(static_cast<const char*>(data->data()), data->byteLength(), exceptionState); |
| +} |
| + |
| +void PresentationSession::send(PassRefPtr<DOMArrayBufferView> data, ExceptionState& exceptionState) |
| +{ |
| + ASSERT(data); |
| + sendInternal(static_cast<const char*>(data->baseAddress()), data->byteLength(), exceptionState); |
| +} |
| + |
| +void PresentationSession::sendInternal(const char* data, size_t size, ExceptionState& exceptionState) |
| +{ |
| + ASSERT(data); |
| + if (m_state != WebPresentationSessionState::Connected) { |
|
mlamouri (slow - plz ping)
2015/04/16 10:06:30
ditto: use == Disconnected
USE s.singapati at gmail.com
2015/04/16 16:10:02
Done.
|
| + throwPresentationDisconnectedError(exceptionState); |
| + return; |
| + } |
| + if (!size) |
| + return; |
| + |
| + PresentationController* controller = presentationController(); |
| + if (controller) |
| + controller->send(m_url, m_id, data, size); |
| } |
| void PresentationSession::close() |