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

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

Issue 2610903002: Replace [CallWith=ExecutionContext] with [CallWith=ScriptState] (Closed)
Patch Set: Created 3 years, 11 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/SpeechGrammarList.h" 26 #include "modules/speech/SpeechGrammarList.h"
27 27
28 #include "bindings/core/v8/ScriptState.h"
28 #include "core/dom/Document.h" 29 #include "core/dom/Document.h"
29 30
30 namespace blink { 31 namespace blink {
31 32
32 SpeechGrammarList* SpeechGrammarList::create() { 33 SpeechGrammarList* SpeechGrammarList::create() {
33 return new SpeechGrammarList; 34 return new SpeechGrammarList;
34 } 35 }
35 36
36 SpeechGrammar* SpeechGrammarList::item(unsigned index) const { 37 SpeechGrammar* SpeechGrammarList::item(unsigned index) const {
37 if (index >= m_grammars.size()) 38 if (index >= m_grammars.size())
38 return nullptr; 39 return nullptr;
39 40
40 return m_grammars[index]; 41 return m_grammars[index];
41 } 42 }
42 43
43 void SpeechGrammarList::addFromUri(ExecutionContext* executionContext, 44 void SpeechGrammarList::addFromUri(ScriptState* scriptState,
44 const String& src, 45 const String& src,
45 double weight) { 46 double weight) {
46 Document* document = toDocument(executionContext); 47 Document* document = toDocument(scriptState->getExecutionContext());
47 m_grammars.append(SpeechGrammar::create(document->completeURL(src), weight)); 48 m_grammars.append(SpeechGrammar::create(document->completeURL(src), weight));
48 } 49 }
49 50
50 void SpeechGrammarList::addFromString(const String& string, double weight) { 51 void SpeechGrammarList::addFromString(const String& string, double weight) {
51 String urlString = 52 String urlString =
52 String("data:application/xml,") + encodeWithURLEscapeSequences(string); 53 String("data:application/xml,") + encodeWithURLEscapeSequences(string);
53 m_grammars.append(SpeechGrammar::create(KURL(KURL(), urlString), weight)); 54 m_grammars.append(SpeechGrammar::create(KURL(KURL(), urlString), weight));
54 } 55 }
55 56
56 SpeechGrammarList::SpeechGrammarList() {} 57 SpeechGrammarList::SpeechGrammarList() {}
57 58
58 DEFINE_TRACE(SpeechGrammarList) { 59 DEFINE_TRACE(SpeechGrammarList) {
59 visitor->trace(m_grammars); 60 visitor->trace(m_grammars);
60 } 61 }
61 62
62 } // namespace blink 63 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698