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

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

Issue 139803012: Move speech module over to Oilpan. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Switch SpeechRecognitionResult over to WillBeHeapVector also Created 6 years, 10 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
(...skipping 13 matching lines...) Expand all
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 27
28 #include "modules/speech/SpeechGrammarList.h" 28 #include "modules/speech/SpeechGrammarList.h"
29 29
30 #include "core/dom/Document.h" 30 #include "core/dom/Document.h"
31 31
32 namespace WebCore { 32 namespace WebCore {
33 33
34 PassRefPtr<SpeechGrammarList> SpeechGrammarList::create() 34 DEFINE_GC_INFO(SpeechGrammarList);
35
36 PassRefPtrWillBeRawPtr<SpeechGrammarList> SpeechGrammarList::create()
35 { 37 {
36 return adoptRef(new SpeechGrammarList); 38 return adoptRefWillBeNoop(new SpeechGrammarList);
37 } 39 }
38 40
39 SpeechGrammar* SpeechGrammarList::item(unsigned long index) const 41 SpeechGrammar* SpeechGrammarList::item(unsigned long index) const
40 { 42 {
41 if (index >= m_grammars.size()) 43 if (index >= m_grammars.size())
42 return 0; 44 return 0;
43 45
44 return m_grammars[index].get(); 46 return m_grammars[index].get();
45 } 47 }
46 48
47 void SpeechGrammarList::addFromUri(ExecutionContext* executionContext, const Str ing& src, double weight) 49 void SpeechGrammarList::addFromUri(ExecutionContext* executionContext, const Str ing& src, double weight)
48 { 50 {
49 Document* document = toDocument(executionContext); 51 Document* document = toDocument(executionContext);
50 m_grammars.append(SpeechGrammar::create(document->completeURL(src), weight)) ; 52 m_grammars.append(SpeechGrammar::create(document->completeURL(src), weight)) ;
51 } 53 }
52 54
53 void SpeechGrammarList::addFromString(const String& string, double weight) 55 void SpeechGrammarList::addFromString(const String& string, double weight)
54 { 56 {
55 String urlString = String("data:application/xml,") + encodeWithURLEscapeSequ ences(string); 57 String urlString = String("data:application/xml,") + encodeWithURLEscapeSequ ences(string);
56 m_grammars.append(SpeechGrammar::create(KURL(KURL(), urlString), weight)); 58 m_grammars.append(SpeechGrammar::create(KURL(KURL(), urlString), weight));
57 } 59 }
58 60
59 SpeechGrammarList::SpeechGrammarList() 61 SpeechGrammarList::SpeechGrammarList()
60 { 62 {
61 ScriptWrappable::init(this); 63 ScriptWrappable::init(this);
62 } 64 }
63 65
66 void SpeechGrammarList::trace(Visitor* visitor)
67 {
68 #if ENABLE(OILPAN)
zerny-chromium 2014/02/12 11:45:19 Nit: the #if should not be needed here.
sof 2014/02/12 11:48:33 It is & was needed; not sure what you are suggesti
zerny-chromium 2014/02/12 11:50:20 Does this give a compile error on a non-oilpan bui
sof 2014/02/12 11:54:43 As explained against an earlier patchset, https:
69 visitor->trace(m_grammars);
70 #endif
71 }
72
64 } // namespace WebCore 73 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698