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

Side by Side Diff: Source/core/speech/SpeechInput.cpp

Issue 219273002: Use OwnPtr|PassOwnPtr to pass a pointer of SpeechInputClient (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 8 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
« no previous file with comments | « Source/core/speech/SpeechInput.h ('k') | Source/core/speech/SpeechInputClient.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 20 matching lines...) Expand all
31 #include "config.h" 31 #include "config.h"
32 #include "core/speech/SpeechInput.h" 32 #include "core/speech/SpeechInput.h"
33 33
34 #if ENABLE(INPUT_SPEECH) 34 #if ENABLE(INPUT_SPEECH)
35 35
36 #include "core/speech/SpeechInputClient.h" 36 #include "core/speech/SpeechInputClient.h"
37 #include "wtf/PassOwnPtr.h" 37 #include "wtf/PassOwnPtr.h"
38 38
39 namespace WebCore { 39 namespace WebCore {
40 40
41 SpeechInput::SpeechInput(SpeechInputClient* client) 41 SpeechInput::SpeechInput(PassOwnPtr<SpeechInputClient> client)
42 : m_client(client) 42 : m_client(client)
43 , m_nextListenerId(1) 43 , m_nextListenerId(1)
44 { 44 {
45 m_client->setListener(this); 45 m_client->setListener(this);
46 } 46 }
47 47
48 SpeechInput::~SpeechInput() 48 SpeechInput::~SpeechInput()
49 { 49 {
50 m_client->setListener(0); 50 m_client->setListener(0);
51 } 51 }
52 52
53 PassOwnPtr<SpeechInput> SpeechInput::create(SpeechInputClient* client) 53 PassOwnPtr<SpeechInput> SpeechInput::create(PassOwnPtr<SpeechInputClient> client )
54 { 54 {
55 return adoptPtr(new SpeechInput(client)); 55 return adoptPtr(new SpeechInput(client));
56 } 56 }
57 57
58 int SpeechInput::registerListener(SpeechInputListener* listener) 58 int SpeechInput::registerListener(SpeechInputListener* listener)
59 { 59 {
60 #if defined(DEBUG) 60 #if defined(DEBUG)
61 // Check if already present. 61 // Check if already present.
62 for (HashMap<int, SpeechInputListener*>::iterator it = m_listeners.begin(); it != m_listeners.end(); ++it) 62 for (HashMap<int, SpeechInputListener*>::iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
63 ASSERT(it->value != listener); 63 ASSERT(it->value != listener);
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 { 113 {
114 ASSERT(m_listeners.contains(listenerId)); 114 ASSERT(m_listeners.contains(listenerId));
115 m_client->cancelRecognition(listenerId); 115 m_client->cancelRecognition(listenerId);
116 } 116 }
117 117
118 const char* SpeechInput::supplementName() 118 const char* SpeechInput::supplementName()
119 { 119 {
120 return "SpeechInput"; 120 return "SpeechInput";
121 } 121 }
122 122
123 void provideSpeechInputTo(Page& page, SpeechInputClient* client) 123 void provideSpeechInputTo(Page& page, PassOwnPtr<SpeechInputClient> client)
124 { 124 {
125 SpeechInput::provideTo(page, SpeechInput::supplementName(), SpeechInput::cre ate(client)); 125 SpeechInput::provideTo(page, SpeechInput::supplementName(), SpeechInput::cre ate(client));
126 } 126 }
127 127
128 } // namespace WebCore 128 } // namespace WebCore
129 129
130 #endif // ENABLE(INPUT_SPEECH) 130 #endif // ENABLE(INPUT_SPEECH)
OLDNEW
« no previous file with comments | « Source/core/speech/SpeechInput.h ('k') | Source/core/speech/SpeechInputClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698