Move shared part of the Remote Layer Tree code out of a Mac-specific directory
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 3 Sep 2017 19:08:06 +0000 (19:08 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 3 Sep 2017 19:08:06 +0000 (19:08 +0000)
https://bugs.webkit.org/show_bug.cgi?id=176297

Reviewed by Dan Bernstein.

UI-side compositing works on all Cocoa platforms, so the code should
not live inside Mac/. Also merge the Scrolling directory in here,
since those files are very related.

* PlatformMac.cmake:
* Shared/RemoteLayerTree/RemoteLayerBackingStore.h: Renamed from Shared/mac/RemoteLayerBackingStore.h.
* Shared/RemoteLayerTree/RemoteLayerBackingStore.mm: Renamed from Shared/mac/RemoteLayerBackingStore.mm.
* Shared/RemoteLayerTree/RemoteLayerBackingStoreCollection.h: Renamed from Shared/mac/RemoteLayerBackingStoreCollection.h.
* Shared/RemoteLayerTree/RemoteLayerBackingStoreCollection.mm: Renamed from Shared/mac/RemoteLayerBackingStoreCollection.mm.
* Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.h: Renamed from Shared/mac/RemoteLayerTreePropertyApplier.h.
* Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm: Renamed from Shared/mac/RemoteLayerTreePropertyApplier.mm.
* Shared/RemoteLayerTree/RemoteLayerTreeTransaction.h: Renamed from Shared/mac/RemoteLayerTreeTransaction.h.
* Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm: Renamed from Shared/mac/RemoteLayerTreeTransaction.mm.
* Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp: Renamed from Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp.
* Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.h: Renamed from Shared/Scrolling/RemoteScrollingCoordinatorTransaction.h.
* WebKit.xcodeproj/project.pbxproj:

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

13 files changed:
Source/WebKit/ChangeLog
Source/WebKit/PlatformMac.cmake
Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.h [moved from Source/WebKit/Shared/mac/RemoteLayerBackingStore.h with 100% similarity]
Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm [moved from Source/WebKit/Shared/mac/RemoteLayerBackingStore.mm with 100% similarity]
Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStoreCollection.h [moved from Source/WebKit/Shared/mac/RemoteLayerBackingStoreCollection.h with 100% similarity]
Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStoreCollection.mm [moved from Source/WebKit/Shared/mac/RemoteLayerBackingStoreCollection.mm with 100% similarity]
Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.h [moved from Source/WebKit/Shared/mac/RemoteLayerTreePropertyApplier.h with 100% similarity]
Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm [moved from Source/WebKit/Shared/mac/RemoteLayerTreePropertyApplier.mm with 100% similarity]
Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.h [moved from Source/WebKit/Shared/mac/RemoteLayerTreeTransaction.h with 100% similarity]
Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm [moved from Source/WebKit/Shared/mac/RemoteLayerTreeTransaction.mm with 100% similarity]
Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp [moved from Source/WebKit/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp with 100% similarity]
Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.h [moved from Source/WebKit/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.h with 100% similarity]
Source/WebKit/WebKit.xcodeproj/project.pbxproj

index 4827bb3..acca1f3 100644 (file)
@@ -1,3 +1,27 @@
+2017-09-03  Tim Horton  <timothy_horton@apple.com>
+
+        Move shared part of the Remote Layer Tree code out of a Mac-specific directory
+        https://bugs.webkit.org/show_bug.cgi?id=176297
+
+        Reviewed by Dan Bernstein.
+
+        UI-side compositing works on all Cocoa platforms, so the code should
+        not live inside Mac/. Also merge the Scrolling directory in here,
+        since those files are very related.
+
+        * PlatformMac.cmake:
+        * Shared/RemoteLayerTree/RemoteLayerBackingStore.h: Renamed from Shared/mac/RemoteLayerBackingStore.h.
+        * Shared/RemoteLayerTree/RemoteLayerBackingStore.mm: Renamed from Shared/mac/RemoteLayerBackingStore.mm.
+        * Shared/RemoteLayerTree/RemoteLayerBackingStoreCollection.h: Renamed from Shared/mac/RemoteLayerBackingStoreCollection.h.
+        * Shared/RemoteLayerTree/RemoteLayerBackingStoreCollection.mm: Renamed from Shared/mac/RemoteLayerBackingStoreCollection.mm.
+        * Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.h: Renamed from Shared/mac/RemoteLayerTreePropertyApplier.h.
+        * Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm: Renamed from Shared/mac/RemoteLayerTreePropertyApplier.mm.
+        * Shared/RemoteLayerTree/RemoteLayerTreeTransaction.h: Renamed from Shared/mac/RemoteLayerTreeTransaction.h.
+        * Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm: Renamed from Shared/mac/RemoteLayerTreeTransaction.mm.
+        * Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp: Renamed from Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp.
+        * Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.h: Renamed from Shared/Scrolling/RemoteScrollingCoordinatorTransaction.h.
+        * WebKit.xcodeproj/project.pbxproj:
+
 2017-09-03  Sam Weinig  <sam@webkit.org>
 
         Remove CanvasProxy
index 44a9040..0170c8c 100644 (file)
@@ -121,7 +121,11 @@ list(APPEND WebKit2_SOURCES
 
     Shared/Plugins/mac/PluginSandboxProfile.mm
 
-    Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp
+    Shared/RemoteLayerTree/RemoteLayerBackingStore.mm
+    Shared/RemoteLayerTree/RemoteLayerBackingStoreCollection.mm
+    Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm
+    Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm
+    Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp
 
     Shared/cf/ArgumentCodersCF.cpp
 
@@ -143,10 +147,6 @@ list(APPEND WebKit2_SOURCES
     Shared/mac/PDFKitImports.mm
     Shared/mac/PasteboardTypes.mm
     Shared/mac/PrintInfoMac.mm
-    Shared/mac/RemoteLayerBackingStore.mm
-    Shared/mac/RemoteLayerBackingStoreCollection.mm
-    Shared/mac/RemoteLayerTreePropertyApplier.mm
-    Shared/mac/RemoteLayerTreeTransaction.mm
     Shared/mac/SandboxExtensionMac.mm
     Shared/mac/SandboxInitialiationParametersMac.mm
     Shared/mac/SandboxUtilities.mm
index 2670309..c180da2 100644 (file)
                0F594795187B3B6000437857 /* RemoteScrollingCoordinatorProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteScrollingCoordinatorProxy.h; sourceTree = "<group>"; };
                0F594796187B3B6000437857 /* RemoteScrollingTree.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteScrollingTree.cpp; sourceTree = "<group>"; };
                0F594797187B3B6000437857 /* RemoteScrollingTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteScrollingTree.h; sourceTree = "<group>"; };
-               0F5947A1187B3B7D00437857 /* RemoteScrollingCoordinatorTransaction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RemoteScrollingCoordinatorTransaction.cpp; path = Scrolling/RemoteScrollingCoordinatorTransaction.cpp; sourceTree = "<group>"; };
-               0F5947A2187B3B7D00437857 /* RemoteScrollingCoordinatorTransaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RemoteScrollingCoordinatorTransaction.h; path = Scrolling/RemoteScrollingCoordinatorTransaction.h; sourceTree = "<group>"; };
+               0F5947A1187B3B7D00437857 /* RemoteScrollingCoordinatorTransaction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteScrollingCoordinatorTransaction.cpp; sourceTree = "<group>"; };
+               0F5947A2187B3B7D00437857 /* RemoteScrollingCoordinatorTransaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteScrollingCoordinatorTransaction.h; sourceTree = "<group>"; };
                0F5947A5187B517600437857 /* RemoteScrollingCoordinatorMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteScrollingCoordinatorMessageReceiver.cpp; sourceTree = "<group>"; };
                0F5947A6187B517600437857 /* RemoteScrollingCoordinatorMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteScrollingCoordinatorMessages.h; sourceTree = "<group>"; };
                0F5E200118E77051003EC3E5 /* PlatformCAAnimationRemote.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformCAAnimationRemote.mm; sourceTree = "<group>"; };
                        tabWidth = 8;
                        usesTabs = 0;
                };
-               0F5947A0187B3B7100437857 /* Scrolling */ = {
-                       isa = PBXGroup;
-                       children = (
-                               0F5947A1187B3B7D00437857 /* RemoteScrollingCoordinatorTransaction.cpp */,
-                               0F5947A2187B3B7D00437857 /* RemoteScrollingCoordinatorTransaction.h */,
-                       );
-                       name = Scrolling;
-                       sourceTree = "<group>";
-               };
                1058C7B0FEA5585E11CA2CBB /* Linked Frameworks */ = {
                        isa = PBXGroup;
                        children = (
                                2DA944961884E4DA00ED86DB /* ios */,
                                BC111B5A112F628200337BAB /* mac */,
                                1AAE058C1279DCD400852418 /* Plugins */,
-                               0F5947A0187B3B7100437857 /* Scrolling */,
+                               2D2E04761F5BEC4F00BB25ED /* RemoteLayerTree */,
                                5118E99D1F29531F003EF9F5 /* Storage */,
                                1ABF43781A368035003FB0E6 /* WebsiteData */,
                                A7D792D51767CB6E00881CBE /* ActivityAssertion.cpp */,
                        path = Cocoa;
                        sourceTree = "<group>";
                };
+               2D2E04761F5BEC4F00BB25ED /* RemoteLayerTree */ = {
+                       isa = PBXGroup;
+                       children = (
+                               2D47B56B1810714E003A3AEE /* RemoteLayerBackingStore.h */,
+                               2D47B56A1810714E003A3AEE /* RemoteLayerBackingStore.mm */,
+                               2DDF731318E95060004F5A66 /* RemoteLayerBackingStoreCollection.h */,
+                               2DDF731418E95060004F5A66 /* RemoteLayerBackingStoreCollection.mm */,
+                               2DDE0AF818298CC900F97EAA /* RemoteLayerTreePropertyApplier.h */,
+                               2DDE0AF918298CC900F97EAA /* RemoteLayerTreePropertyApplier.mm */,
+                               1AF1AC6A1651759E00C17D7F /* RemoteLayerTreeTransaction.h */,
+                               1AF1AC691651759E00C17D7F /* RemoteLayerTreeTransaction.mm */,
+                               0F5947A1187B3B7D00437857 /* RemoteScrollingCoordinatorTransaction.cpp */,
+                               0F5947A2187B3B7D00437857 /* RemoteScrollingCoordinatorTransaction.h */,
+                       );
+                       path = RemoteLayerTree;
+                       sourceTree = "<group>";
+               };
                2DA944961884E4DA00ED86DB /* ios */ = {
                        isa = PBXGroup;
                        children = (
                                E19582D2153CBFD700B60875 /* PDFKitImports.h */,
                                E19582D4153CC05300B60875 /* PDFKitImports.mm */,
                                E1CC1B8F12D7EADF00625838 /* PrintInfoMac.mm */,
-                               2D47B56B1810714E003A3AEE /* RemoteLayerBackingStore.h */,
-                               2D47B56A1810714E003A3AEE /* RemoteLayerBackingStore.mm */,
-                               2DDF731318E95060004F5A66 /* RemoteLayerBackingStoreCollection.h */,
-                               2DDF731418E95060004F5A66 /* RemoteLayerBackingStoreCollection.mm */,
-                               2DDE0AF818298CC900F97EAA /* RemoteLayerTreePropertyApplier.h */,
-                               2DDE0AF918298CC900F97EAA /* RemoteLayerTreePropertyApplier.mm */,
-                               1AF1AC6A1651759E00C17D7F /* RemoteLayerTreeTransaction.h */,
-                               1AF1AC691651759E00C17D7F /* RemoteLayerTreeTransaction.mm */,
                                1AAB4AA91296F1540023952F /* SandboxExtensionMac.mm */,
                                E1E552C216AE065E004ED653 /* SandboxInitialiationParametersMac.mm */,
                                E19BDA88193686A400B97F57 /* SandboxUtilities.h */,