Changeset 221541 in webkit
- Timestamp:
- Sep 2, 2017 4:52:34 PM (7 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 2 added
- 1 deleted
- 4 edited
- 6 copied
- 9 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r221538 r221541 1 2017-09-02 Tim Horton <timothy_horton@apple.com> 2 3 Move UI Process part of the Remote Layer Tree code out of a Mac-specific directory 4 https://bugs.webkit.org/show_bug.cgi?id=176273 5 6 Reviewed by Dan Bernstein. 7 8 UI-side compositing works on all Cocoa platforms, so the code should 9 not live inside Mac/. Also merge the Scrolling directory in here, 10 since those files are very related. 11 12 * UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.h: Renamed from SourceebKit/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h. 13 * UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.messages.in: Renamed from UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.messages.in. 14 * UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm: Renamed from UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm. 15 * UIProcess/RemoteLayerTree/RemoteLayerTreeHost.h: Renamed from UIProcess/mac/RemoteLayerTreeHost.h. 16 * UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm: Renamed from UIProcess/mac/RemoteLayerTreeHost.mm. 17 * UIProcess/RemoteLayerTree/RemoteLayerTreeScrollingPerformanceData.h: Renamed from UIProcess/Cocoa/RemoteLayerTreeScrollingPerformanceData.h. 18 * UIProcess/RemoteLayerTree/RemoteLayerTreeScrollingPerformanceData.mm: Renamed from UIProcess/Cocoa/RemoteLayerTreeScrollingPerformanceData.mm. 19 * UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp: Renamed from UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp. 20 * UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.h: Renamed from UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h. 21 * UIProcess/RemoteLayerTree/RemoteScrollingTree.cpp: Renamed from UIProcess/Scrolling/RemoteScrollingTree.cpp. 22 * UIProcess/RemoteLayerTree/RemoteScrollingTree.h: Renamed from UIProcess/Scrolling/RemoteScrollingTree.h. 23 * UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm: Renamed from UIProcess/ios/RemoteLayerTreeHostIOS.mm. 24 * UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm: Renamed from UIProcess/ios/RemoteScrollingCoordinatorProxyIOS.mm. 25 * UIProcess/RemoteLayerTree/ios/ScrollingTreeOverflowScrollingNodeIOS.h: Renamed from UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h. 26 * UIProcess/RemoteLayerTree/ios/ScrollingTreeOverflowScrollingNodeIOS.mm: Renamed from UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm. 27 * WebKit.xcodeproj/project.pbxproj: 28 1 29 2017-09-02 Joseph Pecoraro <pecoraro@apple.com> 2 30 -
trunk/Source/WebKit/DerivedSources.make
r221536 r221541 76 76 $(WebKit2)/UIProcess/Notifications \ 77 77 $(WebKit2)/UIProcess/Plugins \ 78 $(WebKit2)/UIProcess/RemoteLayerTree \ 78 79 $(WebKit2)/UIProcess/Storage \ 79 80 $(WebKit2)/UIProcess/UserContent \ -
trunk/Source/WebKit/PlatformMac.cmake
r221536 r221541 254 254 UIProcess/Cocoa/NavigationState.mm 255 255 UIProcess/Cocoa/PageClientImplCocoa.mm 256 UIProcess/Cocoa/RemoteLayerTreeScrollingPerformanceData.mm257 256 UIProcess/Cocoa/SessionStateCoding.mm 258 257 UIProcess/Cocoa/UIDelegate.mm … … 277 276 UIProcess/Plugins/mac/PluginProcessProxyMac.mm 278 277 279 UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp 280 UIProcess/Scrolling/RemoteScrollingTree.cpp 278 UIProcess/RemoteLayerTree/RemoteLayerTreeScrollingPerformanceData.mm 279 UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp 280 UIProcess/RemoteLayerTree/RemoteScrollingTree.cpp 281 UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm 282 UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm 281 283 282 284 UIProcess/WebStorage/StorageManager.cpp … … 287 289 UIProcess/mac/LegacySessionStateCoding.cpp 288 290 UIProcess/mac/PageClientImpl.mm 289 UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm290 UIProcess/mac/RemoteLayerTreeHost.mm291 291 UIProcess/mac/RemoteWebInspectorProxyMac.mm 292 292 UIProcess/mac/SecItemShimProxy.cpp … … 396 396 "${WEBKIT2_DIR}/UIProcess/Cocoa" 397 397 "${WEBKIT2_DIR}/UIProcess/Launcher/mac" 398 "${WEBKIT2_DIR}/UIProcess/Scrolling" 398 "${WEBKIT2_DIR}/UIProcess/RemoteLayerTree" 399 "${WEBKIT2_DIR}/UIProcess/RemoteLayerTree/ios" 399 400 "${WEBKIT2_DIR}/UIProcess/ios" 400 401 "${WEBKIT2_DIR}/Platform/cg" … … 476 477 UIProcess/Cocoa/WebVideoFullscreenManagerProxy.messages.in 477 478 478 UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.messages.in 479 UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.messages.in 480 479 481 UIProcess/mac/SecItemShimProxy.messages.in 480 482 -
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
r221536 r221541 2270 2270 0F08CF511D63C13A00B48DF1 /* WKFormSelectPicker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKFormSelectPicker.h; path = ios/forms/WKFormSelectPicker.h; sourceTree = "<group>"; }; 2271 2271 0F08CF531D63C14000B48DF1 /* WKFormSelectPopover.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKFormSelectPopover.h; path = ios/forms/WKFormSelectPopover.h; sourceTree = "<group>"; }; 2272 0F0C365718C051BA00F607D7 /* RemoteLayerTreeHostIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = RemoteLayerTreeHostIOS.mm; path = ios/RemoteLayerTreeHostIOS.mm; sourceTree = "<group>"; };2272 0F0C365718C051BA00F607D7 /* RemoteLayerTreeHostIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteLayerTreeHostIOS.mm; sourceTree = "<group>"; }; 2273 2273 0F0C365918C0555800F607D7 /* LayerRepresentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LayerRepresentation.h; path = UIProcess/Cocoa/LayerRepresentation.h; sourceTree = SOURCE_ROOT; }; 2274 0F0C365B18C05CA100F607D7 /* RemoteScrollingCoordinatorProxyIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = RemoteScrollingCoordinatorProxyIOS.mm; path = ios/RemoteScrollingCoordinatorProxyIOS.mm; sourceTree = "<group>"; };2274 0F0C365B18C05CA100F607D7 /* RemoteScrollingCoordinatorProxyIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteScrollingCoordinatorProxyIOS.mm; sourceTree = "<group>"; }; 2275 2275 0F0C365D18C110A500F607D7 /* LayerRepresentation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = LayerRepresentation.mm; path = ios/LayerRepresentation.mm; sourceTree = "<group>"; }; 2276 2276 0F174AA2142A4CB60039250F /* APIGeometry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIGeometry.h; sourceTree = "<group>"; }; … … 2281 2281 0F59478E187B3B3A00437857 /* RemoteScrollingCoordinator.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RemoteScrollingCoordinator.messages.in; sourceTree = "<group>"; }; 2282 2282 0F59478F187B3B3A00437857 /* RemoteScrollingCoordinator.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteScrollingCoordinator.mm; sourceTree = "<group>"; }; 2283 0F594794187B3B6000437857 /* RemoteScrollingCoordinatorProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RemoteScrollingCoordinatorProxy.cpp; path = Scrolling/RemoteScrollingCoordinatorProxy.cpp; sourceTree = "<group>"; };2284 0F594795187B3B6000437857 /* RemoteScrollingCoordinatorProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RemoteScrollingCoordinatorProxy.h; path = Scrolling/RemoteScrollingCoordinatorProxy.h; sourceTree = "<group>"; };2285 0F594796187B3B6000437857 /* RemoteScrollingTree.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RemoteScrollingTree.cpp; path = Scrolling/RemoteScrollingTree.cpp; sourceTree = "<group>"; };2286 0F594797187B3B6000437857 /* RemoteScrollingTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RemoteScrollingTree.h; path = Scrolling/RemoteScrollingTree.h; sourceTree = "<group>"; };2283 0F594794187B3B6000437857 /* RemoteScrollingCoordinatorProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteScrollingCoordinatorProxy.cpp; sourceTree = "<group>"; }; 2284 0F594795187B3B6000437857 /* RemoteScrollingCoordinatorProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteScrollingCoordinatorProxy.h; sourceTree = "<group>"; }; 2285 0F594796187B3B6000437857 /* RemoteScrollingTree.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteScrollingTree.cpp; sourceTree = "<group>"; }; 2286 0F594797187B3B6000437857 /* RemoteScrollingTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteScrollingTree.h; sourceTree = "<group>"; }; 2287 2287 0F5947A1187B3B7D00437857 /* RemoteScrollingCoordinatorTransaction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RemoteScrollingCoordinatorTransaction.cpp; path = Scrolling/RemoteScrollingCoordinatorTransaction.cpp; sourceTree = "<group>"; }; 2288 2288 0F5947A2187B3B7D00437857 /* RemoteScrollingCoordinatorTransaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RemoteScrollingCoordinatorTransaction.h; path = Scrolling/RemoteScrollingCoordinatorTransaction.h; sourceTree = "<group>"; }; … … 2295 2295 0F850FE41ED7C39F00FB77A7 /* WebPerformanceLoggingClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPerformanceLoggingClient.cpp; sourceTree = "<group>"; }; 2296 2296 0F850FE51ED7C39F00FB77A7 /* WebPerformanceLoggingClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPerformanceLoggingClient.h; sourceTree = "<group>"; }; 2297 0F931C1A18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScrollingTreeOverflowScrollingNodeIOS.h; path = Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h; sourceTree = "<group>"; };2298 0F931C1B18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ScrollingTreeOverflowScrollingNodeIOS.mm; path = Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm; sourceTree = "<group>"; };2297 0F931C1A18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollingTreeOverflowScrollingNodeIOS.h; sourceTree = "<group>"; }; 2298 0F931C1B18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollingTreeOverflowScrollingNodeIOS.mm; sourceTree = "<group>"; }; 2299 2299 0FB659221208B4DB0044816C /* DrawingAreaInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingAreaInfo.h; sourceTree = "<group>"; }; 2300 2300 0FC0856E187CE0A900780D86 /* __init__.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; name = __init__.py; path = webkit/__init__.py; sourceTree = "<group>"; }; … … 4632 4632 usesTabs = 0; 4633 4633 }; 4634 0F594793187B3B4C00437857 /* Scrolling */ = {4635 isa = PBXGroup;4636 children = (4637 0F931C1918C5711100DBA7C3 /* ios */,4638 0F594794187B3B6000437857 /* RemoteScrollingCoordinatorProxy.cpp */,4639 0F594795187B3B6000437857 /* RemoteScrollingCoordinatorProxy.h */,4640 0F594796187B3B6000437857 /* RemoteScrollingTree.cpp */,4641 0F594797187B3B6000437857 /* RemoteScrollingTree.h */,4642 );4643 name = Scrolling;4644 sourceTree = "<group>";4645 };4646 4634 0F5947A0187B3B7100437857 /* Scrolling */ = { 4647 4635 isa = PBXGroup; … … 4651 4639 ); 4652 4640 name = Scrolling; 4653 sourceTree = "<group>";4654 };4655 0F931C1918C5711100DBA7C3 /* ios */ = {4656 isa = PBXGroup;4657 children = (4658 0F931C1A18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.h */,4659 0F931C1B18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.mm */,4660 );4661 name = ios;4662 4641 sourceTree = "<group>"; 4663 4642 }; … … 5272 5251 CDA29A221CBEB61A00901CCF /* PlaybackSessionManagerProxy.messages.in */, 5273 5252 CDA29A1F1CBEB5FB00901CCF /* PlaybackSessionManagerProxy.mm */, 5274 0F707C791A1FEEA300DA7A45 /* RemoteLayerTreeScrollingPerformanceData.h */,5275 0F707C771A1FEE8300DA7A45 /* RemoteLayerTreeScrollingPerformanceData.mm */,5276 5253 1A002D47196B345D00B9AD44 /* SessionStateCoding.h */, 5277 5254 1A002D46196B345D00B9AD44 /* SessionStateCoding.mm */, … … 5450 5427 sourceTree = "<group>"; 5451 5428 }; 5429 2D1551A91F5A9B420006E3FE /* RemoteLayerTree */ = { 5430 isa = PBXGroup; 5431 children = ( 5432 2D1551AA1F5A9BA70006E3FE /* ios */, 5433 1AB16AE01648656D00290D62 /* RemoteLayerTreeDrawingAreaProxy.h */, 5434 0FF24A2F1879E4FE003ABF0C /* RemoteLayerTreeDrawingAreaProxy.messages.in */, 5435 1AB16ADF1648656D00290D62 /* RemoteLayerTreeDrawingAreaProxy.mm */, 5436 1AA3D75A1651B44F008713D0 /* RemoteLayerTreeHost.h */, 5437 1AA3D7591651B44F008713D0 /* RemoteLayerTreeHost.mm */, 5438 0F707C791A1FEEA300DA7A45 /* RemoteLayerTreeScrollingPerformanceData.h */, 5439 0F707C771A1FEE8300DA7A45 /* RemoteLayerTreeScrollingPerformanceData.mm */, 5440 0F594794187B3B6000437857 /* RemoteScrollingCoordinatorProxy.cpp */, 5441 0F594795187B3B6000437857 /* RemoteScrollingCoordinatorProxy.h */, 5442 0F594796187B3B6000437857 /* RemoteScrollingTree.cpp */, 5443 0F594797187B3B6000437857 /* RemoteScrollingTree.h */, 5444 ); 5445 path = RemoteLayerTree; 5446 sourceTree = "<group>"; 5447 }; 5448 2D1551AA1F5A9BA70006E3FE /* ios */ = { 5449 isa = PBXGroup; 5450 children = ( 5451 0F0C365718C051BA00F607D7 /* RemoteLayerTreeHostIOS.mm */, 5452 0F0C365B18C05CA100F607D7 /* RemoteScrollingCoordinatorProxyIOS.mm */, 5453 0F931C1A18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.h */, 5454 0F931C1B18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.mm */, 5455 ); 5456 path = ios; 5457 sourceTree = "<group>"; 5458 }; 5452 5459 2D28F3DF1885CCB4004B9EAE /* ios */ = { 5453 5460 isa = PBXGroup; … … 5508 5515 0FCB4E3718BBE044000FCFC9 /* PageClientImplIOS.mm */, 5509 5516 86F9536218FF550B001DB2EF /* ProcessAssertionIOS.mm */, 5510 0F0C365718C051BA00F607D7 /* RemoteLayerTreeHostIOS.mm */,5511 0F0C365B18C05CA100F607D7 /* RemoteScrollingCoordinatorProxyIOS.mm */,5512 5517 51E6C15F1F29355100FD3437 /* ResourceLoadStatisticsPersistentStorageIOS.mm */, 5513 5518 2DAF06D418BD1A470081CEB1 /* SmartMagnificationController.h */, … … 6857 6862 31A2EC401489973700810D71 /* Notifications */, 6858 6863 1AEFCC0511D01F34008219D3 /* Plugins */, 6859 0F594793187B3B4C00437857 /* Scrolling*/,6864 2D1551A91F5A9B420006E3FE /* RemoteLayerTree */, 6860 6865 517DD5BB180DA7C40081660B /* Storage */, 6861 6866 1AAF089E192681AC00B6390C /* UserContent */, … … 7701 7706 0FCB4E5818BBE3D9000FCFC9 /* PageClientImplMac.h */, 7702 7707 0FCB4E5918BBE3D9000FCFC9 /* PageClientImplMac.mm */, 7703 1AB16AE01648656D00290D62 /* RemoteLayerTreeDrawingAreaProxy.h */,7704 0FF24A2F1879E4FE003ABF0C /* RemoteLayerTreeDrawingAreaProxy.messages.in */,7705 1AB16ADF1648656D00290D62 /* RemoteLayerTreeDrawingAreaProxy.mm */,7706 1AA3D75A1651B44F008713D0 /* RemoteLayerTreeHost.h */,7707 1AA3D7591651B44F008713D0 /* RemoteLayerTreeHost.mm */,7708 7708 A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorProxyMac.mm */, 7709 7709 E18E6909169B563F009B6670 /* SecItemShimProxy.cpp */,
Note: See TracChangeset
for help on using the changeset viewer.