Diff
Modified: trunk/Source/WebCore/PAL/ChangeLog (221404 => 221405)
--- trunk/Source/WebCore/PAL/ChangeLog 2017-08-30 22:54:22 UTC (rev 221404)
+++ trunk/Source/WebCore/PAL/ChangeLog 2017-08-30 23:03:52 UTC (rev 221405)
@@ -1,3 +1,18 @@
+2017-08-30 Yoshiaki Jitsukawa <[email protected]>
+
+ [PAL] Fix "None" suffix in PAL
+ https://bugs.webkit.org/show_bug.cgi?id=176014
+
+ Reviewed by Ryosuke Niwa.
+
+ * Configurations/PAL.xcconfig:
+ * PAL.xcodeproj/project.pbxproj:
+ * pal/PlatformGTK.cmake:
+ * pal/PlatformWPE.cmake:
+ * pal/PlatformWin.cmake:
+ * pal/system/Sound.cpp: Renamed from Source/WebCore/PAL/pal/system/SoundNone.cpp.
+ * pal/text/KillRing.cpp: Renamed from Source/WebCore/PAL/pal/text/KillRingNone.cpp.
+
2017-08-30 Eric Carlson <[email protected]>
Add Logger observer and helper class
Modified: trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig (221404 => 221405)
--- trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig 2017-08-30 22:54:22 UTC (rev 221404)
+++ trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig 2017-08-30 23:03:52 UTC (rev 221405)
@@ -57,7 +57,7 @@
PRODUCTION_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.tiff *Cursor.png *Mac.mm;
-EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = *IOS.h *IOS.cpp *IOS.mm KillRingNone.cpp SoundNone.cpp;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = *IOS.h *IOS.cpp *IOS.mm KillRing.cpp Sound.cpp;
WK_EMPTY_ = YES;
WK_NOT_ = YES;
Modified: trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj (221404 => 221405)
--- trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj 2017-08-30 22:54:22 UTC (rev 221404)
+++ trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj 2017-08-30 23:03:52 UTC (rev 221405)
@@ -103,10 +103,10 @@
A102658E1F567E9D00B4C844 /* HIServicesSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = A102658D1F567E9D00B4C844 /* HIServicesSPI.h */; };
A1F55DCF1F5528EC00EDB75F /* MetadataSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = A1F55DCE1F5528EC00EDB75F /* MetadataSPI.h */; };
A30D41211F0DD0EA00B71954 /* KillRing.h in Headers */ = {isa = PBXBuildFile; fileRef = A30D411E1F0DD0EA00B71954 /* KillRing.h */; };
- A30D41221F0DD0EA00B71954 /* KillRingNone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A30D411F1F0DD0EA00B71954 /* KillRingNone.cpp */; };
+ A30D41221F0DD0EA00B71954 /* KillRing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A30D411F1F0DD0EA00B71954 /* KillRing.cpp */; };
A30D41251F0DD12D00B71954 /* KillRingMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A30D41241F0DD12D00B71954 /* KillRingMac.mm */; };
A3788E981F05B6CE00679425 /* Sound.h in Headers */ = {isa = PBXBuildFile; fileRef = A3788E971F05B6CE00679425 /* Sound.h */; };
- A3788E9C1F05B78200679425 /* SoundNone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3788E9B1F05B78200679425 /* SoundNone.cpp */; };
+ A3788E9C1F05B78200679425 /* Sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3788E9B1F05B78200679425 /* Sound.cpp */; };
A3788E9E1F05B78E00679425 /* SoundMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A3788E9D1F05B78E00679425 /* SoundMac.mm */; };
A3AB6E521F3D1DC5009C14B1 /* SleepDisabler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3AB6E511F3D1DC5009C14B1 /* SleepDisabler.cpp */; };
A3AB6E561F3D1DDB009C14B1 /* SleepDisabler.h in Headers */ = {isa = PBXBuildFile; fileRef = A3AB6E531F3D1DDB009C14B1 /* SleepDisabler.h */; };
@@ -219,10 +219,10 @@
A102658D1F567E9D00B4C844 /* HIServicesSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HIServicesSPI.h; sourceTree = "<group>"; };
A1F55DCE1F5528EC00EDB75F /* MetadataSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MetadataSPI.h; sourceTree = "<group>"; };
A30D411E1F0DD0EA00B71954 /* KillRing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KillRing.h; sourceTree = "<group>"; };
- A30D411F1F0DD0EA00B71954 /* KillRingNone.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KillRingNone.cpp; sourceTree = "<group>"; };
+ A30D411F1F0DD0EA00B71954 /* KillRing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KillRing.cpp; sourceTree = "<group>"; };
A30D41241F0DD12D00B71954 /* KillRingMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KillRingMac.mm; sourceTree = "<group>"; };
A3788E971F05B6CE00679425 /* Sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Sound.h; sourceTree = "<group>"; };
- A3788E9B1F05B78200679425 /* SoundNone.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SoundNone.cpp; sourceTree = "<group>"; };
+ A3788E9B1F05B78200679425 /* Sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Sound.cpp; sourceTree = "<group>"; };
A3788E9D1F05B78E00679425 /* SoundMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SoundMac.mm; sourceTree = "<group>"; };
A3AB6E511F3D1DC5009C14B1 /* SleepDisabler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SleepDisabler.cpp; sourceTree = "<group>"; };
A3AB6E531F3D1DDB009C14B1 /* SleepDisabler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SleepDisabler.h; sourceTree = "<group>"; };
@@ -438,8 +438,8 @@
isa = PBXGroup;
children = (
A30D41231F0DD10500B71954 /* mac */,
+ A30D411F1F0DD0EA00B71954 /* KillRing.cpp */,
A30D411E1F0DD0EA00B71954 /* KillRing.h */,
- A30D411F1F0DD0EA00B71954 /* KillRingNone.cpp */,
);
path = text;
sourceTree = "<group>";
@@ -459,8 +459,8 @@
A3788EA01F05B7E200679425 /* mac */,
A3AB6E511F3D1DC5009C14B1 /* SleepDisabler.cpp */,
A3AB6E531F3D1DDB009C14B1 /* SleepDisabler.h */,
+ A3788E9B1F05B78200679425 /* Sound.cpp */,
A3788E971F05B6CE00679425 /* Sound.h */,
- A3788E9B1F05B78200679425 /* SoundNone.cpp */,
A3AB6E541F3D1DDB009C14B1 /* SystemSleepListener.cpp */,
A3AB6E551F3D1DDB009C14B1 /* SystemSleepListener.h */,
);
@@ -669,13 +669,13 @@
buildActionMask = 2147483647;
files = (
1C09D0561E31C46500725F18 /* CryptoDigestCommonCrypto.cpp in Sources */,
+ A30D41221F0DD0EA00B71954 /* KillRing.cpp in Sources */,
A30D41251F0DD12D00B71954 /* KillRingMac.mm in Sources */,
- A30D41221F0DD0EA00B71954 /* KillRingNone.cpp in Sources */,
A3C66CDC1F462D6A009E6EE9 /* SessionID.cpp in Sources */,
A3AB6E521F3D1DC5009C14B1 /* SleepDisabler.cpp in Sources */,
A3AB6E601F3D1E39009C14B1 /* SleepDisablerCocoa.cpp in Sources */,
+ A3788E9C1F05B78200679425 /* Sound.cpp in Sources */,
A3788E9E1F05B78E00679425 /* SoundMac.mm in Sources */,
- A3788E9C1F05B78200679425 /* SoundNone.cpp in Sources */,
A3AB6E571F3D1DDB009C14B1 /* SystemSleepListener.cpp in Sources */,
A3AB6E651F3D217F009C14B1 /* SystemSleepListenerMac.mm in Sources */,
);
Modified: trunk/Source/WebCore/PAL/pal/PlatformGTK.cmake (221404 => 221405)
--- trunk/Source/WebCore/PAL/pal/PlatformGTK.cmake 2017-08-30 22:54:22 UTC (rev 221404)
+++ trunk/Source/WebCore/PAL/pal/PlatformGTK.cmake 2017-08-30 23:03:52 UTC (rev 221405)
@@ -3,7 +3,7 @@
system/gtk/SoundGtk.cpp
- text/KillRingNone.cpp
+ text/KillRing.cpp
)
if (ENABLE_SUBTLE_CRYPTO)
Modified: trunk/Source/WebCore/PAL/pal/PlatformWPE.cmake (221404 => 221405)
--- trunk/Source/WebCore/PAL/pal/PlatformWPE.cmake 2017-08-30 22:54:22 UTC (rev 221404)
+++ trunk/Source/WebCore/PAL/pal/PlatformWPE.cmake 2017-08-30 23:03:52 UTC (rev 221405)
@@ -1,9 +1,9 @@
list(APPEND PAL_SOURCES
crypto/gcrypt/CryptoDigestGCrypt.cpp
- system/SoundNone.cpp
+ system/Sound.cpp
- text/KillRingNone.cpp
+ text/KillRing.cpp
)
if (ENABLE_SUBTLE_CRYPTO)
Modified: trunk/Source/WebCore/PAL/pal/PlatformWin.cmake (221404 => 221405)
--- trunk/Source/WebCore/PAL/pal/PlatformWin.cmake 2017-08-30 22:54:22 UTC (rev 221404)
+++ trunk/Source/WebCore/PAL/pal/PlatformWin.cmake 2017-08-30 23:03:52 UTC (rev 221405)
@@ -3,7 +3,7 @@
system/win/SoundWin.cpp
- text/KillRingNone.cpp
+ text/KillRing.cpp
)
list(APPEND PAL_INCLUDE_DIRECTORIES
Copied: trunk/Source/WebCore/PAL/pal/system/Sound.cpp (from rev 221404, trunk/Source/WebCore/PAL/pal/system/SoundNone.cpp) (0 => 221405)
--- trunk/Source/WebCore/PAL/pal/system/Sound.cpp (rev 0)
+++ trunk/Source/WebCore/PAL/pal/system/Sound.cpp 2017-08-30 23:03:52 UTC (rev 221405)
@@ -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
Deleted: trunk/Source/WebCore/PAL/pal/system/SoundNone.cpp (221404 => 221405)
--- trunk/Source/WebCore/PAL/pal/system/SoundNone.cpp 2017-08-30 22:54:22 UTC (rev 221404)
+++ trunk/Source/WebCore/PAL/pal/system/SoundNone.cpp 2017-08-30 23:03:52 UTC (rev 221405)
@@ -1,33 +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"
-
-namespace PAL {
-
-void systemBeep() { }
-
-} // namespace PAL
Copied: trunk/Source/WebCore/PAL/pal/text/KillRing.cpp (from rev 221404, trunk/Source/WebCore/PAL/pal/text/KillRingNone.cpp) (0 => 221405)
--- trunk/Source/WebCore/PAL/pal/text/KillRing.cpp (rev 0)
+++ trunk/Source/WebCore/PAL/pal/text/KillRing.cpp 2017-08-30 23:03:52 UTC (rev 221405)
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2010 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 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 "KillRing.h"
+
+namespace PAL {
+
+void KillRing::append(const String&)
+{
+}
+
+void KillRing::prepend(const String&)
+{
+}
+
+String KillRing::yank()
+{
+ return String();
+}
+
+void KillRing::startNewSequence()
+{
+}
+
+void KillRing::setToYankedState()
+{
+}
+
+} // namespace PAL
Deleted: trunk/Source/WebCore/PAL/pal/text/KillRingNone.cpp (221404 => 221405)
--- trunk/Source/WebCore/PAL/pal/text/KillRingNone.cpp 2017-08-30 22:54:22 UTC (rev 221404)
+++ trunk/Source/WebCore/PAL/pal/text/KillRingNone.cpp 2017-08-30 23:03:52 UTC (rev 221405)
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2010 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 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 "KillRing.h"
-
-namespace PAL {
-
-void KillRing::append(const String&)
-{
-}
-
-void KillRing::prepend(const String&)
-{
-}
-
-String KillRing::yank()
-{
- return String();
-}
-
-void KillRing::startNewSequence()
-{
-}
-
-void KillRing::setToYankedState()
-{
-}
-
-} // namespace PAL
