OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "config.h" | 5 #include "config.h" |
6 #include "modules/presentation/PresentationSession.h" | 6 #include "modules/presentation/PresentationSession.h" |
7 | 7 |
8 #include "core/dom/DOMArrayBuffer.h" | |
9 #include "core/dom/DOMArrayBufferView.h" | |
8 #include "core/dom/Document.h" | 10 #include "core/dom/Document.h" |
11 #include "core/dom/ExceptionCode.h" | |
9 #include "core/events/Event.h" | 12 #include "core/events/Event.h" |
10 #include "core/frame/LocalFrame.h" | 13 #include "core/frame/LocalFrame.h" |
11 #include "modules/EventTargetModules.h" | 14 #include "modules/EventTargetModules.h" |
12 #include "modules/presentation/Presentation.h" | 15 #include "modules/presentation/Presentation.h" |
13 #include "modules/presentation/PresentationController.h" | 16 #include "modules/presentation/PresentationController.h" |
14 #include "public/platform/modules/presentation/WebPresentationSessionClient.h" | 17 #include "public/platform/modules/presentation/WebPresentationSessionClient.h" |
15 #include "wtf/Assertions.h" | 18 #include "wtf/Assertions.h" |
16 #include "wtf/OwnPtr.h" | 19 #include "wtf/OwnPtr.h" |
17 #include "wtf/text/AtomicString.h" | 20 #include "wtf/text/AtomicString.h" |
18 | 21 |
(...skipping 10 matching lines...) Expand all Loading... | |
29 case WebPresentationSessionState::Connected: | 32 case WebPresentationSessionState::Connected: |
30 return connectedValue; | 33 return connectedValue; |
31 case WebPresentationSessionState::Disconnected: | 34 case WebPresentationSessionState::Disconnected: |
32 return disconnectedValue; | 35 return disconnectedValue; |
33 } | 36 } |
34 | 37 |
35 ASSERT_NOT_REACHED(); | 38 ASSERT_NOT_REACHED(); |
36 return disconnectedValue; | 39 return disconnectedValue; |
37 } | 40 } |
38 | 41 |
42 void throwPresentationDisconnectedError(ExceptionState& exceptionState) | |
43 { | |
44 exceptionState.throwDOMException(InvalidStateError, "Presentation session is disconnected."); | |
45 } | |
46 | |
39 } // namespace | 47 } // namespace |
40 | 48 |
41 PresentationSession::PresentationSession(LocalFrame* frame, const String& id, co nst String& url) | 49 PresentationSession::PresentationSession(LocalFrame* frame, const String& id, co nst String& url) |
42 : DOMWindowProperty(frame) | 50 : DOMWindowProperty(frame) |
43 , m_id(id) | 51 , m_id(id) |
44 , m_url(url) | 52 , m_url(url) |
45 , m_state(WebPresentationSessionState::Disconnected) | 53 , m_state(WebPresentationSessionState::Disconnected) |
46 { | 54 { |
47 } | 55 } |
48 | 56 |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
83 { | 91 { |
84 RefCountedGarbageCollectedEventTargetWithInlineData<PresentationSession>::tr ace(visitor); | 92 RefCountedGarbageCollectedEventTargetWithInlineData<PresentationSession>::tr ace(visitor); |
85 DOMWindowProperty::trace(visitor); | 93 DOMWindowProperty::trace(visitor); |
86 } | 94 } |
87 | 95 |
88 const AtomicString& PresentationSession::state() const | 96 const AtomicString& PresentationSession::state() const |
89 { | 97 { |
90 return SessionStateToString(m_state); | 98 return SessionStateToString(m_state); |
91 } | 99 } |
92 | 100 |
93 void PresentationSession::postMessage(const String& message) | 101 void PresentationSession::send(const String& message, ExceptionState& exceptionS tate) |
94 { | 102 { |
103 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.
| |
104 throwPresentationDisconnectedError(exceptionState); | |
105 return; | |
106 } | |
107 if (message.isNull() || message.isEmpty()) | |
108 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
| |
109 | |
110 PresentationController* controller = presentationController(); | |
111 if (controller) | |
112 controller->send(m_url, m_id, message); | |
113 } | |
114 | |
115 void PresentationSession::send(PassRefPtr<DOMArrayBuffer> data, ExceptionState& exceptionState) | |
116 { | |
117 ASSERT(data && data->buffer()); | |
118 sendInternal(static_cast<const char*>(data->data()), data->byteLength(), exc eptionState); | |
119 } | |
120 | |
121 void PresentationSession::send(PassRefPtr<DOMArrayBufferView> data, ExceptionSta te& exceptionState) | |
122 { | |
123 ASSERT(data); | |
124 sendInternal(static_cast<const char*>(data->baseAddress()), data->byteLength (), exceptionState); | |
125 } | |
126 | |
127 void PresentationSession::sendInternal(const char* data, size_t size, ExceptionS tate& exceptionState) | |
128 { | |
129 ASSERT(data); | |
130 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.
| |
131 throwPresentationDisconnectedError(exceptionState); | |
132 return; | |
133 } | |
134 if (!size) | |
135 return; | |
136 | |
137 PresentationController* controller = presentationController(); | |
138 if (controller) | |
139 controller->send(m_url, m_id, data, size); | |
95 } | 140 } |
96 | 141 |
97 void PresentationSession::close() | 142 void PresentationSession::close() |
98 { | 143 { |
99 if (m_state != WebPresentationSessionState::Connected) | 144 if (m_state != WebPresentationSessionState::Connected) |
100 return; | 145 return; |
101 PresentationController* controller = presentationController(); | 146 PresentationController* controller = presentationController(); |
102 if (controller) | 147 if (controller) |
103 controller->closeSession(m_url, m_id); | 148 controller->closeSession(m_url, m_id); |
104 } | 149 } |
(...skipping 13 matching lines...) Expand all Loading... | |
118 } | 163 } |
119 | 164 |
120 PresentationController* PresentationSession::presentationController() | 165 PresentationController* PresentationSession::presentationController() |
121 { | 166 { |
122 if (!frame()) | 167 if (!frame()) |
123 return nullptr; | 168 return nullptr; |
124 return PresentationController::from(*frame()); | 169 return PresentationController::from(*frame()); |
125 } | 170 } |
126 | 171 |
127 } // namespace blink | 172 } // namespace blink |
OLD | NEW |