Remove a file that was accidentally added in r142320
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 25 Jul 2015 06:02:43 +0000 (06:02 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 25 Jul 2015 06:02:43 +0000 (06:02 +0000)
* PlatformMac.cmake:
* platform/mac/PlatformSpeechSynthesisMac.mm: Removed.
It looks like Chris added PlatformSpeechSynthesisMac and
PlatformSpeechSynthesizerMac but only meant to add the latter.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@187385 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/PlatformMac.cmake
Source/WebCore/platform/mac/PlatformSpeechSynthesisMac.mm [deleted file]

index 8277832..36dcb39 100644 (file)
@@ -1,5 +1,14 @@
 2015-07-24  Tim Horton  <timothy_horton@apple.com>
 
 2015-07-24  Tim Horton  <timothy_horton@apple.com>
 
+        Remove a file that was accidentally added in r142320
+
+        * PlatformMac.cmake:
+        * platform/mac/PlatformSpeechSynthesisMac.mm: Removed.
+        It looks like Chris added PlatformSpeechSynthesisMac and
+        PlatformSpeechSynthesizerMac but only meant to add the latter.
+
+2015-07-24  Tim Horton  <timothy_horton@apple.com>
+
         Remove a file that was supposed to be removed in r158096
 
         * platform/graphics/mac/WebTiledLayer.h: Removed.
         Remove a file that was supposed to be removed in r158096
 
         * platform/graphics/mac/WebTiledLayer.h: Removed.
index 310434c..861e7e9 100644 (file)
@@ -274,7 +274,6 @@ list(APPEND WebCore_SOURCES
     platform/mac/PlatformEventFactoryMac.mm
     platform/mac/PlatformPasteboardMac.mm
     platform/mac/PlatformScreenMac.mm
     platform/mac/PlatformEventFactoryMac.mm
     platform/mac/PlatformPasteboardMac.mm
     platform/mac/PlatformScreenMac.mm
-    platform/mac/PlatformSpeechSynthesisMac.mm
     platform/mac/PlatformSpeechSynthesizerMac.mm
     platform/mac/PublicSuffixMac.mm
     platform/mac/SSLKeyGeneratorMac.cpp
     platform/mac/PlatformSpeechSynthesizerMac.mm
     platform/mac/PublicSuffixMac.mm
     platform/mac/SSLKeyGeneratorMac.cpp
diff --git a/Source/WebCore/platform/mac/PlatformSpeechSynthesisMac.mm b/Source/WebCore/platform/mac/PlatformSpeechSynthesisMac.mm
deleted file mode 100644 (file)
index bcc1da6..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2013 Apple 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 INC. ``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 INC. 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.
- */
-
-#include "config.h"
-#include "PlatformSpeechSynthesis.h"
-
-#include "SpeechSynthesisVoice.h"
-#include "SpeechSynthesisUtterance.h"
-#include <AppKit/NSSpeechSynthesizer.h>
-
-#if ENABLE(SPEECH_SYNTHESIS)
-
-namespace WebCore {
-
-PassRefPtr<PlatformSpeechSynthesis> PlatformSpeechSynthesis::create(SpeechSynthesis* synthesis)
-{
-    return adoptRef(new PlatformSpeechSynthesis(synthesis));
-}
-
-PlatformSpeechSynthesis::PlatformSpeechSynthesis(SpeechSynthesis* synthesis)
-    : m_speechSynthesis(synthesis)
-{
-}
-    
-void PlatformSpeechSynthesis::platformSpeak(SpeechSynthesisUtterance*)
-{
-}
-    
-void PlatformSpeechSynthesis::platformInitializeVoiceList(Vector<RefPtr<SpeechSynthesisVoice> >& voices);
-{
-    NSString *defaultVoiceURI = [NSSpeechSynthesizer defaultVoice];
-    NSArray *availableVoices = [NSSpeechSynthesizer availableVoices];
-    NSUInteger count = [availableVoices count];
-    for (NSUInteger k = 0; k < count; k++) {
-        NSString *voiceName = [availableVoices objectAtIndex:k];
-        NSDictionary *attributes = [NSSpeechSynthesizer attributesForVoice:voiceName];
-        
-        NSString *voiceURI = [attributes objectForKey:NSVoiceIdentifier];
-        NSString *name = [attributes objectForKey:NSVoiceName];
-        NSString *language = [attributes objectForKey:NSVoiceLocaleIdentifier];
-        
-        // Change to BCP-47 format as defined by spec.
-        language = [language stringByReplacingOccurrencesOfString:@"_" withString:@"-"];
-        
-        bool isDefault = [defaultVoiceURI isEqualToString:voiceURI];
-        
-        voices.append(SpeechSynthesisVoice::create(voiceURI, name, language, true, isDefault));
-    }
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(SPEECH_SYNTHESIS)