Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(70)

Side by Side Diff: third_party/WebKit/Source/modules/presentation/PresentationConnection.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "modules/presentation/PresentationConnection.h" 5 #include "modules/presentation/PresentationConnection.h"
6 6
7 #include "bindings/core/v8/ScriptPromiseResolver.h" 7 #include "bindings/core/v8/ScriptPromiseResolver.h"
8 #include "core/dom/DOMArrayBuffer.h" 8 #include "core/dom/DOMArrayBuffer.h"
9 #include "core/dom/DOMArrayBufferView.h" 9 #include "core/dom/DOMArrayBufferView.h"
10 #include "core/dom/Document.h" 10 #include "core/dom/Document.h"
11 #include "core/dom/ExceptionCode.h" 11 #include "core/dom/ExceptionCode.h"
12 #include "core/events/Event.h" 12 #include "core/events/Event.h"
13 #include "core/events/MessageEvent.h" 13 #include "core/events/MessageEvent.h"
14 #include "core/fileapi/FileReaderLoader.h" 14 #include "core/fileapi/FileReaderLoader.h"
15 #include "core/fileapi/FileReaderLoaderClient.h" 15 #include "core/fileapi/FileReaderLoaderClient.h"
16 #include "core/frame/Deprecation.h" 16 #include "core/frame/Deprecation.h"
17 #include "core/frame/LocalFrame.h" 17 #include "core/frame/LocalFrame.h"
18 #include "core/frame/UseCounter.h" 18 #include "core/frame/UseCounter.h"
19 #include "modules/EventTargetModules.h" 19 #include "modules/EventTargetModules.h"
20 #include "modules/presentation/Presentation.h" 20 #include "modules/presentation/Presentation.h"
21 #include "modules/presentation/PresentationConnectionAvailableEvent.h" 21 #include "modules/presentation/PresentationConnectionAvailableEvent.h"
22 #include "modules/presentation/PresentationConnectionCloseEvent.h" 22 #include "modules/presentation/PresentationConnectionCloseEvent.h"
23 #include "modules/presentation/PresentationController.h" 23 #include "modules/presentation/PresentationController.h"
24 #include "modules/presentation/PresentationRequest.h" 24 #include "modules/presentation/PresentationRequest.h"
25 #include "public/platform/modules/presentation/WebPresentationConnectionClient.h " 25 #include "public/platform/modules/presentation/WebPresentationConnectionClient.h "
26 #include "wtf/Assertions.h" 26 #include "wtf/Assertions.h"
27 #include "wtf/OwnPtr.h"
28 #include "wtf/text/AtomicString.h" 27 #include "wtf/text/AtomicString.h"
28 #include <memory>
29 29
30 namespace blink { 30 namespace blink {
31 31
32 namespace { 32 namespace {
33 33
34 // TODO(mlamouri): refactor in one common place. 34 // TODO(mlamouri): refactor in one common place.
35 WebPresentationClient* presentationClient(ExecutionContext* executionContext) 35 WebPresentationClient* presentationClient(ExecutionContext* executionContext)
36 { 36 {
37 ASSERT(executionContext && executionContext->isDocument()); 37 ASSERT(executionContext && executionContext->isDocument());
38 38
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 , m_binaryType(BinaryTypeBlob) 164 , m_binaryType(BinaryTypeBlob)
165 { 165 {
166 } 166 }
167 167
168 PresentationConnection::~PresentationConnection() 168 PresentationConnection::~PresentationConnection()
169 { 169 {
170 ASSERT(!m_blobLoader); 170 ASSERT(!m_blobLoader);
171 } 171 }
172 172
173 // static 173 // static
174 PresentationConnection* PresentationConnection::take(ScriptPromiseResolver* reso lver, PassOwnPtr<WebPresentationConnectionClient> client, PresentationRequest* r equest) 174 PresentationConnection* PresentationConnection::take(ScriptPromiseResolver* reso lver, std::unique_ptr<WebPresentationConnectionClient> client, PresentationReque st* request)
175 { 175 {
176 ASSERT(resolver); 176 ASSERT(resolver);
177 ASSERT(client); 177 ASSERT(client);
178 ASSERT(request); 178 ASSERT(request);
179 ASSERT(resolver->getExecutionContext()->isDocument()); 179 ASSERT(resolver->getExecutionContext()->isDocument());
180 180
181 Document* document = toDocument(resolver->getExecutionContext()); 181 Document* document = toDocument(resolver->getExecutionContext());
182 if (!document->frame()) 182 if (!document->frame())
183 return nullptr; 183 return nullptr;
184 184
185 PresentationController* controller = PresentationController::from(*document- >frame()); 185 PresentationController* controller = PresentationController::from(*document- >frame());
186 if (!controller) 186 if (!controller)
187 return nullptr; 187 return nullptr;
188 188
189 return take(controller, std::move(client), request); 189 return take(controller, std::move(client), request);
190 } 190 }
191 191
192 // static 192 // static
193 PresentationConnection* PresentationConnection::take(PresentationController* con troller, PassOwnPtr<WebPresentationConnectionClient> client, PresentationRequest * request) 193 PresentationConnection* PresentationConnection::take(PresentationController* con troller, std::unique_ptr<WebPresentationConnectionClient> client, PresentationRe quest* request)
194 { 194 {
195 ASSERT(controller); 195 ASSERT(controller);
196 ASSERT(request); 196 ASSERT(request);
197 197
198 PresentationConnection* connection = new PresentationConnection(controller-> frame(), client->getId(), client->getUrl()); 198 PresentationConnection* connection = new PresentationConnection(controller-> frame(), client->getId(), client->getUrl());
199 controller->registerConnection(connection); 199 controller->registerConnection(connection);
200 request->dispatchEvent(PresentationConnectionAvailableEvent::create(EventTyp eNames::connectionavailable, connection)); 200 request->dispatchEvent(PresentationConnectionAvailableEvent::create(EventTyp eNames::connectionavailable, connection));
201 201
202 return connection; 202 return connection;
203 } 203 }
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 dispatchEvent(MessageEvent::create(message)); 348 dispatchEvent(MessageEvent::create(message));
349 } 349 }
350 350
351 void PresentationConnection::didReceiveBinaryMessage(const uint8_t* data, size_t length) 351 void PresentationConnection::didReceiveBinaryMessage(const uint8_t* data, size_t length)
352 { 352 {
353 if (m_state != WebPresentationConnectionState::Connected) 353 if (m_state != WebPresentationConnectionState::Connected)
354 return; 354 return;
355 355
356 switch (m_binaryType) { 356 switch (m_binaryType) {
357 case BinaryTypeBlob: { 357 case BinaryTypeBlob: {
358 OwnPtr<BlobData> blobData = BlobData::create(); 358 std::unique_ptr<BlobData> blobData = BlobData::create();
359 blobData->appendBytes(data, length); 359 blobData->appendBytes(data, length);
360 Blob* blob = Blob::create(BlobDataHandle::create(std::move(blobData), le ngth)); 360 Blob* blob = Blob::create(BlobDataHandle::create(std::move(blobData), le ngth));
361 dispatchEvent(MessageEvent::create(blob)); 361 dispatchEvent(MessageEvent::create(blob));
362 return; 362 return;
363 } 363 }
364 case BinaryTypeArrayBuffer: 364 case BinaryTypeArrayBuffer:
365 DOMArrayBuffer* buffer = DOMArrayBuffer::create(data, length); 365 DOMArrayBuffer* buffer = DOMArrayBuffer::create(data, length);
366 dispatchEvent(MessageEvent::create(buffer)); 366 dispatchEvent(MessageEvent::create(buffer));
367 return; 367 return;
368 } 368 }
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 { 453 {
454 // Cancel current Blob loading if any. 454 // Cancel current Blob loading if any.
455 if (m_blobLoader) { 455 if (m_blobLoader) {
456 m_blobLoader->cancel(); 456 m_blobLoader->cancel();
457 m_blobLoader.clear(); 457 m_blobLoader.clear();
458 } 458 }
459 m_messages.clear(); 459 m_messages.clear();
460 } 460 }
461 461
462 } // namespace blink 462 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698