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

Side by Side Diff: public/web/WebSpeechGrammar.h

Issue 168963003: Make WebPrivatePtr capable of wrapping garbage collected objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Make WebSpeechGrammar use WebPrivateGarbageCollectedPtr<> 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
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 #ifndef WebSpeechGrammar_h 26 #ifndef WebSpeechGrammar_h
27 #define WebSpeechGrammar_h 27 #define WebSpeechGrammar_h
28 28
29 #include "../platform/WebCommon.h" 29 #include "../platform/WebCommon.h"
30 #include "../platform/WebPrivatePtr.h" 30 #include "../platform/WebPrivateGarbageCollectedPtr.h"
sof 2014/02/17 11:36:25 checkdeps didn't like this #include, I don't yet u
31 #include "../platform/WebURL.h" 31 #include "../platform/WebURL.h"
32 32
33 namespace WebCore { 33 namespace WebCore {
34 class SpeechGrammar; 34 class SpeechGrammar;
35 } 35 }
36 36
37 namespace blink { 37 namespace blink {
38 38
39 class WebSpeechGrammar { 39 class WebSpeechGrammar {
40 public: 40 public:
41 WebSpeechGrammar() { } 41 WebSpeechGrammar() { }
42 WebSpeechGrammar(const WebSpeechGrammar& grammar) { assign(grammar); } 42 WebSpeechGrammar(const WebSpeechGrammar& grammar) { assign(grammar); }
43 ~WebSpeechGrammar() { reset(); } 43 ~WebSpeechGrammar() { reset(); }
44 44
45 BLINK_EXPORT WebURL src() const; 45 BLINK_EXPORT WebURL src() const;
46 BLINK_EXPORT float weight() const; 46 BLINK_EXPORT float weight() const;
47 47
48 BLINK_EXPORT void reset(); 48 BLINK_EXPORT void reset();
49 BLINK_EXPORT void assign(const WebSpeechGrammar&); 49 BLINK_EXPORT void assign(const WebSpeechGrammar&);
50 50
51 #if BLINK_IMPLEMENTATION 51 #if BLINK_IMPLEMENTATION
52 WebSpeechGrammar(const WTF::PassRefPtr<WebCore::SpeechGrammar>&); 52 WebSpeechGrammar(const WTF::PassRefPtrWillBeRawPtr<WebCore::SpeechGrammar>&) ;
haraken 2014/02/17 11:35:58 Add explicit.
sof 2014/02/17 11:44:18 Done.
53 WebSpeechGrammar& operator=(const WTF::PassRefPtr<WebCore::SpeechGrammar>&); 53 WebSpeechGrammar& operator=(const WTF::PassRefPtrWillBeRawPtr<WebCore::Speec hGrammar>&);
haraken 2014/02/17 11:35:58 Ditto.
sof 2014/02/17 11:44:18 Need to wait for C++11? (Or do we have a condition
haraken 2014/02/17 11:45:16 Sorry, ignore my comment :)
54 #endif 54 #endif
55 55
56 private: 56 private:
57 WebPrivatePtr<WebCore::SpeechGrammar> m_private; 57 WebPrivateGarbageCollectedPtr<WebCore::SpeechGrammar> m_private;
58 }; 58 };
59 59
60 } // namespace blink 60 } // namespace blink
61 61
62 #endif // WebSpeechGrammar_h 62 #endif // WebSpeechGrammar_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698