[PAL] Move KillRing into PAL

https://bugs.webkit.org/show_bug.cgi?id=173900

Reviewed by Myles C. Maxfield.

No new tests. No change in functionality.

Source/WebCore:

* Configurations/WebCore.xcconfig:
* PlatformGTK.cmake:
* PlatformMac.cmake:
* PlatformWPE.cmake:
* PlatformWin.cmake:
* WebCore.xcodeproj/project.pbxproj:
* editing/Editor.cpp:
(WebCore::Editor::Editor):
* editing/Editor.h:
(WebCore::Editor::killRing):
* editing/EditorCommand.cpp:

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/text/KillRing.h: Renamed from Source/WebCore/platform/KillRing.h.
* pal/text/KillRingNone.cpp: Renamed from Source/WebCore/platform/KillRingNone.cpp.
* pal/text/mac/KillRingMac.mm: Renamed from Source/WebCore/platform/mac/KillRingMac.mm.

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 659639c..7008414 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,24 @@
+2017-07-06  Don Olmstead  <don.olmstead@sony.com>
+
+        [PAL] Move KillRing into PAL
+        https://bugs.webkit.org/show_bug.cgi?id=173900
+
+        Reviewed by Myles C. Maxfield.
+
+        No new tests. No change in functionality.
+
+        * Configurations/WebCore.xcconfig:
+        * PlatformGTK.cmake:
+        * PlatformMac.cmake:
+        * PlatformWPE.cmake:
+        * PlatformWin.cmake:
+        * WebCore.xcodeproj/project.pbxproj:
+        * editing/Editor.cpp:
+        (WebCore::Editor::Editor):
+        * editing/Editor.h:
+        (WebCore::Editor::killRing):
+        * editing/EditorCommand.cpp:
+
 2017-07-06  Devin Rousso  <drousso@apple.com>
 
         Web Inspector: Support getting the content of WebGL/WebGL2 contexts

diff --git a/Source/WebCore/Configurations/WebCore.xcconfig b/Source/WebCore/Configurations/WebCore.xcconfig
index d3b0e09..998e0ae 100644 (file)
--- a/Source/WebCore/Configurations/WebCore.xcconfig
+++ b/Source/WebCore/Configurations/WebCore.xcconfig
@@ -116,8 +116,8 @@ EXCLUDED_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS_IF_ENABLED_ = JSTouch*;
 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 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);
+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 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 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;
 WK_NOT_ = YES;

diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
index 6323f8f..b477654 100644 (file)
--- a/Source/WebCore/PAL/ChangeLog
+++ b/Source/WebCore/PAL/ChangeLog
@@ -1,3 +1,23 @@
+2017-07-06  Don Olmstead  <don.olmstead@sony.com>
+
+        [PAL] Move KillRing into PAL
+        https://bugs.webkit.org/show_bug.cgi?id=173900
+
+        Reviewed by Myles C. Maxfield.
+
+        No new tests. No change in functionality.
+
+        * Configurations/PAL.xcconfig:
+        * PAL.xcodeproj/project.pbxproj:
+        * pal/CMakeLists.txt:
+        * pal/PlatformGTK.cmake:
+        * pal/PlatformMac.cmake:
+        * pal/PlatformWPE.cmake:
+        * pal/PlatformWin.cmake:
+        * pal/text/KillRing.h: Renamed from Source/WebCore/platform/KillRing.h.
+        * pal/text/KillRingNone.cpp: Renamed from Source/WebCore/platform/KillRingNone.cpp.
+        * pal/text/mac/KillRingMac.mm: Renamed from Source/WebCore/platform/mac/KillRingMac.mm.
+
 2017-07-05  Jonathan Bedard  <jbedard@apple.com>
 
         Add WebKitPrivateFrameworkStubs for iOS 11

diff --git a/Source/WebCore/PAL/Configurations/PAL.xcconfig b/Source/WebCore/PAL/Configurations/PAL.xcconfig
index 08a2e4b..50705d4 100644 (file)
--- a/Source/WebCore/PAL/Configurations/PAL.xcconfig
+++ b/Source/WebCore/PAL/Configurations/PAL.xcconfig
@@ -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 SoundNone.cpp;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = *IOS.h *IOS.cpp *IOS.mm KillRingNone.cpp SoundNone.cpp;
 
 WK_EMPTY_ = YES;
 WK_NOT_ = YES;

diff --git a/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj b/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
index 95f0a49..b4b7835 100644 (file)
--- a/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
+++ b/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
@@ -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 */; };
+               A30D41211F0DD0EA00B71954 /* KillRing.h in Headers */ = {isa = PBXBuildFile; fileRef = A30D411E1F0DD0EA00B71954 /* KillRing.h */; };
+               A30D41221F0DD0EA00B71954 /* KillRingNone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A30D411F1F0DD0EA00B71954 /* KillRingNone.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 */; };
                A3788E9E1F05B78E00679425 /* SoundMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A3788E9D1F05B78E00679425 /* SoundMac.mm */; };
@@ -51,6 +54,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>"; };
+               A30D411E1F0DD0EA00B71954 /* KillRing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KillRing.h; path = text/KillRing.h; sourceTree = "<group>"; };
+               A30D411F1F0DD0EA00B71954 /* KillRingNone.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KillRingNone.cpp; path = text/KillRingNone.cpp; sourceTree = "<group>"; };
+               A30D41241F0DD12D00B71954 /* KillRingMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = KillRingMac.mm; path = text/mac/KillRingMac.mm; 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>"; };
@@ -91,6 +97,7 @@
                        children = (
                                1C09D0511E31C41200725F18 /* crypto */,
                                A3788E9F1F05B7CE00679425 /* system */,
+                               A30D411D1F0DD0AC00B71954 /* text */,
                                0C2D9E721EEF5AF600DBC317 /* ExportMacros.h */,
                        );
                        path = pal;
@@ -126,6 +133,24 @@
                        path = Configurations;
                        sourceTree = "<group>";
                };
+               A30D411D1F0DD0AC00B71954 /* text */ = {
+                       isa = PBXGroup;
+                       children = (
+                               A30D41231F0DD10500B71954 /* mac */,
+                               A30D411E1F0DD0EA00B71954 /* KillRing.h */,
+                               A30D411F1F0DD0EA00B71954 /* KillRingNone.cpp */,
+                       );
+                       name = text;
+                       sourceTree = "<group>";
+               };
+               A30D41231F0DD10500B71954 /* mac */ = {
+                       isa = PBXGroup;
+                       children = (
+                               A30D41241F0DD12D00B71954 /* KillRingMac.mm */,
+                       );
+                       name = mac;
+                       sourceTree = "<group>";
+               };
                A3788E9F1F05B7CE00679425 /* system */ = {
                        isa = PBXGroup;
                        children = (
@@ -155,6 +180,7 @@
                                1C09D0531E31C44100725F18 /* CryptoDigest.h in Headers */,
                                A3788E981F05B6CE00679425 /* Sound.h in Headers */,
                                0C2D9E731EEF5AF600DBC317 /* ExportMacros.h in Headers */,
+                               A30D41211F0DD0EA00B71954 /* KillRing.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -244,8 +270,10 @@
                        buildActionMask = 2147483647;
                        files = (
                                1C09D0561E31C46500725F18 /* CryptoDigestCommonCrypto.cpp in Sources */,
+                               A30D41221F0DD0EA00B71954 /* KillRingNone.cpp in Sources */,
                                A3788E9E1F05B78E00679425 /* SoundMac.mm in Sources */,
                                A3788E9C1F05B78200679425 /* SoundNone.cpp in Sources */,
+                               A30D41251F0DD12D00B71954 /* KillRingMac.mm in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --git a/Source/WebCore/PAL/pal/CMakeLists.txt b/Source/WebCore/PAL/pal/CMakeLists.txt
index 3128e18..420438d 100644 (file)
--- a/Source/WebCore/PAL/pal/CMakeLists.txt
+++ b/Source/WebCore/PAL/pal/CMakeLists.txt
@@ -9,6 +9,7 @@ set(PAL_PRIVATE_INCLUDE_DIRECTORIES
     "${PAL_DIR}/pal"
     "${PAL_DIR}/pal/crypto"
     "${PAL_DIR}/pal/system"
+    "${PAL_DIR}/pal/text"
 )
 
 set(PAL_LIBRARIES

diff --git a/Source/WebCore/PAL/pal/PlatformGTK.cmake b/Source/WebCore/PAL/pal/PlatformGTK.cmake
index 1942b4a..1cdd745 100644 (file)
--- a/Source/WebCore/PAL/pal/PlatformGTK.cmake
+++ b/Source/WebCore/PAL/pal/PlatformGTK.cmake
@@ -4,6 +4,8 @@ list(APPEND PAL_SOURCES
     crypto/tasn1/Utilities.cpp
 
     system/gtk/SoundGtk.cpp
+
+    text/KillRingNone.cpp
 )
 
 list(APPEND PAL_SYSTEM_INCLUDE_DIRECTORIES

diff --git a/Source/WebCore/PAL/pal/PlatformMac.cmake b/Source/WebCore/PAL/pal/PlatformMac.cmake
index 8c6c8b0..42878a6 100644 (file)
--- a/Source/WebCore/PAL/pal/PlatformMac.cmake
+++ b/Source/WebCore/PAL/pal/PlatformMac.cmake
@@ -2,4 +2,6 @@ list(APPEND PAL_SOURCES
     crypto/commoncrypto/CryptoDigestCommonCrypto.cpp
 
     system/mac/SoundMac.mm
+
+    text/mac/KillRingMac.mm
 )

diff --git a/Source/WebCore/PAL/pal/PlatformWPE.cmake b/Source/WebCore/PAL/pal/PlatformWPE.cmake
index 71a32d2..a2cd2fe 100644 (file)
--- a/Source/WebCore/PAL/pal/PlatformWPE.cmake
+++ b/Source/WebCore/PAL/pal/PlatformWPE.cmake
@@ -4,4 +4,6 @@ list(APPEND PAL_SOURCES
     crypto/tasn1/Utilities.cpp
 
     system/SoundNone.cpp
+
+    text/KillRingNone.cpp
 )

diff --git a/Source/WebCore/PAL/pal/PlatformWin.cmake b/Source/WebCore/PAL/pal/PlatformWin.cmake
index ebe0b16..7f34c12 100644 (file)
--- a/Source/WebCore/PAL/pal/PlatformWin.cmake
+++ b/Source/WebCore/PAL/pal/PlatformWin.cmake
@@ -2,6 +2,8 @@ list(APPEND PAL_SOURCES
     crypto/win/CryptoDigestWin.cpp
 
     system/win/SoundWin.cpp
+
+    text/KillRingNone.cpp
 )
 
 set(PAL_OUTPUT_NAME PAL${DEBUG_SUFFIX})

diff --git a/Source/WebCore/platform/KillRing.h b/Source/WebCore/PAL/pal/text/KillRing.h
similarity index 85%
rename from Source/WebCore/platform/KillRing.h
rename to Source/WebCore/PAL/pal/text/KillRing.h
index b55a784..d50b24a 100644 (file)
--- a/Source/WebCore/platform/KillRing.h
+++ b/Source/WebCore/PAL/pal/text/KillRing.h
@@ -23,23 +23,20 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef KillRing_h
-#define KillRing_h
+#pragma once
 
 #include <wtf/text/WTFString.h>
 
-namespace WebCore {
+namespace PAL {
 
 class KillRing {
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    void append(const String&);
-    void prepend(const String&);
-    String yank();
-    void startNewSequence();
-    void setToYankedState();
+    PAL_EXPORT void append(const String&);
+    PAL_EXPORT void prepend(const String&);
+    PAL_EXPORT String yank();
+    PAL_EXPORT void startNewSequence();
+    PAL_EXPORT void setToYankedState();
 };
 
-} // namespace WebCore
-
-#endif // KillRing_h
+} // namespace PAL

diff --git a/Source/WebCore/platform/KillRingNone.cpp b/Source/WebCore/PAL/pal/text/KillRingNone.cpp
similarity index 97%
rename from Source/WebCore/platform/KillRingNone.cpp
rename to Source/WebCore/PAL/pal/text/KillRingNone.cpp
index cd946a4..73dd5bd 100644 (file)
--- a/Source/WebCore/platform/KillRingNone.cpp
+++ b/Source/WebCore/PAL/pal/text/KillRingNone.cpp
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "KillRing.h"
 
-namespace WebCore {
+namespace PAL {
 
 void KillRing::append(const String&)
 {
@@ -49,5 +49,4 @@ void KillRing::setToYankedState()
 {
 }
 
-} // namespace WebCore
-
+} // namespace PAL

diff --git a/Source/WebCore/platform/mac/KillRingMac.mm b/Source/WebCore/PAL/pal/text/mac/KillRingMac.mm
similarity index 98%
rename from Source/WebCore/platform/mac/KillRingMac.mm
rename to Source/WebCore/PAL/pal/text/mac/KillRingMac.mm
index a13534c..e9af442 100644 (file)
--- a/Source/WebCore/platform/mac/KillRingMac.mm
+++ b/Source/WebCore/PAL/pal/text/mac/KillRingMac.mm
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "KillRing.h"
 
-namespace WebCore {
+namespace PAL {
 
 extern "C" {
 
@@ -85,5 +85,5 @@ void KillRing::setToYankedState()
     _NSSetKillRingToYankedState();
 }
 
-} // namespace WebCore
+} // namespace PAL
 

diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
index 87b4c5c..355e919 100644 (file)
--- a/Source/WebCore/PlatformGTK.cmake
+++ b/Source/WebCore/PlatformGTK.cmake
@@ -62,7 +62,6 @@ list(APPEND WebCore_SOURCES
     page/linux/ResourceUsageOverlayLinux.cpp
     page/linux/ResourceUsageThreadLinux.cpp
 
-    platform/KillRingNone.cpp
     platform/ScrollAnimationKinetic.cpp
     platform/StaticPasteboard.cpp
     platform/UserAgentQuirks.cpp

diff --git a/Source/WebCore/PlatformMac.cmake b/Source/WebCore/PlatformMac.cmake
index 9072405..4d2207c 100644 (file)
--- a/Source/WebCore/PlatformMac.cmake
+++ b/Source/WebCore/PlatformMac.cmake
@@ -517,7 +517,6 @@ list(APPEND WebCore_SOURCES
     platform/mac/EventLoopMac.mm
     platform/mac/FileSystemMac.mm
     platform/mac/KeyEventMac.mm
-    platform/mac/KillRingMac.mm
     platform/mac/LocalCurrentGraphicsContext.mm
     platform/mac/LoggingMac.mm
     platform/mac/MediaRemoteSoftLink.cpp

diff --git a/Source/WebCore/PlatformWPE.cmake b/Source/WebCore/PlatformWPE.cmake
index 4f6bbb1..9c8a55c 100644 (file)
--- a/Source/WebCore/PlatformWPE.cmake
+++ b/Source/WebCore/PlatformWPE.cmake
@@ -63,7 +63,6 @@ list(APPEND WebCore_SOURCES
     page/scrolling/coordinatedgraphics/ScrollingStateNodeCoordinatedGraphics.cpp
 
     platform/Cursor.cpp
-    platform/KillRingNone.cpp
     platform/PlatformStrategies.cpp
     platform/Theme.cpp
 

diff --git a/Source/WebCore/PlatformWin.cmake b/Source/WebCore/PlatformWin.cmake
index 0ce4141..03121b5 100644 (file)
--- a/Source/WebCore/PlatformWin.cmake
+++ b/Source/WebCore/PlatformWin.cmake
@@ -58,7 +58,6 @@ list(APPEND WebCore_SOURCES
     page/win/FrameWin.cpp
 
     platform/Cursor.cpp
-    platform/KillRingNone.cpp
     platform/LocalizedStrings.cpp
     platform/StaticPasteboard.cpp
 

diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
index 8211cb9..71cd819 100644 (file)
--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -1813,7 +1813,6 @@
                41F54F8E1C50C50C00338488 /* FetchRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41F54F871C50C4F600338488 /* FetchRequest.cpp */; };
                41FA303E1316C29C00C0BFC5 /* RenderMediaControls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41FA303C1316C29C00C0BFC5 /* RenderMediaControls.cpp */; };
                41FA303F1316C29C00C0BFC5 /* RenderMediaControls.h in Headers */ = {isa = PBXBuildFile; fileRef = 41FA303D1316C29C00C0BFC5 /* RenderMediaControls.h */; };
-               4306E4E614955543007F17AC /* KillRingNone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4306E4E514955543007F17AC /* KillRingNone.cpp */; };
                43107BE218CC19DE00CC18E8 /* SelectorPseudoTypeMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 43107BE118CC19DE00CC18E8 /* SelectorPseudoTypeMap.h */; };
                43142E7A13B1E97700F1C871 /* SVGAnimatedRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43142E7913B1E97700F1C871 /* SVGAnimatedRect.cpp */; };
                431A2F9C13B6F2B0007791E4 /* SVGAnimatedNumberOptionalNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = 431A2F9A13B6F2B0007791E4 /* SVGAnimatedNumberOptionalNumber.h */; };
@@ -2477,8 +2476,6 @@
                51FB67DB1AE6B82B00D06C5A /* ContentExtensionStyleSheet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51FB67D91AE6B5E400D06C5A /* ContentExtensionStyleSheet.cpp */; };
                51FB67DC1AE6B82F00D06C5A /* ContentExtensionStyleSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FB67DA1AE6B5E400D06C5A /* ContentExtensionStyleSheet.h */; settings = {ATTRIBUTES = (Private, ); }; };
                52131E5B1C4F15760033F802 /* WebVideoFullscreenInterfaceMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 52131E5A1C4F15610033F802 /* WebVideoFullscreenInterfaceMac.mm */; };
-               521D46F611AEC98100514613 /* KillRingMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 521D46F511AEC98100514613 /* KillRingMac.mm */; };
-               521D46F811AEC9B100514613 /* KillRing.h in Headers */ = {isa = PBXBuildFile; fileRef = 521D46F711AEC9B100514613 /* KillRing.h */; };
                526724F31CB2FEAD0075974D /* TextTrackRepresentationCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 526724F11CB2FDF60075974D /* TextTrackRepresentationCocoa.mm */; };
                52B0D4BE1C57FD1E0077CE53 /* PlatformView.h in Headers */ = {isa = PBXBuildFile; fileRef = 52B0D4BD1C57FD1E0077CE53 /* PlatformView.h */; settings = {ATTRIBUTES = (Private, ); }; };
                52B0D4C01C57FD660077CE53 /* WebVideoFullscreenChangeObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 52B0D4BF1C57FD660077CE53 /* WebVideoFullscreenChangeObserver.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -9522,7 +9519,6 @@
                41F54F891C50C4F600338488 /* FetchRequest.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = FetchRequest.idl; sourceTree = "<group>"; };
                41FA303C1316C29C00C0BFC5 /* RenderMediaControls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderMediaControls.cpp; sourceTree = "<group>"; };
                41FA303D1316C29C00C0BFC5 /* RenderMediaControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderMediaControls.h; sourceTree = "<group>"; };
-               4306E4E514955543007F17AC /* KillRingNone.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KillRingNone.cpp; sourceTree = "<group>"; };
                43107BE118CC19DE00CC18E8 /* SelectorPseudoTypeMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectorPseudoTypeMap.h; sourceTree = "<group>"; };
                43142E7913B1E97700F1C871 /* SVGAnimatedRect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedRect.cpp; sourceTree = "<group>"; };
                431A2F9A13B6F2B0007791E4 /* SVGAnimatedNumberOptionalNumber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedNumberOptionalNumber.h; sourceTree = "<group>"; };
@@ -10265,8 +10261,6 @@
                51FB67D91AE6B5E400D06C5A /* ContentExtensionStyleSheet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContentExtensionStyleSheet.cpp; sourceTree = "<group>"; };
                51FB67DA1AE6B5E400D06C5A /* ContentExtensionStyleSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContentExtensionStyleSheet.h; sourceTree = "<group>"; };
                52131E5A1C4F15610033F802 /* WebVideoFullscreenInterfaceMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebVideoFullscreenInterfaceMac.mm; sourceTree = "<group>"; };
-               521D46F511AEC98100514613 /* KillRingMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KillRingMac.mm; sourceTree = "<group>"; };
-               521D46F711AEC9B100514613 /* KillRing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KillRing.h; sourceTree = "<group>"; };
                526724F11CB2FDF60075974D /* TextTrackRepresentationCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TextTrackRepresentationCocoa.mm; sourceTree = "<group>"; };
                526724F21CB2FDF60075974D /* TextTrackRepresentationCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextTrackRepresentationCocoa.h; sourceTree = "<group>"; };
                52B0D4BD1C57FD1E0077CE53 /* PlatformView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformView.h; sourceTree = "<group>"; };
@@ -19145,7 +19139,6 @@
                                1CA19E030DC255950065A994 /* EventLoopMac.mm */,
                                A1CC11621E493D0100EFA69C /* FileSystemMac.mm */,
                                935C476E09AC4D7300A6AAB4 /* KeyEventMac.mm */,
-                               521D46F511AEC98100514613 /* KillRingMac.mm */,
                                06E81ED60AB5D5E900C87837 /* LocalCurrentGraphicsContext.h */,
                                06E81EEB0AB5DA9700C87837 /* LocalCurrentGraphicsContext.mm */,
                                1402645D0AFDC19B005919E2 /* LoggingMac.mm */,
@@ -24142,8 +24135,6 @@
                                862F129F18C1DCE4005C54AF /* HysteresisActivity.h */,
                                1AE00D57182DAC8D00087DD7 /* KeyedCoding.h */,
                                E15FF7D418C9553800FE4C87 /* KeypressCommand.h */,
-                               521D46F711AEC9B100514613 /* KillRing.h */,
-                               4306E4E514955543007F17AC /* KillRingNone.cpp */,
                                E18772F0126E2629003DD586 /* Language.cpp */,
                                85EC9AF90A71A2C600EEEAED /* Language.h */,
                                141DC0471648348F00371E5A /* LayoutUnit.h */,
@@ -28604,7 +28595,6 @@
                                316FE11A0E6E1DA700BF6088 /* KeyframeAnimation.h in Headers */,
                                BC5EBA110E823E4700B25965 /* KeyframeList.h in Headers */,
                                E15FF7D518C9553800FE4C87 /* KeypressCommand.h in Headers */,
-                               521D46F811AEC9B100514613 /* KillRing.h in Headers */,
                                450CEBF115073BBE002BB149 /* LabelableElement.h in Headers */,
                                A456FA2711AD4A830020B420 /* LabelsNodeList.h in Headers */,
                                85EC9AFB0A71A2C600EEEAED /* Language.h in Headers */,
@@ -32656,8 +32646,6 @@
                                316FE1190E6E1DA700BF6088 /* KeyframeAnimation.cpp in Sources */,
                                12A253DB1C8FF7DC00C22295 /* KeyframeEffect.cpp in Sources */,
                                BC5EBA100E823E4700B25965 /* KeyframeList.cpp in Sources */,
-                               521D46F611AEC98100514613 /* KillRingMac.mm in Sources */,
-                               4306E4E614955543007F17AC /* KillRingNone.cpp in Sources */,
                                450CEBF015073BBE002BB149 /* LabelableElement.cpp in Sources */,
                                A456FA2611AD4A830020B420 /* LabelsNodeList.cpp in Sources */,
                                E18772F1126E2629003DD586 /* Language.cpp in Sources */,

diff --git a/Source/WebCore/editing/Editor.cpp b/Source/WebCore/editing/Editor.cpp
index 9c9b1d8..0e60605 100644 (file)
--- a/Source/WebCore/editing/Editor.cpp
+++ b/Source/WebCore/editing/Editor.cpp
@@ -65,7 +65,6 @@
 #include "InsertListCommand.h"
 #include "InsertTextCommand.h"
 #include "KeyboardEvent.h"
-#include "KillRing.h"
 #include "Logging.h"
 #include "MainFrame.h"
 #include "ModifySelectionListLevel.h"
@@ -98,6 +97,7 @@
 #include "VisibleUnits.h"
 #include "markup.h"
 #include <pal/system/Sound.h>
+#include <pal/text/KillRing.h>
 #include <wtf/unicode/CharacterNames.h>
 
 #if PLATFORM(MAC)
@@ -1043,7 +1043,7 @@ void Editor::reappliedEditing(EditCommandComposition& composition)
 
 Editor::Editor(Frame& frame)
     : m_frame(frame)
-    , m_killRing(std::make_unique<KillRing>())
+    , m_killRing(std::make_unique<PAL::KillRing>())
     , m_spellChecker(std::make_unique<SpellChecker>(frame))
     , m_alternativeTextController(std::make_unique<AlternativeTextController>(frame))
     , m_editorUIUpdateTimer(*this, &Editor::editorUIUpdateTimerFired)

diff --git a/Source/WebCore/editing/Editor.h b/Source/WebCore/editing/Editor.h
index 3dd8613..6f38430 100644 (file)
--- a/Source/WebCore/editing/Editor.h
+++ b/Source/WebCore/editing/Editor.h
@@ -49,6 +49,10 @@ OBJC_CLASS NSDictionary;
 OBJC_CLASS NSMutableDictionary;
 #endif
 
+namespace PAL {
+class KillRing;
+}
+
 namespace WebCore {
 
 class AlternativeTextController;
@@ -332,7 +336,7 @@ public:
 
     VisibleSelection selectionForCommand(Event*);
 
-    KillRing& killRing() const { return *m_killRing; }
+    PAL::KillRing& killRing() const { return *m_killRing; }
     SpellChecker& spellChecker() const { return *m_spellChecker; }
 
     EditingBehavior behavior() const;
@@ -536,7 +540,7 @@ private:
     bool m_ignoreSelectionChanges { false };
     bool m_shouldStartNewKillRingSequence { false };
     bool m_shouldStyleWithCSS { false };
-    const std::unique_ptr<KillRing> m_killRing;
+    const std::unique_ptr<PAL::KillRing> m_killRing;
     const std::unique_ptr<SpellChecker> m_spellChecker;
     const std::unique_ptr<AlternativeTextController> m_alternativeTextController;
     VisibleSelection m_mark;

diff --git a/Source/WebCore/editing/EditorCommand.cpp b/Source/WebCore/editing/EditorCommand.cpp
index 7c2aa83..bdae5ca 100644 (file)
--- a/Source/WebCore/editing/EditorCommand.cpp
+++ b/Source/WebCore/editing/EditorCommand.cpp
@@ -46,7 +46,6 @@
 #include "HTMLNames.h"
 #include "IndentOutdentCommand.h"
 #include "InsertListCommand.h"
-#include "KillRing.h"
 #include "Page.h"
 #include "Pasteboard.h"
 #include "RenderBox.h"
@@ -60,6 +59,7 @@
 #include "UserTypingGestureIndicator.h"
 #include "markup.h"
 #include <pal/system/Sound.h>
+#include <pal/text/KillRing.h>
 #include <wtf/text/AtomicString.h>
 
 namespace WebCore {