Index: third_party/WebKit/Source/modules/presentation/PresentationConnection.h |
diff --git a/third_party/WebKit/Source/modules/presentation/PresentationConnection.h b/third_party/WebKit/Source/modules/presentation/PresentationConnection.h |
index 323c6a38f42c7c8e9b28cb3241ff5f630d0f2e07..a1a4119a54be00a03932f57a2018ff24b88b735e 100644 |
--- a/third_party/WebKit/Source/modules/presentation/PresentationConnection.h |
+++ b/third_party/WebKit/Source/modules/presentation/PresentationConnection.h |
@@ -11,7 +11,9 @@ |
#include "core/frame/DOMWindowProperty.h" |
#include "platform/heap/Handle.h" |
#include "platform/weborigin/KURL.h" |
+#include "public/platform/modules/presentation/WebPresentationConnection.h" |
#include "public/platform/modules/presentation/WebPresentationConnectionClient.h" |
+#include "public/platform/modules/presentation/WebPresentationConnectionProxy.h" |
#include "wtf/text/WTFString.h" |
#include <memory> |
@@ -28,7 +30,8 @@ class PresentationReceiver; |
class PresentationRequest; |
class PresentationConnection final : public EventTargetWithInlineData, |
- public DOMWindowProperty { |
+ public DOMWindowProperty, |
+ public WebPresentationConnection { |
USING_GARBAGE_COLLECTED_MIXIN(PresentationConnection); |
DEFINE_WRAPPERTYPEINFO(); |
@@ -84,8 +87,8 @@ class PresentationConnection final : public EventTargetWithInlineData, |
void didClose(WebPresentationConnectionCloseReason, const String& message); |
// Notifies the presentation about new message. |
- void didReceiveTextMessage(const String& message); |
- void didReceiveBinaryMessage(const uint8_t* data, size_t length); |
+ void didReceiveTextMessage(const WebString& message) override; |
+ void didReceiveBinaryMessage(const uint8_t* data, size_t length) override; |
protected: |
// EventTarget implementation. |
@@ -106,6 +109,8 @@ class PresentationConnection final : public EventTargetWithInlineData, |
class Message; |
PresentationConnection(LocalFrame*, const String& id, const KURL&); |
+ void SetPresentationConnectionProxy( |
+ std::unique_ptr<WebPresentationConnectionProxy>); |
bool canSendMessage(ExceptionState&); |
void handleMessageQueue(); |
@@ -126,6 +131,8 @@ class PresentationConnection final : public EventTargetWithInlineData, |
HeapDeque<Member<Message>> m_messages; |
BinaryType m_binaryType; |
+ |
+ std::unique_ptr<WebPresentationConnectionProxy> m_proxy; |
}; |
} // namespace blink |