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

Side by Side Diff: third_party/WebKit/Source/modules/speech/SpeechRecognitionController.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * * Redistributions of source code must retain the above copyright 7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright 9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "modules/speech/SpeechRecognitionController.h" 26 #include "modules/speech/SpeechRecognitionController.h"
27 27
28 #include <memory>
29
30 namespace blink { 28 namespace blink {
31 29
32 const char* SpeechRecognitionController::supplementName() 30 const char* SpeechRecognitionController::supplementName()
33 { 31 {
34 return "SpeechRecognitionController"; 32 return "SpeechRecognitionController";
35 } 33 }
36 34
37 SpeechRecognitionController::SpeechRecognitionController(std::unique_ptr<SpeechR ecognitionClient> client) 35 SpeechRecognitionController::SpeechRecognitionController(PassOwnPtr<SpeechRecogn itionClient> client)
38 : m_client(std::move(client)) 36 : m_client(std::move(client))
39 { 37 {
40 } 38 }
41 39
42 SpeechRecognitionController::~SpeechRecognitionController() 40 SpeechRecognitionController::~SpeechRecognitionController()
43 { 41 {
44 // FIXME: Call m_client->pageDestroyed(); once we have implemented a client. 42 // FIXME: Call m_client->pageDestroyed(); once we have implemented a client.
45 } 43 }
46 44
47 SpeechRecognitionController* SpeechRecognitionController::create(std::unique_ptr <SpeechRecognitionClient> client) 45 SpeechRecognitionController* SpeechRecognitionController::create(PassOwnPtr<Spee chRecognitionClient> client)
48 { 46 {
49 return new SpeechRecognitionController(std::move(client)); 47 return new SpeechRecognitionController(std::move(client));
50 } 48 }
51 49
52 void provideSpeechRecognitionTo(Page& page, std::unique_ptr<SpeechRecognitionCli ent> client) 50 void provideSpeechRecognitionTo(Page& page, PassOwnPtr<SpeechRecognitionClient> client)
53 { 51 {
54 SpeechRecognitionController::provideTo(page, SpeechRecognitionController::su pplementName(), SpeechRecognitionController::create(std::move(client))); 52 SpeechRecognitionController::provideTo(page, SpeechRecognitionController::su pplementName(), SpeechRecognitionController::create(std::move(client)));
55 } 53 }
56 54
57 } // namespace blink 55 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698