[PAL] Fix "None" suffix in PAL
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Aug 2017 23:03:52 +0000 (23:03 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Aug 2017 23:03:52 +0000 (23:03 +0000)
https://bugs.webkit.org/show_bug.cgi?id=176014

Patch by Yoshiaki Jitsukawa <Yoshiaki.Jitsukawa@sony.com> on 2017-08-30
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.

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

Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/Configurations/PAL.xcconfig
Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
Source/WebCore/PAL/pal/PlatformGTK.cmake
Source/WebCore/PAL/pal/PlatformWPE.cmake
Source/WebCore/PAL/pal/PlatformWin.cmake
Source/WebCore/PAL/pal/system/Sound.cpp [moved from Source/WebCore/PAL/pal/system/SoundNone.cpp with 100% similarity]
Source/WebCore/PAL/pal/text/KillRing.cpp [moved from Source/WebCore/PAL/pal/text/KillRingNone.cpp with 100% similarity]

index c2ceb94..04b33f4 100644 (file)
@@ -1,3 +1,18 @@
+2017-08-30  Yoshiaki Jitsukawa  <Yoshiaki.Jitsukawa@sony.com>
+
+        [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  <eric.carlson@apple.com>
 
         Add Logger observer and helper class
index 50705d4..320d09c 100644 (file)
@@ -57,7 +57,7 @@ PRODUCTION_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_PRODUCTION_F
 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;
index d9858f9..2b4afcd 100644 (file)
                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 */; };
                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>"; };
                        isa = PBXGroup;
                        children = (
                                A30D41231F0DD10500B71954 /* mac */,
+                               A30D411F1F0DD0EA00B71954 /* KillRing.cpp */,
                                A30D411E1F0DD0EA00B71954 /* KillRing.h */,
-                               A30D411F1F0DD0EA00B71954 /* KillRingNone.cpp */,
                        );
                        path = text;
                        sourceTree = "<group>";
                                A3788EA01F05B7E200679425 /* mac */,
                                A3AB6E511F3D1DC5009C14B1 /* SleepDisabler.cpp */,
                                A3AB6E531F3D1DDB009C14B1 /* SleepDisabler.h */,
+                               A3788E9B1F05B78200679425 /* Sound.cpp */,
                                A3788E971F05B6CE00679425 /* Sound.h */,
-                               A3788E9B1F05B78200679425 /* SoundNone.cpp */,
                                A3AB6E541F3D1DDB009C14B1 /* SystemSleepListener.cpp */,
                                A3AB6E551F3D1DDB009C14B1 /* SystemSleepListener.h */,
                        );
                        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 */,
                        );
index f1dcc17..674661b 100644 (file)
@@ -3,7 +3,7 @@ list(APPEND PAL_SOURCES
 
     system/gtk/SoundGtk.cpp
 
-    text/KillRingNone.cpp
+    text/KillRing.cpp
 )
 
 if (ENABLE_SUBTLE_CRYPTO)
index 2377c34..1f9ca22 100644 (file)
@@ -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)
index 2069c3a..6e13855 100644 (file)
@@ -3,7 +3,7 @@ list(APPEND PAL_SOURCES
 
     system/win/SoundWin.cpp
 
-    text/KillRingNone.cpp
+    text/KillRing.cpp
 )
 
 list(APPEND PAL_INCLUDE_DIRECTORIES