Title: [218999] trunk/Source/WebCore
Revision
218999
Author
[email protected]
Date
2017-06-30 09:12:17 -0700 (Fri, 30 Jun 2017)

Log Message

[PAL] Move Sound into PAL
https://bugs.webkit.org/show_bug.cgi?id=173999

Patch by Ross Kirsling <[email protected]> on 2017-06-30
Reviewed by Alex Christensen.

Source/WebCore:

* Configurations/WebCore.xcconfig:
* PlatformGTK.cmake:
* PlatformMac.cmake:
* PlatformWPE.cmake:
* PlatformWin.cmake:
* WebCore.xcodeproj/project.pbxproj:
* editing/Editor.cpp:
(WebCore::Editor::cut):
(WebCore::Editor::copy):
(WebCore::Editor::performDelete):
* editing/EditorCommand.cpp:
(WebCore::executeSelectToMark):
(WebCore::executeSwapWithMark):
* editing/mac/EditorMac.mm:
(WebCore::Editor::takeFindStringFromSelection):
* inspector/InspectorFrontendHost.cpp:
(WebCore::InspectorFrontendHost::beep):
* platform/Sound.h: Removed.

Source/WebCore/PAL:

* Configurations/PAL.xcconfig:
* PAL.xcodeproj/project.pbxproj:
* pal/CMakeLists.txt:
* pal/PlatformGTK.cmake:
* pal/PlatformMac.cmake:
* pal/PlatformWPE.cmake:
* pal/PlatformWin.cmake:
* pal/system/Sound.h: Renamed from Source/WebCore/platform/ios/SoundIOS.mm.
* pal/system/SoundNone.cpp: Renamed from Source/WebCore/platform/wpe/SoundWPE.cpp.
(PAL::systemBeep):
* pal/system/gtk/SoundGtk.cpp: Renamed from Source/WebCore/platform/gtk/SoundGtk.cpp.
* pal/system/mac/SoundMac.mm: Renamed from Source/WebCore/platform/mac/SoundMac.mm.
* pal/system/win/SoundWin.cpp: Renamed from Source/WebCore/platform/win/SoundWin.cpp.

Modified Paths

Added Paths

Removed Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (218998 => 218999)


--- trunk/Source/WebCore/ChangeLog	2017-06-30 16:08:21 UTC (rev 218998)
+++ trunk/Source/WebCore/ChangeLog	2017-06-30 16:12:17 UTC (rev 218999)
@@ -1,3 +1,29 @@
+2017-06-30  Ross Kirsling  <[email protected]>
+
+        [PAL] Move Sound into PAL
+        https://bugs.webkit.org/show_bug.cgi?id=173999
+
+        Reviewed by Alex Christensen.
+
+        * Configurations/WebCore.xcconfig:
+        * PlatformGTK.cmake:
+        * PlatformMac.cmake:
+        * PlatformWPE.cmake:
+        * PlatformWin.cmake:
+        * WebCore.xcodeproj/project.pbxproj:
+        * editing/Editor.cpp:
+        (WebCore::Editor::cut):
+        (WebCore::Editor::copy):
+        (WebCore::Editor::performDelete):
+        * editing/EditorCommand.cpp:
+        (WebCore::executeSelectToMark):
+        (WebCore::executeSwapWithMark):
+        * editing/mac/EditorMac.mm:
+        (WebCore::Editor::takeFindStringFromSelection):
+        * inspector/InspectorFrontendHost.cpp:
+        (WebCore::InspectorFrontendHost::beep):
+        * platform/Sound.h: Removed.
+
 2017-06-30  Wenson Hsieh  <[email protected]>
 
         [iOS DnD] Drag caret rect is incorrectly computed when dropping in editable content in iframes

Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (218998 => 218999)


--- trunk/Source/WebCore/Configurations/WebCore.xcconfig	2017-06-30 16:08:21 UTC (rev 218998)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig	2017-06-30 16:12:17 UTC (rev 218999)
@@ -117,7 +117,7 @@
 EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS = $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS_IF_ENABLED_$(ENABLE_IOS_GESTURE_EVENTS)$(ENABLE_MAC_GESTURE_EVENTS));
 EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS_IF_ENABLED_ = JSGesture* DOMGesture*;
 
-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.tiff *Cursor.png AccessibilityObjectMac.mm AXObjectCacheMac.mm ColorMac.mm Cursor.cpp CursorMac.mm DataTransferMac.mm EditorMac.mm EventHandlerMac.mm EventLoopMac.mm GeolocationServiceMac.mm GraphicsContext3DOpenGLES.cpp IconDatabase.cpp IconMac.mm KillRingMac.mm LocalCurrentGraphicsContext.mm MIMETypeRegistryMac.mm MediaPlayerPrivateQTKit.mm NSScrollerImpDetails.mm NetworkStateNotifierMac.cpp PasteboardMac.mm PlatformEventFactoryMac.mm PlatformMouseEventMac.mm PlatformPasteboardMac.mm PlatformScreenMac.mm PlatformSpeechSynthesizerMac.mm RunLoopMac.mm SSLKeyGeneratorMac.mm ScrollViewMac.mm ScrollbarThemeMac.mm SharedTimerMac.mm SoundMac.mm SystemTimeMac.cpp ThemeMac.mm ThreadCheck.mm UserAgentMac.mm WebAccessibilityObjectWrapperMac.mm WebCoreSystemInterface.mm WebCoreView.m WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm WidgetMac.mm DisplayRefreshMonitorMac.cpp npapi.h npfunctions
 .h npruntime.h npruntime_internal.h $(EXCLUDED_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS) $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS);
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.tiff *Cursor.png AccessibilityObjectMac.mm AXObjectCacheMac.mm ColorMac.mm Cursor.cpp CursorMac.mm DataTransferMac.mm EditorMac.mm EventHandlerMac.mm EventLoopMac.mm GeolocationServiceMac.mm GraphicsContext3DOpenGLES.cpp IconDatabase.cpp IconMac.mm KillRingMac.mm LocalCurrentGraphicsContext.mm MIMETypeRegistryMac.mm MediaPlayerPrivateQTKit.mm NSScrollerImpDetails.mm NetworkStateNotifierMac.cpp PasteboardMac.mm PlatformEventFactoryMac.mm PlatformMouseEventMac.mm PlatformPasteboardMac.mm PlatformScreenMac.mm PlatformSpeechSynthesizerMac.mm RunLoopMac.mm SSLKeyGeneratorMac.mm ScrollViewMac.mm ScrollbarThemeMac.mm SharedTimerMac.mm SystemTimeMac.cpp ThemeMac.mm ThreadCheck.mm UserAgentMac.mm WebAccessibilityObjectWrapperMac.mm WebCoreSystemInterface.mm WebCoreView.m WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm WidgetMac.mm DisplayRefreshMonitorMac.cpp npapi.h npfunctions.h npruntime.
 h npruntime_internal.h $(EXCLUDED_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS) $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS);
 EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = *IOS.h *IOS.cpp *IOS.mm KillRingNone.cpp WAKAppKitStubs.h WAKClipView.h WAKResponder.h WAKScrollView.h WAKView.h WAKViewPrivate.h WAKWindow.h WKContentObservation.h WKGraphics.h WKTypes.h WKUtilities.h WKView.h WKViewPrivate.h WebCoreThread.h WebCoreThreadMessage.h WebCoreThreadRun.h WebCoreThreadSystemInterface.h $(EXCLUDED_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS) $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS);
 
 WK_EMPTY_ = YES;

Modified: trunk/Source/WebCore/PAL/ChangeLog (218998 => 218999)


--- trunk/Source/WebCore/PAL/ChangeLog	2017-06-30 16:08:21 UTC (rev 218998)
+++ trunk/Source/WebCore/PAL/ChangeLog	2017-06-30 16:12:17 UTC (rev 218999)
@@ -1,3 +1,24 @@
+2017-06-30  Ross Kirsling  <[email protected]>
+
+        [PAL] Move Sound into PAL
+        https://bugs.webkit.org/show_bug.cgi?id=173999
+
+        Reviewed by Alex Christensen.
+
+        * Configurations/PAL.xcconfig:
+        * PAL.xcodeproj/project.pbxproj:
+        * pal/CMakeLists.txt:
+        * pal/PlatformGTK.cmake:
+        * pal/PlatformMac.cmake:
+        * pal/PlatformWPE.cmake:
+        * pal/PlatformWin.cmake:
+        * pal/system/Sound.h: Renamed from Source/WebCore/platform/ios/SoundIOS.mm.
+        * pal/system/SoundNone.cpp: Renamed from Source/WebCore/platform/wpe/SoundWPE.cpp.
+        (PAL::systemBeep):
+        * pal/system/gtk/SoundGtk.cpp: Renamed from Source/WebCore/platform/gtk/SoundGtk.cpp.
+        * pal/system/mac/SoundMac.mm: Renamed from Source/WebCore/platform/mac/SoundMac.mm.
+        * pal/system/win/SoundWin.cpp: Renamed from Source/WebCore/platform/win/SoundWin.cpp.
+
 2017-06-28  Jonathan Bedard  <[email protected]>
 
         Build fix for PAL

Modified: trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig (218998 => 218999)


--- trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig	2017-06-30 16:08:21 UTC (rev 218998)
+++ trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig	2017-06-30 16:12:17 UTC (rev 218999)
@@ -57,8 +57,8 @@
 PRODUCTION_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR);
 PRODUCTION_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
 
-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.tiff *Cursor.png;
-EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = *IOS.h *IOS.cpp *IOS.mm;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.tiff *Cursor.png *Mac.mm;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = *IOS.h *IOS.cpp *IOS.mm SoundNone.cpp;
 
 WK_EMPTY_ = YES;
 WK_NOT_ = YES;

Modified: trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj (218998 => 218999)


--- trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj	2017-06-30 16:08:21 UTC (rev 218998)
+++ trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj	2017-06-30 16:12:17 UTC (rev 218999)
@@ -25,6 +25,9 @@
 		1C09D0531E31C44100725F18 /* CryptoDigest.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C09D0521E31C44100725F18 /* CryptoDigest.h */; };
 		1C09D0561E31C46500725F18 /* CryptoDigestCommonCrypto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C09D0551E31C46500725F18 /* CryptoDigestCommonCrypto.cpp */; };
 		1C09D0581E31C57E00725F18 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C09D0571E31C57E00725F18 /* config.h */; };
+		A3788E981F05B6CE00679425 /* Sound.h in Headers */ = {isa = PBXBuildFile; fileRef = A3788E971F05B6CE00679425 /* Sound.h */; };
+		A3788E9C1F05B78200679425 /* SoundNone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3788E9B1F05B78200679425 /* SoundNone.cpp */; };
+		A3788E9E1F05B78E00679425 /* SoundMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A3788E9D1F05B78E00679425 /* SoundMac.mm */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -48,6 +51,9 @@
 		1C09D0631E31EC3100725F18 /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
 		1C67CEA11E32EDA800F80F2E /* FeatureDefines.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = FeatureDefines.xcconfig; sourceTree = "<group>"; };
 		1C67CEA21E32EE2600F80F2E /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
+		A3788E971F05B6CE00679425 /* Sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Sound.h; path = system/Sound.h; sourceTree = "<group>"; };
+		A3788E9B1F05B78200679425 /* SoundNone.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SoundNone.cpp; path = system/SoundNone.cpp; sourceTree = "<group>"; };
+		A3788E9D1F05B78E00679425 /* SoundMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SoundMac.mm; path = system/mac/SoundMac.mm; sourceTree = "<group>"; };
 		C2147A4A1EFD0AA600056FA5 /* CopyPALHeaders.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = CopyPALHeaders.xcconfig; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -83,8 +89,9 @@
 		1C09D03F1E31C32800725F18 /* pal */ = {
 			isa = PBXGroup;
 			children = (
+				1C09D0511E31C41200725F18 /* crypto */,
+				A3788E9F1F05B7CE00679425 /* system */,
 				0C2D9E721EEF5AF600DBC317 /* ExportMacros.h */,
-				1C09D0511E31C41200725F18 /* crypto */,
 			);
 			path = pal;
 			sourceTree = "<group>";
@@ -119,6 +126,24 @@
 			path = Configurations;
 			sourceTree = "<group>";
 		};
+		A3788E9F1F05B7CE00679425 /* system */ = {
+			isa = PBXGroup;
+			children = (
+				A3788EA01F05B7E200679425 /* mac */,
+				A3788E971F05B6CE00679425 /* Sound.h */,
+				A3788E9B1F05B78200679425 /* SoundNone.cpp */,
+			);
+			name = system;
+			sourceTree = "<group>";
+		};
+		A3788EA01F05B7E200679425 /* mac */ = {
+			isa = PBXGroup;
+			children = (
+				A3788E9D1F05B78E00679425 /* SoundMac.mm */,
+			);
+			name = mac;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -128,6 +153,7 @@
 			files = (
 				1C09D0581E31C57E00725F18 /* config.h in Headers */,
 				1C09D0531E31C44100725F18 /* CryptoDigest.h in Headers */,
+				A3788E981F05B6CE00679425 /* Sound.h in Headers */,
 				0C2D9E731EEF5AF600DBC317 /* ExportMacros.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -218,6 +244,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				1C09D0561E31C46500725F18 /* CryptoDigestCommonCrypto.cpp in Sources */,
+				A3788E9E1F05B78E00679425 /* SoundMac.mm in Sources */,
+				A3788E9C1F05B78200679425 /* SoundNone.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Modified: trunk/Source/WebCore/PAL/pal/CMakeLists.txt (218998 => 218999)


--- trunk/Source/WebCore/PAL/pal/CMakeLists.txt	2017-06-30 16:08:21 UTC (rev 218998)
+++ trunk/Source/WebCore/PAL/pal/CMakeLists.txt	2017-06-30 16:12:17 UTC (rev 218999)
@@ -8,6 +8,7 @@
 set(PAL_PRIVATE_INCLUDE_DIRECTORIES
     "${PAL_DIR}/pal"
     "${PAL_DIR}/pal/crypto"
+    "${PAL_DIR}/pal/system"
 )
 
 set(PAL_LIBRARIES

Modified: trunk/Source/WebCore/PAL/pal/PlatformGTK.cmake (218998 => 218999)


--- trunk/Source/WebCore/PAL/pal/PlatformGTK.cmake	2017-06-30 16:08:21 UTC (rev 218998)
+++ trunk/Source/WebCore/PAL/pal/PlatformGTK.cmake	2017-06-30 16:12:17 UTC (rev 218999)
@@ -2,4 +2,10 @@
     crypto/gcrypt/CryptoDigestGCrypt.cpp
 
     crypto/tasn1/Utilities.cpp
+
+    system/gtk/SoundGtk.cpp
 )
+
+list(APPEND PAL_SYSTEM_INCLUDE_DIRECTORIES
+    ${GDK_INCLUDE_DIRS}
+)

Modified: trunk/Source/WebCore/PAL/pal/PlatformMac.cmake (218998 => 218999)


--- trunk/Source/WebCore/PAL/pal/PlatformMac.cmake	2017-06-30 16:08:21 UTC (rev 218998)
+++ trunk/Source/WebCore/PAL/pal/PlatformMac.cmake	2017-06-30 16:12:17 UTC (rev 218999)
@@ -1,3 +1,5 @@
 list(APPEND PAL_SOURCES
     crypto/commoncrypto/CryptoDigestCommonCrypto.cpp
+
+    system/mac/SoundMac.mm
 )

Modified: trunk/Source/WebCore/PAL/pal/PlatformWPE.cmake (218998 => 218999)


--- trunk/Source/WebCore/PAL/pal/PlatformWPE.cmake	2017-06-30 16:08:21 UTC (rev 218998)
+++ trunk/Source/WebCore/PAL/pal/PlatformWPE.cmake	2017-06-30 16:12:17 UTC (rev 218999)
@@ -2,4 +2,6 @@
     crypto/gcrypt/CryptoDigestGCrypt.cpp
 
     crypto/tasn1/Utilities.cpp
+
+    system/SoundNone.cpp
 )

Modified: trunk/Source/WebCore/PAL/pal/PlatformWin.cmake (218998 => 218999)


--- trunk/Source/WebCore/PAL/pal/PlatformWin.cmake	2017-06-30 16:08:21 UTC (rev 218998)
+++ trunk/Source/WebCore/PAL/pal/PlatformWin.cmake	2017-06-30 16:12:17 UTC (rev 218999)
@@ -1,5 +1,7 @@
 list(APPEND PAL_SOURCES
     crypto/win/CryptoDigestWin.cpp
+
+    system/win/SoundWin.cpp
 )
 
 set(PAL_OUTPUT_NAME PAL${DEBUG_SUFFIX})

Copied: trunk/Source/WebCore/PAL/pal/system/Sound.h (from rev 218998, trunk/Source/WebCore/platform/ios/SoundIOS.mm) (0 => 218999)


--- trunk/Source/WebCore/PAL/pal/system/Sound.h	                        (rev 0)
+++ trunk/Source/WebCore/PAL/pal/system/Sound.h	2017-06-30 16:12:17 UTC (rev 218999)
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2006 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. 
+ */
+
+#pragma once
+
+namespace PAL {
+
+PAL_EXPORT void systemBeep();
+
+} // namespace PAL

Copied: trunk/Source/WebCore/PAL/pal/system/SoundNone.cpp (from rev 218998, trunk/Source/WebCore/platform/wpe/SoundWPE.cpp) (0 => 218999)


--- trunk/Source/WebCore/PAL/pal/system/SoundNone.cpp	                        (rev 0)
+++ trunk/Source/WebCore/PAL/pal/system/SoundNone.cpp	2017-06-30 16:12:17 UTC (rev 218999)
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2014 Igalia S.L.
+ *
+ * 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. 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 INC. 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.
+ */
+
+#include "config.h"
+#include "Sound.h"
+
+namespace PAL {
+
+void systemBeep() { }
+
+} // namespace PAL

Copied: trunk/Source/WebCore/PAL/pal/system/gtk/SoundGtk.cpp (from rev 218998, trunk/Source/WebCore/platform/gtk/SoundGtk.cpp) (0 => 218999)


--- trunk/Source/WebCore/PAL/pal/system/gtk/SoundGtk.cpp	                        (rev 0)
+++ trunk/Source/WebCore/PAL/pal/system/gtk/SoundGtk.cpp	2017-06-30 16:12:17 UTC (rev 218999)
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2007 Alp Toker <[email protected]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "config.h"
+#include "Sound.h"
+
+#include <gdk/gdk.h>
+
+namespace PAL {
+
+void systemBeep()
+{
+    gdk_beep();
+}
+
+} // namespace PAL
+
+// vim: ts=4 sw=4 et

Copied: trunk/Source/WebCore/PAL/pal/system/mac/SoundMac.mm (from rev 218998, trunk/Source/WebCore/platform/mac/SoundMac.mm) (0 => 218999)


--- trunk/Source/WebCore/PAL/pal/system/mac/SoundMac.mm	                        (rev 0)
+++ trunk/Source/WebCore/PAL/pal/system/mac/SoundMac.mm	2017-06-30 16:12:17 UTC (rev 218999)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2006 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.
+ */
+
+#import "config.h"
+#import "Sound.h"
+
+#import <AppKit/AppKit.h>
+
+namespace PAL {
+
+void systemBeep() { NSBeep(); }
+
+} // namespace PAL

Copied: trunk/Source/WebCore/PAL/pal/system/win/SoundWin.cpp (from rev 218998, trunk/Source/WebCore/platform/win/SoundWin.cpp) (0 => 218999)


--- trunk/Source/WebCore/PAL/pal/system/win/SoundWin.cpp	                        (rev 0)
+++ trunk/Source/WebCore/PAL/pal/system/win/SoundWin.cpp	2017-06-30 16:12:17 UTC (rev 218999)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2006, 2007 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 "Sound.h"
+
+#include <Windows.h>
+
+namespace PAL {
+
+void systemBeep() { MessageBeep(static_cast<UINT>(-1)); }
+
+} // namespace PAL

Modified: trunk/Source/WebCore/PlatformGTK.cmake (218998 => 218999)


--- trunk/Source/WebCore/PlatformGTK.cmake	2017-06-30 16:08:21 UTC (rev 218998)
+++ trunk/Source/WebCore/PlatformGTK.cmake	2017-06-30 16:12:17 UTC (rev 218999)
@@ -176,7 +176,6 @@
     platform/gtk/RenderThemeGadget.cpp
     platform/gtk/RenderThemeWidget.cpp
     platform/gtk/ScrollbarThemeGtk.cpp
-    platform/gtk/SoundGtk.cpp
     platform/gtk/WidgetGtk.cpp
 
     rendering/RenderThemeGtk.cpp

Modified: trunk/Source/WebCore/PlatformMac.cmake (218998 => 218999)


--- trunk/Source/WebCore/PlatformMac.cmake	2017-06-30 16:08:21 UTC (rev 218998)
+++ trunk/Source/WebCore/PlatformMac.cmake	2017-06-30 16:12:17 UTC (rev 218999)
@@ -539,7 +539,6 @@
     platform/mac/ScrollViewMac.mm
     platform/mac/ScrollbarThemeMac.mm
     platform/mac/SerializedPlatformRepresentationMac.mm
-    platform/mac/SoundMac.mm
     platform/mac/StringUtilities.mm
     platform/mac/SuddenTermination.mm
     platform/mac/SystemSleepListenerMac.mm

Modified: trunk/Source/WebCore/PlatformWPE.cmake (218998 => 218999)


--- trunk/Source/WebCore/PlatformWPE.cmake	2017-06-30 16:08:21 UTC (rev 218998)
+++ trunk/Source/WebCore/PlatformWPE.cmake	2017-06-30 16:12:17 UTC (rev 218999)
@@ -145,7 +145,6 @@
     platform/wpe/PlatformScreenWPE.cpp
     platform/wpe/RenderThemeWPE.cpp
     platform/wpe/ScrollbarThemeWPE.cpp
-    platform/wpe/SoundWPE.cpp
     platform/wpe/ThemeWPE.cpp
     platform/wpe/WidgetWPE.cpp
 )

Modified: trunk/Source/WebCore/PlatformWin.cmake (218998 => 218999)


--- trunk/Source/WebCore/PlatformWin.cmake	2017-06-30 16:08:21 UTC (rev 218998)
+++ trunk/Source/WebCore/PlatformWin.cmake	2017-06-30 16:12:17 UTC (rev 218999)
@@ -139,7 +139,6 @@
     platform/win/ScrollbarThemeWin.cpp
     platform/win/SearchPopupMenuWin.cpp
     platform/win/SharedBufferWin.cpp
-    platform/win/SoundWin.cpp
     platform/win/StructuredExceptionHandlerSuppressor.cpp
     platform/win/SystemInfo.cpp
     platform/win/WCDataObject.cpp

Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (218998 => 218999)


--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2017-06-30 16:08:21 UTC (rev 218998)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2017-06-30 16:12:17 UTC (rev 218999)
@@ -2127,8 +2127,6 @@
 		4AD0173D127E82860015035F /* JSHTMLOutputElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AD0173B127E82860015035F /* JSHTMLOutputElement.h */; };
 		4B2708C70AF19EE40065127F /* Pasteboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B2708C50AF19EE40065127F /* Pasteboard.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		4B2709830AF2E5E00065127F /* PasteboardMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B2709810AF2E5E00065127F /* PasteboardMac.mm */; };
-		4B3043C70AE0370300A82647 /* Sound.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B3043C60AE0370300A82647 /* Sound.h */; };
-		4B3043C90AE0371D00A82647 /* SoundMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B3043C80AE0371D00A82647 /* SoundMac.mm */; };
 		4B3043CC0AE0373B00A82647 /* Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B3043CA0AE0373B00A82647 /* Editor.cpp */; };
 		4B3043CD0AE0373B00A82647 /* Editor.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B3043CB0AE0373B00A82647 /* Editor.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		4B3480930EEF50D400AC1B41 /* ImageSourceCGMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B3480910EEF50D400AC1B41 /* ImageSourceCGMac.mm */; };
@@ -6804,7 +6802,6 @@
 		E453901E0EAFCACA003695C8 /* PasteboardIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E45390190EAFCACA003695C8 /* PasteboardIOS.mm */; };
 		E45390430EAFD637003695C8 /* PlatformScreenIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E45390320EAFD637003695C8 /* PlatformScreenIOS.mm */; };
 		E45390450EAFD637003695C8 /* ScrollViewIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E45390340EAFD637003695C8 /* ScrollViewIOS.mm */; };
-		E45390470EAFD637003695C8 /* SoundIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E45390360EAFD637003695C8 /* SoundIOS.mm */; };
 		E45390490EAFD637003695C8 /* WebCoreSystemInterfaceIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E45390380EAFD637003695C8 /* WebCoreSystemInterfaceIOS.mm */; };
 		E453904D0EAFD637003695C8 /* WidgetIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E453903C0EAFD637003695C8 /* WidgetIOS.mm */; };
 		E45390AE0EAFF4B5003695C8 /* SystemMemoryIOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E45390AD0EAFF4B5003695C8 /* SystemMemoryIOS.cpp */; };
@@ -9890,8 +9887,6 @@
 		4AD0173B127E82860015035F /* JSHTMLOutputElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLOutputElement.h; sourceTree = "<group>"; };
 		4B2708C50AF19EE40065127F /* Pasteboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Pasteboard.h; sourceTree = "<group>"; };
 		4B2709810AF2E5E00065127F /* PasteboardMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PasteboardMac.mm; sourceTree = "<group>"; };
-		4B3043C60AE0370300A82647 /* Sound.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Sound.h; sourceTree = "<group>"; };
-		4B3043C80AE0371D00A82647 /* SoundMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = SoundMac.mm; sourceTree = "<group>"; };
 		4B3043CA0AE0373B00A82647 /* Editor.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Editor.cpp; sourceTree = "<group>"; };
 		4B3043CB0AE0373B00A82647 /* Editor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Editor.h; sourceTree = "<group>"; };
 		4B3480910EEF50D400AC1B41 /* ImageSourceCGMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ImageSourceCGMac.mm; sourceTree = "<group>"; };
@@ -15439,7 +15434,6 @@
 		E45390190EAFCACA003695C8 /* PasteboardIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PasteboardIOS.mm; sourceTree = "<group>"; };
 		E45390320EAFD637003695C8 /* PlatformScreenIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformScreenIOS.mm; sourceTree = "<group>"; };
 		E45390340EAFD637003695C8 /* ScrollViewIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollViewIOS.mm; sourceTree = "<group>"; };
-		E45390360EAFD637003695C8 /* SoundIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SoundIOS.mm; sourceTree = "<group>"; };
 		E45390380EAFD637003695C8 /* WebCoreSystemInterfaceIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreSystemInterfaceIOS.mm; sourceTree = "<group>"; };
 		E453903C0EAFD637003695C8 /* WidgetIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WidgetIOS.mm; sourceTree = "<group>"; };
 		E45390AD0EAFF4B5003695C8 /* SystemMemoryIOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SystemMemoryIOS.cpp; sourceTree = "<group>"; };
@@ -19190,7 +19184,6 @@
 				9353676A09AED88B00D35CD6 /* ScrollViewMac.mm */,
 				077AF14118F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.h */,
 				077AF14218F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.mm */,
-				4B3043C80AE0371D00A82647 /* SoundMac.mm */,
 				84B2B24F056BF15F00D2B771 /* SSLKeyGeneratorMac.mm */,
 				ECA680C61E67724500731D20 /* StringUtilities.h */,
 				ECA680C81E67730B00731D20 /* StringUtilities.mm */,
@@ -21227,7 +21220,6 @@
 				E45390340EAFD637003695C8 /* ScrollViewIOS.mm */,
 				BEA807C60F714A0300524199 /* SelectionRect.cpp */,
 				BEA807C70F714A0300524199 /* SelectionRect.h */,
-				E45390360EAFD637003695C8 /* SoundIOS.mm */,
 				4476531A133170990006B789 /* SSLKeyGeneratorIOS.cpp */,
 				0F03C0731884695E00A5F8CA /* SystemMemory.h */,
 				E45390AD0EAFF4B5003695C8 /* SystemMemoryIOS.cpp */,
@@ -24246,7 +24238,6 @@
 				93309EA0099EB78C0056E581 /* SharedTimer.h */,
 				CD52481818E200ED0008A07D /* SleepDisabler.cpp */,
 				CD52481918E200ED0008A07D /* SleepDisabler.h */,
-				4B3043C60AE0370300A82647 /* Sound.h */,
 				F587866202DE3B1101EA4122 /* SSLKeyGenerator.h */,
 				F433E9041DBBDBC200EF0D14 /* StaticPasteboard.cpp */,
 				F433E9021DBBDBA200EF0D14 /* StaticPasteboard.h */,
@@ -29561,7 +29552,6 @@
 				510D4A38103165EE0049EA54 /* SocketStreamHandleClient.h in Headers */,
 				51ABAE1E103C1913008C5260 /* SocketStreamHandleImpl.h in Headers */,
 				0A4844990CA44CB200B7BD48 /* SoftLinking.h in Headers */,
-				4B3043C70AE0370300A82647 /* Sound.h in Headers */,
 				84A81F3E0FC7DFF000955300 /* SourceAlpha.h in Headers */,
 				CD3A496217A9D01B00274E42 /* SourceBuffer.h in Headers */,
 				CD3A496517A9D01B00274E42 /* SourceBufferList.h in Headers */,
@@ -33421,8 +33411,6 @@
 				510D4A36103165EE0049EA54 /* SocketStreamHandle.cpp in Sources */,
 				5C668E651E7C6C4000D32B3B /* SocketStreamHandleImpl.cpp in Sources */,
 				51ABAE1F103C1913008C5260 /* SocketStreamHandleImplCFNet.cpp in Sources */,
-				E45390470EAFD637003695C8 /* SoundIOS.mm in Sources */,
-				4B3043C90AE0371D00A82647 /* SoundMac.mm in Sources */,
 				84A81F3D0FC7DFF000955300 /* SourceAlpha.cpp in Sources */,
 				CD3A496117A9D01B00274E42 /* SourceBuffer.cpp in Sources */,
 				CD3A496417A9D01B00274E42 /* SourceBufferList.cpp in Sources */,

Modified: trunk/Source/WebCore/editing/Editor.cpp (218998 => 218999)


--- trunk/Source/WebCore/editing/Editor.cpp	2017-06-30 16:08:21 UTC (rev 218998)
+++ trunk/Source/WebCore/editing/Editor.cpp	2017-06-30 16:12:17 UTC (rev 218999)
@@ -83,7 +83,6 @@
 #include "Settings.h"
 #include "ShadowRoot.h"
 #include "SimplifyMarkupCommand.h"
-#include "Sound.h"
 #include "SpellChecker.h"
 #include "SpellingCorrectionCommand.h"
 #include "StyleProperties.h"
@@ -97,6 +96,7 @@
 #include "UserTypingGestureIndicator.h"
 #include "VisibleUnits.h"
 #include "markup.h"
+#include <pal/system/Sound.h>
 #include <wtf/unicode/CharacterNames.h>
 
 #if PLATFORM(MAC)
@@ -1195,7 +1195,7 @@
     if (tryDHTMLCut())
         return; // DHTML did the whole operation
     if (!canCut()) {
-        systemBeep();
+        PAL::systemBeep();
         return;
     }
 
@@ -1207,7 +1207,7 @@
     if (tryDHTMLCopy())
         return; // DHTML did the whole operation
     if (!canCopy()) {
-        systemBeep();
+        PAL::systemBeep();
         return;
     }
 
@@ -1303,7 +1303,7 @@
 void Editor::performDelete()
 {
     if (!canDelete()) {
-        systemBeep();
+        PAL::systemBeep();
         return;
     }
 

Modified: trunk/Source/WebCore/editing/EditorCommand.cpp (218998 => 218999)


--- trunk/Source/WebCore/editing/EditorCommand.cpp	2017-06-30 16:08:21 UTC (rev 218998)
+++ trunk/Source/WebCore/editing/EditorCommand.cpp	2017-06-30 16:12:17 UTC (rev 218999)
@@ -53,7 +53,6 @@
 #include "ReplaceSelectionCommand.h"
 #include "Scrollbar.h"
 #include "Settings.h"
-#include "Sound.h"
 #include "StyleProperties.h"
 #include "TypingCommand.h"
 #include "UnlinkCommand.h"
@@ -60,6 +59,7 @@
 #include "UserGestureIndicator.h"
 #include "UserTypingGestureIndicator.h"
 #include "markup.h"
+#include <pal/system/Sound.h>
 #include <wtf/text/AtomicString.h>
 
 namespace WebCore {
@@ -1002,7 +1002,7 @@
     RefPtr<Range> mark = frame.editor().mark().toNormalizedRange();
     RefPtr<Range> selection = frame.editor().selectedRange();
     if (!mark || !selection) {
-        systemBeep();
+        PAL::systemBeep();
         return false;
     }
     frame.selection().setSelectedRange(unionDOMRanges(*mark, *selection).get(), DOWNSTREAM, true);
@@ -1061,7 +1061,7 @@
     const VisibleSelection& mark = frame.editor().mark();
     const VisibleSelection& selection = frame.selection().selection();
     if (mark.isNone() || selection.isNone()) {
-        systemBeep();
+        PAL::systemBeep();
         return false;
     }
     frame.selection().setSelection(mark);

Modified: trunk/Source/WebCore/editing/mac/EditorMac.mm (218998 => 218999)


--- trunk/Source/WebCore/editing/mac/EditorMac.mm	2017-06-30 16:08:21 UTC (rev 218998)
+++ trunk/Source/WebCore/editing/mac/EditorMac.mm	2017-06-30 16:12:17 UTC (rev 218999)
@@ -59,12 +59,12 @@
 #import "RenderImage.h"
 #import "RuntimeApplicationChecks.h"
 #import "Settings.h"
-#import "Sound.h"
 #import "StyleProperties.h"
 #import "Text.h"
 #import "TypingCommand.h"
 #import "WebNSAttributedStringExtras.h"
 #import "markup.h"
+#import <pal/system/Sound.h>
 
 namespace WebCore {
 
@@ -113,7 +113,7 @@
 void Editor::takeFindStringFromSelection()
 {
     if (!canCopyExcludingStandaloneImages()) {
-        systemBeep();
+        PAL::systemBeep();
         return;
     }
 

Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp (218998 => 218999)


--- trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp	2017-06-30 16:08:21 UTC (rev 218998)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp	2017-06-30 16:12:17 UTC (rev 218999)
@@ -49,9 +49,9 @@
 #include "Pasteboard.h"
 #include "ScriptGlobalObject.h"
 #include "ScriptState.h"
-#include "Sound.h"
 #include "UserGestureIndicator.h"
 #include <bindings/ScriptFunctionCall.h>
+#include <pal/system/Sound.h>
 #include <wtf/StdLibExtras.h>
 
 using namespace Inspector;
@@ -382,7 +382,7 @@
 
 void InspectorFrontendHost::beep()
 {
-    systemBeep();
+    PAL::systemBeep();
 }
 
 } // namespace WebCore

Deleted: trunk/Source/WebCore/platform/Sound.h (218998 => 218999)


--- trunk/Source/WebCore/platform/Sound.h	2017-06-30 16:08:21 UTC (rev 218998)
+++ trunk/Source/WebCore/platform/Sound.h	2017-06-30 16:12:17 UTC (rev 218999)
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2006 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. 
- */
-
-#ifndef Sound_h
-#define Sound_h
-
-namespace WebCore {
-
-    void systemBeep();
-
-} // namespace WebCore
-
-#endif // Sound_h

Deleted: trunk/Source/WebCore/platform/gtk/SoundGtk.cpp (218998 => 218999)


--- trunk/Source/WebCore/platform/gtk/SoundGtk.cpp	2017-06-30 16:08:21 UTC (rev 218998)
+++ trunk/Source/WebCore/platform/gtk/SoundGtk.cpp	2017-06-30 16:12:17 UTC (rev 218999)
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2007 Alp Toker <[email protected]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-
-#include "Sound.h"
-
-#include <gdk/gdk.h>
-
-namespace WebCore {
-
-void systemBeep()
-{
-    gdk_beep();
-}
-
-}
-
-// vim: ts=4 sw=4 et

Deleted: trunk/Source/WebCore/platform/ios/SoundIOS.mm (218998 => 218999)


--- trunk/Source/WebCore/platform/ios/SoundIOS.mm	2017-06-30 16:08:21 UTC (rev 218998)
+++ trunk/Source/WebCore/platform/ios/SoundIOS.mm	2017-06-30 16:12:17 UTC (rev 218999)
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2006 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.
- */
-
-#import "config.h"
-#import "Sound.h"
-
-namespace WebCore {
-
-void systemBeep() { }    
-
-} // namespace WebCore

Deleted: trunk/Source/WebCore/platform/mac/SoundMac.mm (218998 => 218999)


--- trunk/Source/WebCore/platform/mac/SoundMac.mm	2017-06-30 16:08:21 UTC (rev 218998)
+++ trunk/Source/WebCore/platform/mac/SoundMac.mm	2017-06-30 16:12:17 UTC (rev 218999)
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2006 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.
- */
-
-#import "config.h"
-#import "Sound.h"
-
-namespace WebCore {
-
-void systemBeep() { NSBeep(); }
-
-} // namespace WebCore

Deleted: trunk/Source/WebCore/platform/win/SoundWin.cpp (218998 => 218999)


--- trunk/Source/WebCore/platform/win/SoundWin.cpp	2017-06-30 16:08:21 UTC (rev 218998)
+++ trunk/Source/WebCore/platform/win/SoundWin.cpp	2017-06-30 16:12:17 UTC (rev 218999)
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2006, 2007 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 "Sound.h"
-
-#include <Windows.h>
-
-namespace WebCore {
-
-void systemBeep() { MessageBeep(static_cast<UINT>(-1)); }
-
-} // namespace WebCore
-

Deleted: trunk/Source/WebCore/platform/wpe/SoundWPE.cpp (218998 => 218999)


--- trunk/Source/WebCore/platform/wpe/SoundWPE.cpp	2017-06-30 16:08:21 UTC (rev 218998)
+++ trunk/Source/WebCore/platform/wpe/SoundWPE.cpp	2017-06-30 16:12:17 UTC (rev 218999)
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2014 Igalia S.L.
- *
- * 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. 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 INC. 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.
- */
-
-#include "config.h"
-#include "Sound.h"
-
-#include "NotImplemented.h"
-
-namespace WebCore {
-
-void systemBeep()
-{
-    notImplemented();
-}
-
-} // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to