Modified: trunk/Source/WebCore/ChangeLog (187384 => 187385)
--- trunk/Source/WebCore/ChangeLog 2015-07-25 05:59:46 UTC (rev 187384)
+++ trunk/Source/WebCore/ChangeLog 2015-07-25 06:02:43 UTC (rev 187385)
@@ -1,5 +1,14 @@
2015-07-24 Tim Horton <[email protected]>
+ 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 <[email protected]>
+
Remove a file that was supposed to be removed in r158096
* platform/graphics/mac/WebTiledLayer.h: Removed.
Modified: trunk/Source/WebCore/PlatformMac.cmake (187384 => 187385)
--- trunk/Source/WebCore/PlatformMac.cmake 2015-07-25 05:59:46 UTC (rev 187384)
+++ trunk/Source/WebCore/PlatformMac.cmake 2015-07-25 06:02:43 UTC (rev 187385)
@@ -274,7 +274,6 @@
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
Deleted: trunk/Source/WebCore/platform/mac/PlatformSpeechSynthesisMac.mm (187384 => 187385)
--- trunk/Source/WebCore/platform/mac/PlatformSpeechSynthesisMac.mm 2015-07-25 05:59:46 UTC (rev 187384)
+++ trunk/Source/WebCore/platform/mac/PlatformSpeechSynthesisMac.mm 2015-07-25 06:02:43 UTC (rev 187385)
@@ -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)
