Unreviewed, rolling out r146483.
http://trac.webkit.org/changeset/146483
https://bugs.webkit.org/show_bug.cgi?id=111695
Source/JavaScriptCore:
Breaks debug builds.
* bytecode/GlobalResolveInfo.h: Removed property svn:mergeinfo.
Source/Platform:
Breaks
* Platform.gypi:
* chromium/public/Platform.h:
(WebKit):
(Platform):
* chromium/public/WebSpeechSynthesisUtterance.h: Removed.
* chromium/public/WebSpeechSynthesisVoice.h: Removed.
* chromium/public/WebSpeechSynthesizer.h: Removed.
* chromium/public/WebSpeechSynthesizerClient.h: Removed.
Source/WebCore:
Breaks
* Modules/speech/SpeechSynthesis.cpp:
(WebCore::SpeechSynthesis::boundaryEventOccurred):
(WebCore::SpeechSynthesis::didStartSpeaking):
(WebCore::SpeechSynthesis::didPauseSpeaking):
(WebCore::SpeechSynthesis::didResumeSpeaking):
(WebCore::SpeechSynthesis::didFinishSpeaking):
(WebCore::SpeechSynthesis::speakingErrorOccurred):
(WebCore):
* Modules/speech/SpeechSynthesis.h:
(SpeechSynthesis):
* Modules/speech/SpeechSynthesisUtterance.cpp:
(WebCore::SpeechSynthesisUtterance::SpeechSynthesisUtterance):
(WebCore::SpeechSynthesisUtterance::setVoice):
* Modules/speech/SpeechSynthesisUtterance.h:
(WebCore::SpeechSynthesisUtterance::text):
(WebCore::SpeechSynthesisUtterance::setText):
(WebCore::SpeechSynthesisUtterance::lang):
(WebCore::SpeechSynthesisUtterance::setLang):
(WebCore::SpeechSynthesisUtterance::volume):
(WebCore::SpeechSynthesisUtterance::setVolume):
(WebCore::SpeechSynthesisUtterance::rate):
(WebCore::SpeechSynthesisUtterance::setRate):
(WebCore::SpeechSynthesisUtterance::pitch):
(WebCore::SpeechSynthesisUtterance::setPitch):
(WebCore::SpeechSynthesisUtterance::startTime):
(WebCore::SpeechSynthesisUtterance::setStartTime):
(WebCore::SpeechSynthesisUtterance::platformUtterance):
(SpeechSynthesisUtterance):
* Modules/speech/SpeechSynthesisVoice.h:
(SpeechSynthesisVoice):
* WebCore.exp.in:
* WebCore.gypi:
* platform/PlatformSpeechSynthesis.h:
(PlatformSpeechSynthesis):
* platform/PlatformSpeechSynthesisUtterance.cpp:
* platform/PlatformSpeechSynthesisUtterance.h:
(PlatformSpeechSynthesisUtterance):
(WebCore::PlatformSpeechSynthesisUtterance::client):
* platform/PlatformSpeechSynthesisVoice.cpp:
(WebCore::PlatformSpeechSynthesisVoice::create):
(WebCore::PlatformSpeechSynthesisVoice::PlatformSpeechSynthesisVoice):
* platform/PlatformSpeechSynthesisVoice.h:
(PlatformSpeechSynthesisVoice):
(WebCore::PlatformSpeechSynthesisVoice::voiceURI):
(WebCore::PlatformSpeechSynthesisVoice::name):
(WebCore::PlatformSpeechSynthesisVoice::lang):
(WebCore::PlatformSpeechSynthesisVoice::localService):
* platform/PlatformSpeechSynthesizer.cpp:
(WebCore::PlatformSpeechSynthesizer::create):
(WebCore::PlatformSpeechSynthesizer::PlatformSpeechSynthesizer):
(WebCore):
* platform/PlatformSpeechSynthesizer.h:
(PlatformSpeechSynthesizerClient):
(WebCore::PlatformSpeechSynthesizer::~PlatformSpeechSynthesizer):
(PlatformSpeechSynthesizer):
* platform/chromium/PlatformSpeechSynthesizerChromium.cpp: Removed.
* platform/chromium/support/WebSpeechSynthesisUtterance.cpp: Removed.
* platform/chromium/support/WebSpeechSynthesisVoice.cpp: Removed.
* platform/chromium/support/WebSpeechSynthesizerClientImpl.cpp: Removed.
* platform/chromium/support/WebSpeechSynthesizerClientImpl.h: Removed.
* platform/mac/PlatformSpeechSynthesizerMac.mm:
(-[WebSpeechSynthesisWrapper speakUtterance:WebCore::]):
(-[WebSpeechSynthesisWrapper speechSynthesizer:didFinishSpeaking:]):
(WebCore):
(WebCore::PlatformSpeechSynthesizer::speak):
* platform/mock/PlatformSpeechSynthesizerMock.cpp:
(WebCore::PlatformSpeechSynthesizerMock::create):
(WebCore::PlatformSpeechSynthesizerMock::PlatformSpeechSynthesizerMock):
(WebCore::PlatformSpeechSynthesizerMock::speakingFinished):
(WebCore::PlatformSpeechSynthesizerMock::speak):
* platform/mock/PlatformSpeechSynthesizerMock.h:
(PlatformSpeechSynthesizerMock):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk/Source/Platform/chromium/public@146489 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Platform.h b/Platform.h
index 806cc60..f2a9113 100644
--- a/Platform.h
+++ b/Platform.h
@@ -41,7 +41,6 @@
#include "WebGamepads.h"
#include "WebGraphicsContext3D.h"
#include "WebLocalizedString.h"
-#include "WebSpeechSynthesizer.h"
#include "WebString.h"
#include "WebVector.h"
@@ -70,8 +69,6 @@
class WebRTCPeerConnectionHandlerClient;
class WebSandboxSupport;
class WebSocketStreamHandle;
-class WebSpeechSynthesizer;
-class WebSpeechSynthesizerClient;
class WebStorageNamespace;
class WebUnitTestSupport;
class WebThemeEngine;
@@ -118,8 +115,6 @@
// Must return non-null.
virtual WebHyphenator* hyphenator() { return 0; }
- // May return null.
- virtual WebSpeechSynthesizer* createSpeechSynthesizer(WebSpeechSynthesizerClient*) { return 0; }
// Audio --------------------------------------------------------------
diff --git a/WebSpeechSynthesisUtterance.h b/WebSpeechSynthesisUtterance.h
deleted file mode 100644
index 44197f2..0000000
--- a/WebSpeechSynthesisUtterance.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2013 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebSpeechSynthesisUtterance_h
-#define WebSpeechSynthesisUtterance_h
-
-#include "WebCommon.h"
-#include "WebPrivatePtr.h"
-#include "WebString.h"
-
-namespace WebCore { class PlatformSpeechSynthesisUtterance; }
-
-namespace WebKit {
-
-class WebSpeechSynthesisUtterance {
-public:
- WebSpeechSynthesisUtterance() { }
- WebSpeechSynthesisUtterance(const WebSpeechSynthesisUtterance& other) { assign(other); }
- ~WebSpeechSynthesisUtterance() { reset(); }
-
- WebSpeechSynthesisUtterance& operator=(const WebSpeechSynthesisUtterance& other)
- {
- assign(other);
- return *this;
- }
-
- WEBKIT_EXPORT void assign(const WebSpeechSynthesisUtterance&);
- WEBKIT_EXPORT void reset();
- bool isNull() const { return m_private.isNull(); }
-
- WEBKIT_EXPORT WebString text() const;
- WEBKIT_EXPORT WebString lang() const;
- WEBKIT_EXPORT WebString voice() const;
-
- // As defined in: https://dvcs.w3.org/hg/speech-api/raw-file/tip/speechapi.html
- WEBKIT_EXPORT float volume() const; // 0...1, 1 is default
- WEBKIT_EXPORT float rate() const; // 0.1...10, 1 is default
- WEBKIT_EXPORT float pitch() const; // 0...2, 1 is default
-
- WEBKIT_EXPORT double startTime() const; // In seconds.
-
-#if WEBKIT_IMPLEMENTATION
- WebSpeechSynthesisUtterance(const PassRefPtr<WebCore::PlatformSpeechSynthesisUtterance>&);
- WebSpeechSynthesisUtterance& operator=(WebCore::PlatformSpeechSynthesisUtterance*);
- operator PassRefPtr<WebCore::PlatformSpeechSynthesisUtterance>() const;
- operator WebCore::PlatformSpeechSynthesisUtterance*() const;
-#endif
-
-private:
- WebPrivatePtr<WebCore::PlatformSpeechSynthesisUtterance> m_private;
-};
-
-} // namespace WebKit
-
-#endif // WebSpeechSynthesisUtterance_h
diff --git a/WebSpeechSynthesisVoice.h b/WebSpeechSynthesisVoice.h
deleted file mode 100644
index fd5a161..0000000
--- a/WebSpeechSynthesisVoice.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2013 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebSpeechSynthesisVoice_h
-#define WebSpeechSynthesisVoice_h
-
-#include "WebCommon.h"
-#include "WebPrivatePtr.h"
-#include "WebString.h"
-
-namespace WebCore {
-class PlatformSpeechSynthesisVoice;
-}
-
-namespace WebKit {
-
-class WebSpeechSynthesisVoice {
-public:
- WebSpeechSynthesisVoice() { }
- WebSpeechSynthesisVoice(const WebSpeechSynthesisVoice& other) { assign(other); }
- ~WebSpeechSynthesisVoice() { reset(); }
-
- WebSpeechSynthesisVoice& operator=(const WebSpeechSynthesisVoice& other)
- {
- assign(other);
- return *this;
- }
-
- WEBKIT_EXPORT void assign(const WebSpeechSynthesisVoice&);
- WEBKIT_EXPORT void reset();
-
- WEBKIT_EXPORT void setVoiceURI(const WebString&);
- WEBKIT_EXPORT void setName(const WebString&);
- WEBKIT_EXPORT void setLanguage(const WebString&);
- WEBKIT_EXPORT void setIsLocalService(bool);
- WEBKIT_EXPORT void setIsDefault(bool);
-
-#if WEBKIT_IMPLEMENTATION
- operator WTF::PassRefPtr<WebCore::PlatformSpeechSynthesisVoice>() const;
-#endif
-
-private:
- WebPrivatePtr<WebCore::PlatformSpeechSynthesisVoice> m_private;
-};
-
-} // namespace WebKit
-
-#endif // WebSpeechSynthesisVoice_h
diff --git a/WebSpeechSynthesizer.h b/WebSpeechSynthesizer.h
deleted file mode 100644
index 4c0f965..0000000
--- a/WebSpeechSynthesizer.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2013 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebSpeechSynthesizer_h
-#define WebSpeechSynthesizer_h
-
-#include "WebCommon.h"
-
-namespace WebKit {
-
-class WebSpeechSynthesizerClient;
-class WebSpeechSynthesisUtterance;
-
-class WebSpeechSynthesizer {
-public:
- virtual ~WebSpeechSynthesizer() { }
-
- virtual void updateVoiceList() = 0;
-
- // OK to call with more than one utterance, will queue.
- virtual void speak(const WebSpeechSynthesisUtterance&) = 0;
-
- virtual void pause() = 0;
- virtual void resume() = 0;
- virtual void cancel() = 0;
-};
-
-} // namespace WebKit
-
-#endif // WebSpeechSynthesizer_h
diff --git a/WebSpeechSynthesizerClient.h b/WebSpeechSynthesizerClient.h
deleted file mode 100644
index f2b9e9c..0000000
--- a/WebSpeechSynthesizerClient.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2013 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebSpeechSynthesizerClient_h
-#define WebSpeechSynthesizerClient_h
-
-#include "WebSpeechSynthesisUtterance.h"
-#include "WebSpeechSynthesisVoice.h"
-#include "WebVector.h"
-
-namespace WebKit {
-
-class WebSpeechSynthesizerClient {
-public:
- virtual ~WebSpeechSynthesizerClient() { }
-
- virtual void setVoiceList(const WebVector<WebSpeechSynthesisVoice>&) = 0;
- virtual void didStartSpeaking(const WebSpeechSynthesisUtterance&) = 0;
- virtual void didPauseSpeaking(const WebSpeechSynthesisUtterance&) = 0;
- virtual void didResumeSpeaking(const WebSpeechSynthesisUtterance&) = 0;
- virtual void didFinishSpeaking(const WebSpeechSynthesisUtterance&) = 0;
- virtual void speakingErrorOccurred(const WebSpeechSynthesisUtterance&) = 0;
- virtual void wordBoundaryEventOccurred(const WebSpeechSynthesisUtterance&, unsigned charIndex) = 0;
- virtual void sentenceBoundaryEventOccurred(const WebSpeechSynthesisUtterance&, unsigned charIndex) = 0;
-};
-
-} // namespace WebKit
-
-#endif // WebSpeechSynthesizerClient_h
