Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / public / platform / WebSpeechSynthesisUtterance.h

diff --git a/src/third_party/WebKit/public/platform/WebSpeechSynthesisUtterance.h b/src/third_party/WebKit/public/platform/WebSpeechSynthesisUtterance.h
index 0e314c7..c25e3ba 100644 (file)
--- a/src/third_party/WebKit/public/platform/WebSpeechSynthesisUtterance.h
+++ b/src/third_party/WebKit/public/platform/WebSpeechSynthesisUtterance.h
@@ -30,9 +30,9 @@
 #include "WebPrivatePtr.h"
 #include "WebString.h"
 
-namespace WebCore { class PlatformSpeechSynthesisUtterance; }
+namespace blink {
 
-namespace WebKit {
+class PlatformSpeechSynthesisUtterance;
 
 class WebSpeechSynthesisUtterance {
 public:
@@ -46,32 +46,31 @@ public:
         return *this;
     }
 
-    BLINK_EXPORT void assign(const WebSpeechSynthesisUtterance&);
-    BLINK_EXPORT void reset();
+    BLINK_PLATFORM_EXPORT void assign(const WebSpeechSynthesisUtterance&);
+    BLINK_PLATFORM_EXPORT void reset();
     bool isNull() const { return m_private.isNull(); }
 
-    BLINK_EXPORT WebString text() const;
-    BLINK_EXPORT WebString lang() const;
-    BLINK_EXPORT WebString voice() const;
+    BLINK_PLATFORM_EXPORT WebString text() const;
+    BLINK_PLATFORM_EXPORT WebString lang() const;
+    BLINK_PLATFORM_EXPORT WebString voice() const;
 
     // As defined in: https://dvcs.w3.org/hg/speech-api/raw-file/tip/speechapi.html
-    BLINK_EXPORT float volume() const; // 0...1, 1 is default
-    BLINK_EXPORT float rate() const; // 0.1...10, 1 is default
-    BLINK_EXPORT float pitch() const; // 0...2, 1 is default
+    BLINK_PLATFORM_EXPORT float volume() const; // 0...1, 1 is default
+    BLINK_PLATFORM_EXPORT float rate() const; // 0.1...10, 1 is default
+    BLINK_PLATFORM_EXPORT float pitch() const; // 0...2, 1 is default
 
-    BLINK_EXPORT double startTime() const; // In seconds.
+    BLINK_PLATFORM_EXPORT double startTime() const; // In seconds.
 
-#if BLINK_IMPLEMENTATION
-    WebSpeechSynthesisUtterance(const PassRefPtr<WebCore::PlatformSpeechSynthesisUtterance>&);
-    WebSpeechSynthesisUtterance& operator=(WebCore::PlatformSpeechSynthesisUtterance*);
-    operator PassRefPtr<WebCore::PlatformSpeechSynthesisUtterance>() const;
-    operator WebCore::PlatformSpeechSynthesisUtterance*() const;
+#if INSIDE_BLINK
+    BLINK_PLATFORM_EXPORT WebSpeechSynthesisUtterance(PlatformSpeechSynthesisUtterance*);
+    BLINK_PLATFORM_EXPORT WebSpeechSynthesisUtterance& operator=(PlatformSpeechSynthesisUtterance*);
+    BLINK_PLATFORM_EXPORT operator PlatformSpeechSynthesisUtterance*() const;
 #endif
 
 private:
-    WebPrivatePtr<WebCore::PlatformSpeechSynthesisUtterance> m_private;
+    WebPrivatePtr<PlatformSpeechSynthesisUtterance> m_private;
 };
 
-} // namespace WebKit
+} // namespace blink
 
 #endif // WebSpeechSynthesisUtterance_h