Changeset 166529 in webkit
- Timestamp:
- Mar 31, 2014 2:18:23 PM (10 years ago)
- Location:
- trunk/Source
- Files:
-
- 11 edited
- 10 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r166528 r166529 1 2014-03-31 Antti Koivisto <antti@apple.com> 2 3 Rename TileCache to LegacyTileCache 4 https://bugs.webkit.org/show_bug.cgi?id=130986 5 6 Reviewed by Simon Fraser. 7 8 Rename iOS WebKit1 tile cache classes to reflect its status. 9 This also frees some good type names. 10 11 TileCache -> LegacyTileCache 12 TileGrid -> LegacyTileGrid 13 TileGridTile -> LegacyTileGridTile 14 etc. 15 1 16 2014-03-31 Tim Horton <timothy_horton@apple.com> 2 17 -
trunk/Source/WebCore/WebCore.exp.in
r166528 r166529 2483 2483 __ZN7WebCore15GraphicsContext23setIsAcceleratedContextEb 2484 2484 __ZN7WebCore15GraphicsContextC1EP9CGContextb 2485 __ZN7WebCore15LegacyTileCache14drainLayerPoolEv 2486 __ZN7WebCore15LegacyTileCache20setLayerPoolCapacityEj 2485 2487 __ZN7WebCore15QuickLookHandle10nsResponseEv 2486 2488 __ZN7WebCore15QuickLookHandle14didReceiveDataEPK8__CFData … … 2637 2639 __ZN7WebCore9FrameView36scheduleLayerFlushAllowingThrottlingEv 2638 2640 __ZN7WebCore9PageGroup17removeVisitedLinkERKNS_3URLE 2639 __ZN7WebCore9TileCache14drainLayerPoolEv2640 __ZN7WebCore9TileCache20setLayerPoolCapacityEj2641 2641 __ZNK7WebCore10FloatPointcv7CGPointEv 2642 2642 __ZNK7WebCore10ScrollView21unobscuredContentRectENS_14ScrollableArea36VisibleContentRectIncludesScrollbarsE -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r166520 r166529 5976 5976 E1FF8F6D180DB5BE00132674 /* CryptoAlgorithmRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FF8F6B180DB5BE00132674 /* CryptoAlgorithmRegistry.h */; }; 5977 5977 E401C27517CE53EC00C41A35 /* ElementIteratorAssertions.h in Headers */ = {isa = PBXBuildFile; fileRef = E401C27417CE53EC00C41A35 /* ElementIteratorAssertions.h */; settings = {ATTRIBUTES = (Private, ); }; }; 5978 E424A39E1330DF0100CF6DC9 /* TileGridTile.h in Headers */ = {isa = PBXBuildFile; fileRef = E424A39D1330DF0100CF6DC9 /*TileGridTile.h */; };5979 E424A3A01330DF1E00CF6DC9 /* TileGridTile.mm in Sources */ = {isa = PBXBuildFile; fileRef = E424A39F1330DF1E00CF6DC9 /*TileGridTile.mm */; };5978 E424A39E1330DF0100CF6DC9 /* LegacyTileGridTile.h in Headers */ = {isa = PBXBuildFile; fileRef = E424A39D1330DF0100CF6DC9 /* LegacyTileGridTile.h */; }; 5979 E424A3A01330DF1E00CF6DC9 /* LegacyTileGridTile.mm in Sources */ = {isa = PBXBuildFile; fileRef = E424A39F1330DF1E00CF6DC9 /* LegacyTileGridTile.mm */; }; 5980 5980 E425A49A18292B840020CFCF /* CollectionIndexCache.h in Headers */ = {isa = PBXBuildFile; fileRef = E425A49918292B840020CFCF /* CollectionIndexCache.h */; }; 5981 5981 E4295FA412B0614E00D1ACE0 /* ResourceLoadPriority.h in Headers */ = {isa = PBXBuildFile; fileRef = E4295FA312B0614E00D1ACE0 /* ResourceLoadPriority.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 6058 6058 E4AFD00F0DAF335500F5F55C /* SVGSMILElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4AFD0090DAF335400F5F55C /* SVGSMILElement.cpp */; }; 6059 6059 E4AFD0100DAF335500F5F55C /* SVGSMILElement.h in Headers */ = {isa = PBXBuildFile; fileRef = E4AFD00A0DAF335400F5F55C /* SVGSMILElement.h */; settings = {ATTRIBUTES = (Private, ); }; }; 6060 E4B65A58132FA8E70070E7BE /* TileGrid.h in Headers */ = {isa = PBXBuildFile; fileRef = E4B65A57132FA8E70070E7BE /*TileGrid.h */; };6061 E4B65A5A132FAAF90070E7BE /* TileGrid.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4B65A59132FAAF90070E7BE /*TileGrid.mm */; };6062 E4B65A5C132FACB00070E7BE /* TileLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = E4B65A5B132FACB00070E7BE /*TileLayer.h */; };6063 E4B65A5E132FADB60070E7BE /* TileLayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4B65A5D132FADB60070E7BE /*TileLayer.mm */; };6060 E4B65A58132FA8E70070E7BE /* LegacyTileGrid.h in Headers */ = {isa = PBXBuildFile; fileRef = E4B65A57132FA8E70070E7BE /* LegacyTileGrid.h */; }; 6061 E4B65A5A132FAAF90070E7BE /* LegacyTileGrid.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4B65A59132FAAF90070E7BE /* LegacyTileGrid.mm */; }; 6062 E4B65A5C132FACB00070E7BE /* LegacyTileLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = E4B65A5B132FACB00070E7BE /* LegacyTileLayer.h */; }; 6063 E4B65A5E132FADB60070E7BE /* LegacyTileLayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4B65A5D132FADB60070E7BE /* LegacyTileLayer.mm */; }; 6064 6064 E4BBED0E14F4025D003F0B98 /* PropertySetCSSStyleDeclaration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4BBED0C14F4025D003F0B98 /* PropertySetCSSStyleDeclaration.cpp */; }; 6065 6065 E4BBED0F14F4025D003F0B98 /* PropertySetCSSStyleDeclaration.h in Headers */ = {isa = PBXBuildFile; fileRef = E4BBED0D14F4025D003F0B98 /* PropertySetCSSStyleDeclaration.h */; }; … … 6070 6070 E4C279580CF9741900E97B98 /* RenderMedia.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4C279560CF9741900E97B98 /* RenderMedia.cpp */; }; 6071 6071 E4C279590CF9741900E97B98 /* RenderMedia.h in Headers */ = {isa = PBXBuildFile; fileRef = E4C279570CF9741900E97B98 /* RenderMedia.h */; }; 6072 E4C3B1FA0F0E4161009693F6 /* TileCache.h in Headers */ = {isa = PBXBuildFile; fileRef = E4C3B1F90F0E4161009693F6 /*TileCache.h */; settings = {ATTRIBUTES = (Private, ); }; };6073 E4C3B1FC0F0E4170009693F6 /* TileCache.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4C3B1FB0F0E4170009693F6 /*TileCache.mm */; };6072 E4C3B1FA0F0E4161009693F6 /* LegacyTileCache.h in Headers */ = {isa = PBXBuildFile; fileRef = E4C3B1F90F0E4161009693F6 /* LegacyTileCache.h */; settings = {ATTRIBUTES = (Private, ); }; }; 6073 E4C3B1FC0F0E4170009693F6 /* LegacyTileCache.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4C3B1FB0F0E4170009693F6 /* LegacyTileCache.mm */; }; 6074 6074 E4C91A0E1802343100A17F6D /* TextPaintStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = E4C91A0D1802343100A17F6D /* TextPaintStyle.h */; }; 6075 6075 E4C91A101802343900A17F6D /* TextPaintStyle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4C91A0F1802343900A17F6D /* TextPaintStyle.cpp */; }; … … 6087 6087 E4DEAA1717A93DC3000E0430 /* StyleResolveTree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4DEAA1517A93DC3000E0430 /* StyleResolveTree.cpp */; }; 6088 6088 E4DEAA1817A93DC3000E0430 /* StyleResolveTree.h in Headers */ = {isa = PBXBuildFile; fileRef = E4DEAA1617A93DC3000E0430 /* StyleResolveTree.h */; settings = {ATTRIBUTES = (Private, ); }; }; 6089 E4E39AFB1330EFA8003AB274 /* TileLayerPool.h in Headers */ = {isa = PBXBuildFile; fileRef = E4E39AFA1330EFA8003AB274 /*TileLayerPool.h */; };6090 E4E39AFD1330EFC6003AB274 /* TileLayerPool.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4E39AFC1330EFC5003AB274 /*TileLayerPool.mm */; };6089 E4E39AFB1330EFA8003AB274 /* LegacyTileLayerPool.h in Headers */ = {isa = PBXBuildFile; fileRef = E4E39AFA1330EFA8003AB274 /* LegacyTileLayerPool.h */; }; 6090 E4E39AFD1330EFC6003AB274 /* LegacyTileLayerPool.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4E39AFC1330EFC5003AB274 /* LegacyTileLayerPool.mm */; }; 6091 6091 E4E9B1191810916F003ACCDF /* SimpleLineLayoutResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = E4E9B1181810916F003ACCDF /* SimpleLineLayoutResolver.h */; }; 6092 6092 E4E9B11B18145692003ACCDF /* SimpleLineLayoutFunctions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4E9B11A18145692003ACCDF /* SimpleLineLayoutFunctions.cpp */; }; … … 13366 13366 E41EA038119836DB00710BC5 /* CSSPropertyNames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSPropertyNames.cpp; sourceTree = "<group>"; }; 13367 13367 E41EA0391198374900710BC5 /* CSSValueKeywords.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSValueKeywords.cpp; sourceTree = "<group>"; }; 13368 E424A39D1330DF0100CF6DC9 /* TileGridTile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TileGridTile.h; path = ios/TileGridTile.h; sourceTree = "<group>"; };13369 E424A39F1330DF1E00CF6DC9 /* TileGridTile.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = TileGridTile.mm; path = ios/TileGridTile.mm; sourceTree = "<group>"; };13368 E424A39D1330DF0100CF6DC9 /* LegacyTileGridTile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LegacyTileGridTile.h; path = ios/LegacyTileGridTile.h; sourceTree = "<group>"; }; 13369 E424A39F1330DF1E00CF6DC9 /* LegacyTileGridTile.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = LegacyTileGridTile.mm; path = ios/LegacyTileGridTile.mm; sourceTree = "<group>"; }; 13370 13370 E425A49918292B840020CFCF /* CollectionIndexCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CollectionIndexCache.h; sourceTree = "<group>"; }; 13371 13371 E4295FA312B0614E00D1ACE0 /* ResourceLoadPriority.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceLoadPriority.h; sourceTree = "<group>"; }; … … 13457 13457 E4B423850CBFB73C00AF2ECE /* JSProgressEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSProgressEvent.cpp; sourceTree = "<group>"; }; 13458 13458 E4B423860CBFB73C00AF2ECE /* JSProgressEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSProgressEvent.h; sourceTree = "<group>"; }; 13459 E4B65A57132FA8E70070E7BE /* TileGrid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TileGrid.h; path = ios/TileGrid.h; sourceTree = "<group>"; };13460 E4B65A59132FAAF90070E7BE /* TileGrid.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = TileGrid.mm; path = ios/TileGrid.mm; sourceTree = "<group>"; };13461 E4B65A5B132FACB00070E7BE /* TileLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TileLayer.h; path = ios/TileLayer.h; sourceTree = "<group>"; };13462 E4B65A5D132FADB60070E7BE /* TileLayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = TileLayer.mm; path = ios/TileLayer.mm; sourceTree = "<group>"; };13459 E4B65A57132FA8E70070E7BE /* LegacyTileGrid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LegacyTileGrid.h; path = ios/LegacyTileGrid.h; sourceTree = "<group>"; }; 13460 E4B65A59132FAAF90070E7BE /* LegacyTileGrid.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = LegacyTileGrid.mm; path = ios/LegacyTileGrid.mm; sourceTree = "<group>"; }; 13461 E4B65A5B132FACB00070E7BE /* LegacyTileLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LegacyTileLayer.h; path = ios/LegacyTileLayer.h; sourceTree = "<group>"; }; 13462 E4B65A5D132FADB60070E7BE /* LegacyTileLayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = LegacyTileLayer.mm; path = ios/LegacyTileLayer.mm; sourceTree = "<group>"; }; 13463 13463 E4BBED0C14F4025D003F0B98 /* PropertySetCSSStyleDeclaration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PropertySetCSSStyleDeclaration.cpp; sourceTree = "<group>"; }; 13464 13464 E4BBED0D14F4025D003F0B98 /* PropertySetCSSStyleDeclaration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PropertySetCSSStyleDeclaration.h; sourceTree = "<group>"; }; … … 13469 13469 E4C279560CF9741900E97B98 /* RenderMedia.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderMedia.cpp; sourceTree = "<group>"; }; 13470 13470 E4C279570CF9741900E97B98 /* RenderMedia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderMedia.h; sourceTree = "<group>"; }; 13471 E4C3B1F90F0E4161009693F6 /* TileCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TileCache.h; path = ios/TileCache.h; sourceTree = "<group>"; };13472 E4C3B1FB0F0E4170009693F6 /* TileCache.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = TileCache.mm; path = ios/TileCache.mm; sourceTree = "<group>"; };13471 E4C3B1F90F0E4161009693F6 /* LegacyTileCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LegacyTileCache.h; path = ios/LegacyTileCache.h; sourceTree = "<group>"; }; 13472 E4C3B1FB0F0E4170009693F6 /* LegacyTileCache.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = LegacyTileCache.mm; path = ios/LegacyTileCache.mm; sourceTree = "<group>"; }; 13473 13473 E4C91A0D1802343100A17F6D /* TextPaintStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextPaintStyle.h; sourceTree = "<group>"; }; 13474 13474 E4C91A0F1802343900A17F6D /* TextPaintStyle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextPaintStyle.cpp; sourceTree = "<group>"; }; … … 13486 13486 E4DEAA1517A93DC3000E0430 /* StyleResolveTree.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleResolveTree.cpp; sourceTree = "<group>"; }; 13487 13487 E4DEAA1617A93DC3000E0430 /* StyleResolveTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleResolveTree.h; sourceTree = "<group>"; }; 13488 E4E39AFA1330EFA8003AB274 /* TileLayerPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TileLayerPool.h; path = ios/TileLayerPool.h; sourceTree = "<group>"; };13489 E4E39AFC1330EFC5003AB274 /* TileLayerPool.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = TileLayerPool.mm; path = ios/TileLayerPool.mm; sourceTree = "<group>"; };13488 E4E39AFA1330EFA8003AB274 /* LegacyTileLayerPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LegacyTileLayerPool.h; path = ios/LegacyTileLayerPool.h; sourceTree = "<group>"; }; 13489 E4E39AFC1330EFC5003AB274 /* LegacyTileLayerPool.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = LegacyTileLayerPool.mm; path = ios/LegacyTileLayerPool.mm; sourceTree = "<group>"; }; 13490 13490 E4E9B1181810916F003ACCDF /* SimpleLineLayoutResolver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimpleLineLayoutResolver.h; sourceTree = "<group>"; }; 13491 13491 E4E9B11A18145692003ACCDF /* SimpleLineLayoutFunctions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SimpleLineLayoutFunctions.cpp; sourceTree = "<group>"; }; … … 18141 18141 44C9919D0F3D210E00586670 /* ThemeIOS.h */, 18142 18142 44C9919E0F3D210E00586670 /* ThemeIOS.mm */, 18143 E4C3B1F90F0E4161009693F6 /* TileCache.h */,18144 E4C3B1FB0F0E4170009693F6 /* TileCache.mm */,18143 E4C3B1F90F0E4161009693F6 /* LegacyTileCache.h */, 18144 E4C3B1FB0F0E4170009693F6 /* LegacyTileCache.mm */, 18145 18145 1F72BF08187FD4270009BCB3 /* TileControllerMemoryHandlerIOS.cpp */, 18146 18146 1F72BF09187FD4270009BCB3 /* TileControllerMemoryHandlerIOS.h */, 18147 E4B65A57132FA8E70070E7BE /* TileGrid.h */,18148 E4B65A59132FAAF90070E7BE /* TileGrid.mm */,18149 E424A39D1330DF0100CF6DC9 /* TileGridTile.h */,18150 E424A39F1330DF1E00CF6DC9 /* TileGridTile.mm */,18151 E4B65A5B132FACB00070E7BE /* TileLayer.h */,18152 E4B65A5D132FADB60070E7BE /* TileLayer.mm */,18153 E4E39AFA1330EFA8003AB274 /* TileLayerPool.h */,18154 E4E39AFC1330EFC5003AB274 /* TileLayerPool.mm */,18147 E4B65A57132FA8E70070E7BE /* LegacyTileGrid.h */, 18148 E4B65A59132FAAF90070E7BE /* LegacyTileGrid.mm */, 18149 E424A39D1330DF0100CF6DC9 /* LegacyTileGridTile.h */, 18150 E424A39F1330DF1E00CF6DC9 /* LegacyTileGridTile.mm */, 18151 E4B65A5B132FACB00070E7BE /* LegacyTileLayer.h */, 18152 E4B65A5D132FADB60070E7BE /* LegacyTileLayer.mm */, 18153 E4E39AFA1330EFA8003AB274 /* LegacyTileLayerPool.h */, 18154 E4E39AFC1330EFC5003AB274 /* LegacyTileLayerPool.mm */, 18155 18155 31403797124BEA7F00AF40E4 /* WebCoreMotionManager.h */, 18156 18156 31403798124BEA7F00AF40E4 /* WebCoreMotionManager.mm */, … … 25956 25956 E1FF57A30F01255B00891EBB /* ThreadGlobalData.h in Headers */, 25957 25957 185BCF290F3279CE000EA262 /* ThreadTimers.h in Headers */, 25958 E4C3B1FA0F0E4161009693F6 /* TileCache.h in Headers */,25958 E4C3B1FA0F0E4161009693F6 /* LegacyTileCache.h in Headers */, 25959 25959 1AA7160B149BC4DB0016EC19 /* TileController.h in Headers */, 25960 25960 1F72BF0B187FD45C0009BCB3 /* TileControllerMemoryHandlerIOS.h in Headers */, 25961 25961 1AF89A421518FDEA00E547B5 /* TiledBacking.h in Headers */, 25962 E4B65A58132FA8E70070E7BE /* TileGrid.h in Headers */,25963 E424A39E1330DF0100CF6DC9 /* TileGridTile.h in Headers */,25964 E4B65A5C132FACB00070E7BE /* TileLayer.h in Headers */,25965 E4E39AFB1330EFA8003AB274 /* TileLayerPool.h in Headers */,25962 E4B65A58132FA8E70070E7BE /* LegacyTileGrid.h in Headers */, 25963 E424A39E1330DF0100CF6DC9 /* LegacyTileGridTile.h in Headers */, 25964 E4B65A5C132FACB00070E7BE /* LegacyTileLayer.h in Headers */, 25965 E4E39AFB1330EFA8003AB274 /* LegacyTileLayerPool.h in Headers */, 25966 25966 498770F31242C535002226BA /* TilingData.h in Headers */, 25967 25967 F55B3DDC1251F12D003EF269 /* TimeInputType.h in Headers */, … … 29208 29208 E1FF57A60F01256B00891EBB /* ThreadGlobalData.cpp in Sources */, 29209 29209 185BCF280F3279CE000EA262 /* ThreadTimers.cpp in Sources */, 29210 E4C3B1FC0F0E4170009693F6 /* TileCache.mm in Sources */,29210 E4C3B1FC0F0E4170009693F6 /* LegacyTileCache.mm in Sources */, 29211 29211 1AA7160A149BC4DB0016EC19 /* TileController.mm in Sources */, 29212 29212 1F72BF0A187FD4490009BCB3 /* TileControllerMemoryHandlerIOS.cpp in Sources */, 29213 E4B65A5A132FAAF90070E7BE /* TileGrid.mm in Sources */,29214 E424A3A01330DF1E00CF6DC9 /* TileGridTile.mm in Sources */,29215 E4B65A5E132FADB60070E7BE /* TileLayer.mm in Sources */,29216 E4E39AFD1330EFC6003AB274 /* TileLayerPool.mm in Sources */,29213 E4B65A5A132FAAF90070E7BE /* LegacyTileGrid.mm in Sources */, 29214 E424A3A01330DF1E00CF6DC9 /* LegacyTileGridTile.mm in Sources */, 29215 E4B65A5E132FADB60070E7BE /* LegacyTileLayer.mm in Sources */, 29216 E4E39AFD1330EFC6003AB274 /* LegacyTileLayerPool.mm in Sources */, 29217 29217 498770F21242C535002226BA /* TilingData.cpp in Sources */, 29218 29218 F55B3DDB1251F12D003EF269 /* TimeInputType.cpp in Sources */, -
trunk/Source/WebCore/page/FrameView.cpp
r166372 r166529 96 96 #if PLATFORM(IOS) 97 97 #include "DocumentLoader.h" 98 #include "LegacyTileCache.h" 98 99 #include "Logging.h" 99 100 #include "MemoryCache.h" 100 101 #include "MemoryPressureHandler.h" 101 102 #include "SystemMemory.h" 102 #include "TileCache.h"103 103 #endif 104 104 … … 379 379 // To avoid flashes of white, disable tile updates immediately when view is cleared at the beginning of a page load. 380 380 // Tiling will be re-enabled from UIKit via [WAKWindow setTilingMode:] when we have content to draw. 381 if ( TileCache* tileCache = this->tileCache())382 tileCache->setTilingMode( TileCache::Disabled);381 if (LegacyTileCache* tileCache = legacyTileCache()) 382 tileCache->setTilingMode(LegacyTileCache::Disabled); 383 383 #endif 384 384 } … … 861 861 862 862 #if PLATFORM(IOS) 863 if ( TileCache* tileCache = this->tileCache())863 if (LegacyTileCache* tileCache = legacyTileCache()) 864 864 tileCache->doPendingRepaints(); 865 865 #endif … … 2244 2244 renderView->layer()->backing()->adjustTiledBackingCoverage(); 2245 2245 #if PLATFORM(IOS) 2246 if ( TileCache* tileCache = this->tileCache())2246 if (LegacyTileCache* tileCache = legacyTileCache()) 2247 2247 tileCache->setSpeculativeTileCreationEnabled(m_speculativeTilingEnabled); 2248 2248 #endif -
trunk/Source/WebCore/platform/ScrollView.h
r166380 r166529 61 61 62 62 class HostWindow; 63 class LegacyTileCache; 63 64 class Scrollbar; 64 class TileCache;65 65 66 66 class ScrollView : public Widget, public ScrollableArea { … … 191 191 192 192 void setActualScrollPosition(const IntPoint&); 193 TileCache* tileCache();193 LegacyTileCache* legacyTileCache(); 194 194 #endif 195 195 -
trunk/Source/WebCore/platform/ios/LegacyTileCache.h
r166453 r166529 24 24 */ 25 25 26 #ifndef TileCache_h27 #define TileCache_h26 #ifndef LegacyTileCache_h 27 #define LegacyTileCache_h 28 28 29 29 #if PLATFORM(IOS) … … 44 44 #ifdef __OBJC__ 45 45 @class CALayer; 46 @class TileCacheTombstone;47 @class TileLayer;46 @class LegacyTileCacheTombstone; 47 @class LegacyTileLayer; 48 48 @class WAKWindow; 49 49 #else 50 50 class CALayer; 51 class TileCacheTombstone;52 class TileLayer;51 class LegacyTileCacheTombstone; 52 class LegacyTileLayer; 53 53 class WAKWindow; 54 54 #endif … … 56 56 namespace WebCore { 57 57 58 class TileGrid;59 60 class TileCache {61 WTF_MAKE_NONCOPYABLE( TileCache);58 class LegacyTileGrid; 59 60 class LegacyTileCache { 61 WTF_MAKE_NONCOPYABLE(LegacyTileCache); 62 62 public: 63 TileCache(WAKWindow*);64 ~ TileCache();63 LegacyTileCache(WAKWindow*); 64 ~LegacyTileCache(); 65 65 66 66 CGFloat screenScale() const; … … 135 135 // Internal 136 136 void doLayoutTiles(); 137 void drawLayer( TileLayer*, CGContextRef);137 void drawLayer(LegacyTileLayer*, CGContextRef); 138 138 void prepareToDraw(); 139 139 void finishedCreatingTiles(bool didCreateTiles, bool createMore); 140 140 FloatRect visibleRectInLayer(CALayer *) const; 141 141 CALayer* hostLayer() const; 142 unsigned tileCapacityForGrid( TileGrid*);143 Color colorForGridTileBorder( TileGrid*) const;142 unsigned tileCapacityForGrid(LegacyTileGrid*); 143 Color colorForGridTileBorder(LegacyTileGrid*) const; 144 144 145 145 void doPendingRepaints(); … … 151 151 152 152 private: 153 TileGrid* activeTileGrid() const;154 TileGrid* inactiveTileGrid() const;153 LegacyTileGrid* activeTileGrid() const; 154 LegacyTileGrid* inactiveTileGrid() const; 155 155 156 156 void updateTilingMode(); … … 167 167 void scheduleLayerFlushForPendingRepaint(); 168 168 169 void tileCreationTimerFired(Timer< TileCache>*);170 171 void drawReplacementImage( TileLayer*, CGContextRef, CGImageRef);172 void drawWindowContent( TileLayer*, CGContextRef, CGRect dirtyRect);169 void tileCreationTimerFired(Timer<LegacyTileCache>*); 170 171 void drawReplacementImage(LegacyTileLayer*, CGContextRef, CGImageRef); 172 void drawWindowContent(LegacyTileLayer*, CGContextRef, CGRect dirtyRect); 173 173 174 174 WAKWindow* m_window; … … 181 181 bool m_hasPendingUpdateTilingMode; 182 182 // Ensure there are no async calls on a dead tile cache. 183 RetainPtr< TileCacheTombstone> m_tombstone;183 RetainPtr<LegacyTileCacheTombstone> m_tombstone; 184 184 185 185 TilingMode m_tilingMode; … … 195 195 196 196 bool m_didCallWillStartScrollingOrZooming; 197 OwnPtr< TileGrid> m_zoomedOutTileGrid;198 OwnPtr< TileGrid> m_zoomedInTileGrid;199 200 Timer< TileCache> m_tileCreationTimer;197 OwnPtr<LegacyTileGrid> m_zoomedOutTileGrid; 198 OwnPtr<LegacyTileGrid> m_zoomedInTileGrid; 199 200 Timer<LegacyTileCache> m_tileCreationTimer; 201 201 202 202 Vector<IntRect> m_savedDisplayRects; -
trunk/Source/WebCore/platform/ios/LegacyTileCache.mm
r166453 r166529 25 25 26 26 #include "config.h" 27 #include " TileCache.h"27 #include "LegacyTileCache.h" 28 28 29 29 #if PLATFORM(IOS) 30 30 31 #include "LegacyTileGrid.h" 32 #include "LegacyTileGridTile.h" 33 #include "LegacyTileLayer.h" 34 #include "LegacyTileLayerPool.h" 31 35 #include "Logging.h" 32 36 #include "MemoryPressureHandler.h" 33 37 #include "SystemMemory.h" 34 #include "TileGrid.h"35 #include "TileGridTile.h"36 #include "TileLayer.h"37 #include "TileLayerPool.h"38 38 #include "WAKWindow.h" 39 39 #include "WKGraphics.h" … … 52 52 @end 53 53 54 @interface TileCacheTombstone : NSObject {54 @interface LegacyTileCacheTombstone : NSObject { 55 55 BOOL dead; 56 56 } … … 59 59 @end 60 60 61 @implementation TileCacheTombstone61 @implementation LegacyTileCacheTombstone 62 62 63 63 @synthesize dead; … … 67 67 namespace WebCore { 68 68 69 TileCache::TileCache(WAKWindow* window)69 LegacyTileCache::LegacyTileCache(WAKWindow* window) 70 70 : m_window(window) 71 71 , m_keepsZoomedOutTiles(false) 72 72 , m_hasPendingLayoutTiles(false) 73 73 , m_hasPendingUpdateTilingMode(false) 74 , m_tombstone(adoptNS([[ TileCacheTombstone alloc] init]))74 , m_tombstone(adoptNS([[LegacyTileCacheTombstone alloc] init])) 75 75 , m_tilingMode(Normal) 76 76 , m_tilingDirection(TilingDirectionDown) … … 82 82 , m_isSpeculativeTileCreationEnabled(true) 83 83 , m_didCallWillStartScrollingOrZooming(false) 84 , m_zoomedOutTileGrid(PassOwnPtr< TileGrid>())85 , m_zoomedInTileGrid(PassOwnPtr< TileGrid>())86 , m_tileCreationTimer(this, & TileCache::tileCreationTimerFired)84 , m_zoomedOutTileGrid(PassOwnPtr<LegacyTileGrid>()) 85 , m_zoomedInTileGrid(PassOwnPtr<LegacyTileGrid>()) 86 , m_tileCreationTimer(this, &LegacyTileCache::tileCreationTimerFired) 87 87 , m_currentScale(1.f) 88 88 , m_pendingScale(0) 89 89 , m_pendingZoomedOutScale(0) 90 90 { 91 m_zoomedOutTileGrid = TileGrid::create(this, m_tileSize);91 m_zoomedOutTileGrid = LegacyTileGrid::create(this, m_tileSize); 92 92 [hostLayer() insertSublayer:m_zoomedOutTileGrid->tileHostLayer() atIndex:0]; 93 93 hostLayerSizeChanged(); 94 94 } 95 95 96 TileCache::~TileCache()96 LegacyTileCache::~LegacyTileCache() 97 97 { 98 98 [m_tombstone.get() setDead:true]; 99 99 } 100 100 101 CGFloat TileCache::screenScale() const101 CGFloat LegacyTileCache::screenScale() const 102 102 { 103 103 return [m_window screenScale]; 104 104 } 105 105 106 CALayer* TileCache::hostLayer() const106 CALayer* LegacyTileCache::hostLayer() const 107 107 { 108 108 return [m_window hostLayer]; 109 109 } 110 110 111 FloatRect TileCache::visibleRectInLayer(CALayer *layer) const111 FloatRect LegacyTileCache::visibleRectInLayer(CALayer *layer) const 112 112 { 113 113 return [layer convertRect:[m_window extendedVisibleRect] fromLayer:hostLayer()]; 114 114 } 115 115 116 bool TileCache::tilesOpaque() const116 bool LegacyTileCache::tilesOpaque() const 117 117 { 118 118 return m_tilesOpaque; 119 119 } 120 120 121 TileGrid*TileCache::activeTileGrid() const121 LegacyTileGrid* LegacyTileCache::activeTileGrid() const 122 122 { 123 123 if (!m_keepsZoomedOutTiles) … … 130 130 } 131 131 132 TileGrid*TileCache::inactiveTileGrid() const132 LegacyTileGrid* LegacyTileCache::inactiveTileGrid() const 133 133 { 134 134 return activeTileGrid() == m_zoomedOutTileGrid ? m_zoomedInTileGrid.get() : m_zoomedOutTileGrid.get(); 135 135 } 136 136 137 void TileCache::setTilesOpaque(bool opaque)137 void LegacyTileCache::setTilesOpaque(bool opaque) 138 138 { 139 139 if (m_tilesOpaque == opaque) … … 148 148 } 149 149 150 void TileCache::doLayoutTiles()150 void LegacyTileCache::doLayoutTiles() 151 151 { 152 152 if (isTileCreationSuspended()) … … 154 154 155 155 MutexLocker locker(m_tileMutex); 156 TileGrid* activeGrid = activeTileGrid();156 LegacyTileGrid* activeGrid = activeTileGrid(); 157 157 // Even though we aren't actually creating tiles in the inactive grid, we 158 158 // still need to drop invalid tiles in response to a layout. 159 159 // See <rdar://problem/9839867>. 160 if ( TileGrid* inactiveGrid = inactiveTileGrid())160 if (LegacyTileGrid* inactiveGrid = inactiveTileGrid()) 161 161 inactiveGrid->dropInvalidTiles(); 162 162 if (activeGrid->checkDoSingleTileLayout()) … … 165 165 } 166 166 167 void TileCache::hostLayerSizeChanged()167 void LegacyTileCache::hostLayerSizeChanged() 168 168 { 169 169 m_zoomedOutTileGrid->updateHostLayerSize(); … … 172 172 } 173 173 174 void TileCache::setKeepsZoomedOutTiles(bool keep)174 void LegacyTileCache::setKeepsZoomedOutTiles(bool keep) 175 175 { 176 176 m_keepsZoomedOutTiles = keep; 177 177 } 178 178 179 void TileCache::setCurrentScale(float scale)179 void LegacyTileCache::setCurrentScale(float scale) 180 180 { 181 181 ASSERT(scale > 0); … … 199 199 } 200 200 201 void TileCache::setZoomedOutScale(float scale)201 void LegacyTileCache::setZoomedOutScale(float scale) 202 202 { 203 203 ASSERT(scale > 0); … … 213 213 } 214 214 215 void TileCache::commitScaleChange()215 void LegacyTileCache::commitScaleChange() 216 216 { 217 217 ASSERT(m_pendingZoomedOutScale || m_pendingScale); … … 242 242 if (m_currentScale != m_zoomedOutTileGrid->scale()) { 243 243 if (!m_zoomedInTileGrid) { 244 m_zoomedInTileGrid = TileGrid::create(this, m_tileSize);244 m_zoomedInTileGrid = LegacyTileGrid::create(this, m_tileSize); 245 245 [hostLayer() addSublayer:m_zoomedInTileGrid->tileHostLayer()]; 246 246 hostLayerSizeChanged(); … … 257 257 } 258 258 259 void TileCache::bringActiveTileGridToFront()260 { 261 TileGrid* activeGrid = activeTileGrid();262 TileGrid* otherGrid = inactiveTileGrid();259 void LegacyTileCache::bringActiveTileGridToFront() 260 { 261 LegacyTileGrid* activeGrid = activeTileGrid(); 262 LegacyTileGrid* otherGrid = inactiveTileGrid(); 263 263 if (!otherGrid) 264 264 return; … … 268 268 } 269 269 270 void TileCache::adjustTileGridTransforms()270 void LegacyTileCache::adjustTileGridTransforms() 271 271 { 272 272 CALayer* zoomedOutHostLayer = m_zoomedOutTileGrid->tileHostLayer(); … … 276 276 } 277 277 278 void TileCache::layoutTiles()278 void LegacyTileCache::layoutTiles() 279 279 { 280 280 if (m_hasPendingLayoutTiles) … … 282 282 m_hasPendingLayoutTiles = true; 283 283 284 TileCacheTombstone *tombstone = m_tombstone.get();284 LegacyTileCacheTombstone *tombstone = m_tombstone.get(); 285 285 WebThreadRun(^{ 286 286 if ([tombstone isDead]) … … 291 291 } 292 292 293 void TileCache::layoutTilesNow()293 void LegacyTileCache::layoutTilesNow() 294 294 { 295 295 ASSERT(WebThreadIsLockedOrDisabled()); … … 308 308 309 309 MutexLocker locker(m_tileMutex); 310 TileGrid* activeGrid = activeTileGrid();310 LegacyTileGrid* activeGrid = activeTileGrid(); 311 311 if (activeGrid->checkDoSingleTileLayout()) { 312 312 m_tilingMode = savedTilingMode; … … 317 317 } 318 318 319 void TileCache::layoutTilesNowForRect(const IntRect& rect)319 void LegacyTileCache::layoutTilesNowForRect(const IntRect& rect) 320 320 { 321 321 ASSERT(WebThreadIsLockedOrDisabled()); … … 325 325 } 326 326 327 void TileCache::removeAllNonVisibleTiles()327 void LegacyTileCache::removeAllNonVisibleTiles() 328 328 { 329 329 MutexLocker locker(m_tileMutex); … … 331 331 } 332 332 333 void TileCache::removeAllNonVisibleTilesInternal()334 { 335 TileGrid* activeGrid = activeTileGrid();333 void LegacyTileCache::removeAllNonVisibleTilesInternal() 334 { 335 LegacyTileGrid* activeGrid = activeTileGrid(); 336 336 if (keepsZoomedOutTiles() && activeGrid == m_zoomedInTileGrid && activeGrid->hasTiles()) 337 337 m_zoomedOutTileGrid->dropAllTiles(); … … 347 347 } 348 348 349 void TileCache::removeAllTiles()349 void LegacyTileCache::removeAllTiles() 350 350 { 351 351 MutexLocker locker(m_tileMutex); … … 355 355 } 356 356 357 void TileCache::removeForegroundTiles()357 void LegacyTileCache::removeForegroundTiles() 358 358 { 359 359 MutexLocker locker(m_tileMutex); … … 364 364 } 365 365 366 void TileCache::setContentReplacementImage(RetainPtr<CGImageRef> contentReplacementImage)366 void LegacyTileCache::setContentReplacementImage(RetainPtr<CGImageRef> contentReplacementImage) 367 367 { 368 368 MutexLocker locker(m_contentReplacementImageMutex); … … 370 370 } 371 371 372 RetainPtr<CGImageRef> TileCache::contentReplacementImage() const372 RetainPtr<CGImageRef> LegacyTileCache::contentReplacementImage() const 373 373 { 374 374 MutexLocker locker(m_contentReplacementImageMutex); … … 376 376 } 377 377 378 void TileCache::setTileBordersVisible(bool flag)378 void LegacyTileCache::setTileBordersVisible(bool flag) 379 379 { 380 380 if (flag == m_tileBordersVisible) … … 387 387 } 388 388 389 void TileCache::setTilePaintCountersVisible(bool flag)389 void LegacyTileCache::setTilePaintCountersVisible(bool flag) 390 390 { 391 391 m_tilePaintCountersVisible = flag; … … 393 393 } 394 394 395 void TileCache::finishedCreatingTiles(bool didCreateTiles, bool createMore)395 void LegacyTileCache::finishedCreatingTiles(bool didCreateTiles, bool createMore) 396 396 { 397 397 // We need to ensure that all tiles are showing the same version of the content. … … 415 415 } 416 416 417 void TileCache::tileCreationTimerFired(Timer<TileCache>*)417 void LegacyTileCache::tileCreationTimerFired(Timer<LegacyTileCache>*) 418 418 { 419 419 if (isTileCreationSuspended()) … … 423 423 } 424 424 425 void TileCache::createTilesInActiveGrid(SynchronousTileCreationMode mode)425 void LegacyTileCache::createTilesInActiveGrid(SynchronousTileCreationMode mode) 426 426 { 427 427 if (memoryPressureHandler().hasReceivedMemoryPressure()) { … … 432 432 } 433 433 434 unsigned TileCache::tileCapacityForGrid(TileGrid* grid)434 unsigned LegacyTileCache::tileCapacityForGrid(LegacyTileGrid* grid) 435 435 { 436 436 static unsigned capacity; … … 466 466 } 467 467 468 Color TileCache::colorForGridTileBorder(TileGrid* grid) const468 Color LegacyTileCache::colorForGridTileBorder(LegacyTileGrid* grid) const 469 469 { 470 470 if (grid == m_zoomedOutTileGrid) … … 501 501 } 502 502 503 void TileCache::drawReplacementImage(TileLayer* layer, CGContextRef context, CGImageRef image)503 void LegacyTileCache::drawReplacementImage(LegacyTileLayer* layer, CGContextRef context, CGImageRef image) 504 504 { 505 505 CGContextSetRGBFillColor(context, 1, 1, 1, 1); … … 513 513 } 514 514 515 void TileCache::drawWindowContent(TileLayer* layer, CGContextRef context, CGRect dirtyRect)515 void LegacyTileCache::drawWindowContent(LegacyTileLayer* layer, CGContextRef context, CGRect dirtyRect) 516 516 { 517 517 CGRect frame = [layer frame]; … … 545 545 } 546 546 547 void TileCache::drawLayer(TileLayer* layer, CGContextRef context)547 void LegacyTileCache::drawLayer(LegacyTileLayer* layer, CGContextRef context) 548 548 { 549 549 // The web lock unlock observer runs after CA commit observer. … … 601 601 } 602 602 603 void TileCache::setNeedsDisplay()603 void LegacyTileCache::setNeedsDisplay() 604 604 { 605 605 setNeedsDisplayInRect(IntRect(0, 0, std::numeric_limits<int>::max(), std::numeric_limits<int>::max())); 606 606 } 607 607 608 void TileCache::scheduleLayerFlushForPendingRepaint()608 void LegacyTileCache::scheduleLayerFlushForPendingRepaint() 609 609 { 610 610 WAKView* view = [m_window contentView]; … … 612 612 } 613 613 614 void TileCache::setNeedsDisplayInRect(const IntRect& dirtyRect)614 void LegacyTileCache::setNeedsDisplayInRect(const IntRect& dirtyRect) 615 615 { 616 616 MutexLocker locker(m_savedDisplayRectMutex); … … 623 623 } 624 624 625 void TileCache::invalidateTiles(const IntRect& dirtyRect)625 void LegacyTileCache::invalidateTiles(const IntRect& dirtyRect) 626 626 { 627 627 ASSERT(!m_tileMutex.tryLock()); 628 628 629 TileGrid* activeGrid = activeTileGrid();629 LegacyTileGrid* activeGrid = activeTileGrid(); 630 630 if (!keepsZoomedOutTiles()) { 631 631 activeGrid->invalidateTiles(dirtyRect); … … 657 657 } 658 658 659 bool TileCache::isTileCreationSuspended() const659 bool LegacyTileCache::isTileCreationSuspended() const 660 660 { 661 661 return (!keepsZoomedOutTiles() && m_tilingMode == Zooming) || m_tilingMode == Disabled; 662 662 } 663 663 664 bool TileCache::isTileInvalidationSuspended() const664 bool LegacyTileCache::isTileInvalidationSuspended() const 665 665 { 666 666 return m_tilingMode == Zooming || m_tilingMode == Panning || m_tilingMode == ScrollToTop || m_tilingMode == Disabled; 667 667 } 668 668 669 void TileCache::updateTilingMode()669 void LegacyTileCache::updateTilingMode() 670 670 { 671 671 ASSERT(WebThreadIsCurrent() || !WebThreadIsEnabled()); … … 694 694 } 695 695 696 void TileCache::setTilingMode(TilingMode tilingMode)696 void LegacyTileCache::setTilingMode(TilingMode tilingMode) 697 697 { 698 698 if (tilingMode == m_tilingMode) … … 712 712 m_hasPendingUpdateTilingMode = true; 713 713 714 TileCacheTombstone *tombstone = m_tombstone.get();714 LegacyTileCacheTombstone *tombstone = m_tombstone.get(); 715 715 WebThreadRun(^{ 716 716 if ([tombstone isDead]) … … 721 721 } 722 722 723 void TileCache::setTilingDirection(TilingDirection tilingDirection)723 void LegacyTileCache::setTilingDirection(TilingDirection tilingDirection) 724 724 { 725 725 m_tilingDirection = tilingDirection; 726 726 } 727 727 728 TileCache::TilingDirectionTileCache::tilingDirection() const728 LegacyTileCache::TilingDirection LegacyTileCache::tilingDirection() const 729 729 { 730 730 return m_tilingDirection; 731 731 } 732 732 733 float TileCache::zoomedOutScale() const733 float LegacyTileCache::zoomedOutScale() const 734 734 { 735 735 return m_zoomedOutTileGrid->scale(); 736 736 } 737 737 738 float TileCache::currentScale() const738 float LegacyTileCache::currentScale() const 739 739 { 740 740 return m_currentScale; 741 741 } 742 742 743 void TileCache::doPendingRepaints()743 void LegacyTileCache::doPendingRepaints() 744 744 { 745 745 if (m_savedDisplayRects.isEmpty()) … … 751 751 } 752 752 753 void TileCache::flushSavedDisplayRects()753 void LegacyTileCache::flushSavedDisplayRects() 754 754 { 755 755 ASSERT(!m_tileMutex.tryLock()); … … 766 766 } 767 767 768 void TileCache::setSpeculativeTileCreationEnabled(bool enabled)768 void LegacyTileCache::setSpeculativeTileCreationEnabled(bool enabled) 769 769 { 770 770 if (m_isSpeculativeTileCreationEnabled == enabled) … … 775 775 } 776 776 777 bool TileCache::hasPendingDraw() const777 bool LegacyTileCache::hasPendingDraw() const 778 778 { 779 779 return !m_savedDisplayRects.isEmpty(); 780 780 } 781 781 782 void TileCache::prepareToDraw()782 void LegacyTileCache::prepareToDraw() 783 783 { 784 784 // This will trigger document relayout if needed. … … 791 791 } 792 792 793 void TileCache::setLayerPoolCapacity(unsigned capacity)794 { 795 TileLayerPool::sharedPool()->setCapacity(capacity);796 } 797 798 void TileCache::drainLayerPool()799 { 800 TileLayerPool::sharedPool()->drain();801 } 802 803 void TileCache::dumpTiles()793 void LegacyTileCache::setLayerPoolCapacity(unsigned capacity) 794 { 795 LegacyTileLayerPool::sharedPool()->setCapacity(capacity); 796 } 797 798 void LegacyTileCache::drainLayerPool() 799 { 800 LegacyTileLayerPool::sharedPool()->drain(); 801 } 802 803 void LegacyTileCache::dumpTiles() 804 804 { 805 805 NSLog(@"================="); -
trunk/Source/WebCore/platform/ios/LegacyTileGrid.h
r166453 r166529 24 24 */ 25 25 26 #ifndef TileGrid_h27 #define TileGrid_h26 #ifndef LegacyTileGrid_h 27 #define LegacyTileGrid_h 28 28 29 29 #if PLATFORM(IOS) … … 33 33 #include "IntRect.h" 34 34 #include "IntSize.h" 35 #include " TileCache.h"35 #include "LegacyTileCache.h" 36 36 #include <wtf/HashMap.h> 37 37 #include <wtf/Noncopyable.h> … … 47 47 namespace WebCore { 48 48 49 class TileGridTile;49 class LegacyTileGridTile; 50 50 51 class TileGrid {52 WTF_MAKE_NONCOPYABLE( TileGrid);51 class LegacyTileGrid { 52 WTF_MAKE_NONCOPYABLE(LegacyTileGrid); 53 53 public: 54 54 typedef IntPoint TileIndex; 55 55 56 static PassOwnPtr< TileGrid> create(TileCache* cache, const IntSize& tileSize) { return adoptPtr(newTileGrid(cache, tileSize)); }56 static PassOwnPtr<LegacyTileGrid> create(LegacyTileCache* cache, const IntSize& tileSize) { return adoptPtr(new LegacyTileGrid(cache, tileSize)); } 57 57 58 ~ TileGrid();58 ~LegacyTileGrid(); 59 59 60 TileCache* tileCache() const { return m_tileCache; }60 LegacyTileCache* tileCache() const { return m_tileCache; } 61 61 62 62 CALayer *tileHostLayer() const; … … 69 69 IntRect visibleRect() const; 70 70 71 void createTiles( TileCache::SynchronousTileCreationMode);71 void createTiles(LegacyTileCache::SynchronousTileCreationMode); 72 72 73 73 void dropAllTiles(); … … 103 103 void addTileForIndex(const TileIndex&); 104 104 105 PassRefPtr< TileGridTile> tileForIndex(const TileIndex&) const;105 PassRefPtr<LegacyTileGridTile> tileForIndex(const TileIndex&) const; 106 106 IntRect tileRectForIndex(const TileIndex&) const; 107 PassRefPtr< TileGridTile> tileForPoint(const IntPoint&) const;107 PassRefPtr<LegacyTileGridTile> tileForPoint(const IntPoint&) const; 108 108 TileIndex tileIndexForPoint(const IntPoint&) const; 109 109 … … 112 112 113 113 private: 114 TileGrid(TileCache*, const IntSize&);114 LegacyTileGrid(LegacyTileCache*, const IntSize&); 115 115 116 TileCache* m_tileCache;116 LegacyTileCache* m_tileCache; 117 117 RetainPtr<CALayer> m_tileHostLayer; 118 118 … … 122 122 float m_scale; 123 123 124 typedef HashMap<TileIndex, RefPtr< TileGridTile>> TileMap;124 typedef HashMap<TileIndex, RefPtr<LegacyTileGridTile>> TileMap; 125 125 TileMap m_tiles; 126 126 -
trunk/Source/WebCore/platform/ios/LegacyTileGrid.mm
r166453 r166529 25 25 26 26 #include "config.h" 27 #include " TileGrid.h"27 #include "LegacyTileGrid.h" 28 28 29 29 #if PLATFORM(IOS) … … 31 31 #include "MemoryPressureHandler.h" 32 32 #include "SystemMemory.h" 33 #include " TileGridTile.h"34 #include " TileLayer.h"35 #include " TileLayerPool.h"33 #include "LegacyTileGridTile.h" 34 #include "LegacyTileLayer.h" 35 #include "LegacyTileLayerPool.h" 36 36 #include "WAKWindow.h" 37 37 #include <CoreGraphics/CoreGraphicsPrivate.h> … … 43 43 namespace WebCore { 44 44 45 TileGrid::TileGrid(TileCache* tileCache, const IntSize& tileSize)45 LegacyTileGrid::LegacyTileGrid(LegacyTileCache* tileCache, const IntSize& tileSize) 46 46 : m_tileCache(tileCache) 47 , m_tileHostLayer(adoptNS([[ TileHostLayer alloc] initWithTileGrid:this]))47 , m_tileHostLayer(adoptNS([[LegacyTileHostLayer alloc] initWithTileGrid:this])) 48 48 , m_tileSize(tileSize) 49 49 , m_scale(1) … … 52 52 } 53 53 54 TileGrid::~TileGrid()54 LegacyTileGrid::~LegacyTileGrid() 55 55 { 56 56 [m_tileHostLayer removeFromSuperlayer]; 57 57 } 58 58 59 IntRect TileGrid::visibleRect() const59 IntRect LegacyTileGrid::visibleRect() const 60 60 { 61 61 IntRect visibleRect = enclosingIntRect(m_tileCache->visibleRectInLayer(m_tileHostLayer.get())); 62 62 63 63 // When fast scrolling to the top, move the visible rect there immediately so we have tiles when the scrolling completes. 64 if (m_tileCache->tilingMode() == TileCache::ScrollToTop)64 if (m_tileCache->tilingMode() == LegacyTileCache::ScrollToTop) 65 65 visibleRect.setY(0); 66 66 … … 68 68 } 69 69 70 void TileGrid::dropAllTiles()70 void LegacyTileGrid::dropAllTiles() 71 71 { 72 72 m_tiles.clear(); 73 73 } 74 74 75 void TileGrid::dropTilesIntersectingRect(const IntRect& dropRect)75 void LegacyTileGrid::dropTilesIntersectingRect(const IntRect& dropRect) 76 76 { 77 77 dropTilesBetweenRects(dropRect, IntRect()); 78 78 } 79 79 80 void TileGrid::dropTilesOutsideRect(const IntRect& keepRect)80 void LegacyTileGrid::dropTilesOutsideRect(const IntRect& keepRect) 81 81 { 82 82 dropTilesBetweenRects(IntRect(0, 0, std::numeric_limits<int>::max(), std::numeric_limits<int>::max()), keepRect); 83 83 } 84 84 85 void TileGrid::dropTilesBetweenRects(const IntRect& dropRect, const IntRect& keepRect)85 void LegacyTileGrid::dropTilesBetweenRects(const IntRect& dropRect, const IntRect& keepRect) 86 86 { 87 87 Vector<TileIndex> toRemove; … … 97 97 } 98 98 99 unsigned TileGrid::tileByteSize() const99 unsigned LegacyTileGrid::tileByteSize() const 100 100 { 101 101 IntSize tilePixelSize = m_tileSize; 102 102 tilePixelSize.scale(m_tileCache->screenScale()); 103 return TileLayerPool::bytesBackingLayerWithPixelSize(tilePixelSize);103 return LegacyTileLayerPool::bytesBackingLayerWithPixelSize(tilePixelSize); 104 104 } 105 105 … … 110 110 } 111 111 112 bool TileGrid::dropDistantTiles(unsigned tilesNeeded, double shortestDistance)112 bool LegacyTileGrid::dropDistantTiles(unsigned tilesNeeded, double shortestDistance) 113 113 { 114 114 unsigned bytesPerTile = tileByteSize(); … … 148 148 } 149 149 150 void TileGrid::addTilesCoveringRect(const IntRect& rectToCover)150 void LegacyTileGrid::addTilesCoveringRect(const IntRect& rectToCover) 151 151 { 152 152 // We never draw anything outside of our bounds. … … 167 167 } 168 168 169 void TileGrid::addTileForIndex(const TileIndex& index)170 { 171 m_tiles.set(index, TileGridTile::create(this, tileRectForIndex(index)));172 } 173 174 CALayer* TileGrid::tileHostLayer() const169 void LegacyTileGrid::addTileForIndex(const TileIndex& index) 170 { 171 m_tiles.set(index, LegacyTileGridTile::create(this, tileRectForIndex(index))); 172 } 173 174 CALayer* LegacyTileGrid::tileHostLayer() const 175 175 { 176 176 return m_tileHostLayer.get(); 177 177 } 178 178 179 IntRect TileGrid::bounds() const179 IntRect LegacyTileGrid::bounds() const 180 180 { 181 181 return IntRect(IntPoint(), IntSize([tileHostLayer() size])); 182 182 } 183 183 184 PassRefPtr< TileGridTile>TileGrid::tileForIndex(const TileIndex& index) const184 PassRefPtr<LegacyTileGridTile> LegacyTileGrid::tileForIndex(const TileIndex& index) const 185 185 { 186 186 return m_tiles.get(index); 187 187 } 188 188 189 IntRect TileGrid::tileRectForIndex(const TileIndex& index) const189 IntRect LegacyTileGrid::tileRectForIndex(const TileIndex& index) const 190 190 { 191 191 IntRect rect(index.x() * m_tileSize.width() - (m_origin.x() ? m_tileSize.width() - m_origin.x() : 0), … … 197 197 } 198 198 199 TileGrid::TileIndexTileGrid::tileIndexForPoint(const IntPoint& point) const199 LegacyTileGrid::TileIndex LegacyTileGrid::tileIndexForPoint(const IntPoint& point) const 200 200 { 201 201 ASSERT(m_origin.x() < m_tileSize.width()); … … 206 206 } 207 207 208 void TileGrid::centerTileGridOrigin(const IntRect& visibleRect)208 void LegacyTileGrid::centerTileGridOrigin(const IntRect& visibleRect) 209 209 { 210 210 if (visibleRect.isEmpty()) … … 242 242 } 243 243 244 PassRefPtr< TileGridTile>TileGrid::tileForPoint(const IntPoint& point) const244 PassRefPtr<LegacyTileGridTile> LegacyTileGrid::tileForPoint(const IntPoint& point) const 245 245 { 246 246 return tileForIndex(tileIndexForPoint(point)); 247 247 } 248 248 249 bool TileGrid::tilesCover(const IntRect& rect) const249 bool LegacyTileGrid::tilesCover(const IntRect& rect) const 250 250 { 251 251 return tileForPoint(rect.location()) && tileForPoint(IntPoint(rect.maxX() - 1, rect.y())) && … … 253 253 } 254 254 255 void TileGrid::updateTileOpacity()255 void LegacyTileGrid::updateTileOpacity() 256 256 { 257 257 TileMap::iterator end = m_tiles.end(); … … 260 260 } 261 261 262 void TileGrid::updateTileBorderVisibility()262 void LegacyTileGrid::updateTileBorderVisibility() 263 263 { 264 264 TileMap::iterator end = m_tiles.end(); … … 267 267 } 268 268 269 unsigned TileGrid::tileCount() const269 unsigned LegacyTileGrid::tileCount() const 270 270 { 271 271 return m_tiles.size(); 272 272 } 273 273 274 bool TileGrid::checkDoSingleTileLayout()274 bool LegacyTileGrid::checkDoSingleTileLayout() 275 275 { 276 276 IntSize size = bounds().size(); … … 292 292 TileIndex originIndex(0, 0); 293 293 if (!m_tiles.get(originIndex)) 294 m_tiles.set(originIndex, TileGridTile::create(this, tileRectForIndex(originIndex)));294 m_tiles.set(originIndex, LegacyTileGridTile::create(this, tileRectForIndex(originIndex))); 295 295 296 296 return true; 297 297 } 298 298 299 void TileGrid::updateHostLayerSize()299 void LegacyTileGrid::updateHostLayerSize() 300 300 { 301 301 CALayer* hostLayer = m_tileCache->hostLayer(); … … 312 312 } 313 313 314 void TileGrid::dropInvalidTiles()314 void LegacyTileGrid::dropInvalidTiles() 315 315 { 316 316 IntRect bounds = this->bounds(); … … 331 331 } 332 332 333 void TileGrid::invalidateTiles(const IntRect& dirtyRect)333 void LegacyTileGrid::invalidateTiles(const IntRect& dirtyRect) 334 334 { 335 335 if (!hasTiles()) … … 350 350 TileMap::iterator end = m_tiles.end(); 351 351 for (TileMap::iterator it = m_tiles.begin(); it != end; ++it) { 352 TileGridTile* tile = it->value.get();352 LegacyTileGridTile* tile = it->value.get(); 353 353 if (!tile->rect().intersects(dirtyRect)) 354 354 continue; … … 362 362 for (int xIndex = topLeftIndex.x(); xIndex <= bottomRightIndex.x(); ++xIndex) { 363 363 TileIndex index(xIndex, yIndex); 364 RefPtr< TileGridTile> tile = tileForIndex(index);364 RefPtr<LegacyTileGridTile> tile = tileForIndex(index); 365 365 if (!tile) 366 366 continue; … … 377 377 if (!shouldUseMinimalTileCoverage()) 378 378 return; 379 if (m_tileCache->tilingMode() != TileCache::Minimal && m_tileCache->tilingMode() !=TileCache::Normal)379 if (m_tileCache->tilingMode() != LegacyTileCache::Minimal && m_tileCache->tilingMode() != LegacyTileCache::Normal) 380 380 return; 381 381 IntRect visibleRect = this->visibleRect(); 382 382 unsigned count = invalidatedTiles.size(); 383 383 for (unsigned i = 0; i < count; ++i) { 384 RefPtr< TileGridTile> tile = tileForIndex(invalidatedTiles[i]);384 RefPtr<LegacyTileGridTile> tile = tileForIndex(invalidatedTiles[i]); 385 385 if (!tile->rect().intersects(visibleRect)) 386 386 m_tiles.remove(invalidatedTiles[i]); … … 388 388 } 389 389 390 bool TileGrid::shouldUseMinimalTileCoverage() const391 { 392 return m_tileCache->tilingMode() == TileCache::Minimal390 bool LegacyTileGrid::shouldUseMinimalTileCoverage() const 391 { 392 return m_tileCache->tilingMode() == LegacyTileCache::Minimal 393 393 || !m_tileCache->isSpeculativeTileCreationEnabled() 394 394 || memoryPressureHandler().hasReceivedMemoryPressure(); 395 395 } 396 396 397 IntRect TileGrid::adjustCoverRectForPageBounds(const IntRect& rect) const397 IntRect LegacyTileGrid::adjustCoverRectForPageBounds(const IntRect& rect) const 398 398 { 399 399 // Adjust the rect so that it stays within the bounds and keeps the pixel size. … … 415 415 } 416 416 417 IntRect TileGrid::calculateCoverRect(const IntRect& visibleRect, bool& centerGrid)417 IntRect LegacyTileGrid::calculateCoverRect(const IntRect& visibleRect, bool& centerGrid) 418 418 { 419 419 // Use minimum coverRect if we are under memory pressure. … … 429 429 } 430 430 431 double TileGrid::tileDistance2(const IntRect& visibleRect, const IntRect& tileRect) const431 double LegacyTileGrid::tileDistance2(const IntRect& visibleRect, const IntRect& tileRect) const 432 432 { 433 433 // The "distance" calculated here is used to pick which tile to cache next. The idea is to create those … … 451 451 452 452 switch (m_tileCache->tilingDirection()) { 453 case TileCache::TilingDirectionUp:453 case LegacyTileCache::TilingDirectionUp: 454 454 verticalBias = tilingBiasVeryLikely; 455 455 upwardBias = tilingBiasLikely; 456 456 break; 457 case TileCache::TilingDirectionDown:457 case LegacyTileCache::TilingDirectionDown: 458 458 verticalBias = tilingBiasVeryLikely; 459 459 downwardBias = tilingBiasLikely; 460 460 break; 461 case TileCache::TilingDirectionLeft:461 case LegacyTileCache::TilingDirectionLeft: 462 462 horizontalBias = tilingBiasVeryLikely; 463 463 leftwardBias = tilingBiasLikely; 464 464 break; 465 case TileCache::TilingDirectionRight:465 case LegacyTileCache::TilingDirectionRight: 466 466 horizontalBias = tilingBiasVeryLikely; 467 467 rightwardBias = tilingBiasLikely; … … 479 479 } 480 480 481 void TileGrid::createTiles(TileCache::SynchronousTileCreationMode creationMode)481 void LegacyTileGrid::createTiles(LegacyTileCache::SynchronousTileCreationMode creationMode) 482 482 { 483 483 IntRect visibleRect = this->visibleRect(); … … 499 499 double shortestDistance = std::numeric_limits<double>::infinity(); 500 500 double coveredDistance = 0; 501 Vector< TileGrid::TileIndex> tilesToCreate;501 Vector<LegacyTileGrid::TileIndex> tilesToCreate; 502 502 unsigned pendingTileCount = 0; 503 503 504 TileGrid::TileIndex topLeftIndex = tileIndexForPoint(topLeft(coverRect));505 TileGrid::TileIndex bottomRightIndex = tileIndexForPoint(bottomRight(coverRect));504 LegacyTileGrid::TileIndex topLeftIndex = tileIndexForPoint(topLeft(coverRect)); 505 LegacyTileGrid::TileIndex bottomRightIndex = tileIndexForPoint(bottomRight(coverRect)); 506 506 for (int yIndex = topLeftIndex.y(); yIndex <= bottomRightIndex.y(); ++yIndex) { 507 507 for (int xIndex = topLeftIndex.x(); xIndex <= bottomRightIndex.x(); ++xIndex) { 508 TileGrid::TileIndex index(xIndex, yIndex);508 LegacyTileGrid::TileIndex index(xIndex, yIndex); 509 509 // Currently visible tiles have distance of 0 and get all created in the same transaction. 510 510 double distance = tileDistance2(visibleRect, tileRectForIndex(index)); … … 528 528 // Tile creation timer will invoke this function again in CoverSpeculative mode. 529 529 bool candidateTilesAreSpeculative = shortestDistance > 0; 530 if (creationMode == TileCache::CoverVisibleOnly && candidateTilesAreSpeculative)530 if (creationMode == LegacyTileCache::CoverVisibleOnly && candidateTilesAreSpeculative) 531 531 tilesToCreateCount = 0; 532 532 … … 549 549 } 550 550 551 void TileGrid::dumpTiles()551 void LegacyTileGrid::dumpTiles() 552 552 { 553 553 IntRect visibleRect = this->visibleRect(); -
trunk/Source/WebCore/platform/ios/LegacyTileGridTile.h
r166453 r166529 24 24 */ 25 25 26 #ifndef TileGridTile_h27 #define TileGridTile_h26 #ifndef LegacyTileGridTile_h 27 #define LegacyTileGridTile_h 28 28 29 29 #if PLATFORM(IOS) … … 34 34 #include <wtf/RetainPtr.h> 35 35 36 @class TileLayer;36 @class LegacyTileLayer; 37 37 38 38 namespace WebCore { 39 39 40 class TileGrid;40 class LegacyTileGrid; 41 41 42 42 // Refcount the tiles so they work nicely in vector and we know when to remove the tile layer from the parent. 43 class TileGridTile : public RefCounted<TileGridTile> {43 class LegacyTileGridTile : public RefCounted<LegacyTileGridTile> { 44 44 public: 45 static PassRefPtr< TileGridTile> create(TileGrid* grid, const IntRect& rect) { return adoptRef<TileGridTile>(newTileGridTile(grid, rect)); }46 ~ TileGridTile();45 static PassRefPtr<LegacyTileGridTile> create(LegacyTileGrid* grid, const IntRect& rect) { return adoptRef<LegacyTileGridTile>(new LegacyTileGridTile(grid, rect)); } 46 ~LegacyTileGridTile(); 47 47 48 TileLayer* tileLayer() const { return m_tileLayer.get(); }48 LegacyTileLayer* tileLayer() const { return m_tileLayer.get(); } 49 49 void invalidateRect(const IntRect& rectInSurface); 50 50 IntRect rect() const { return m_rect; } … … 53 53 54 54 private: 55 TileGridTile(TileGrid*, const IntRect&);55 LegacyTileGridTile(LegacyTileGrid*, const IntRect&); 56 56 57 TileGrid* m_tileGrid;58 RetainPtr< TileLayer> m_tileLayer;57 LegacyTileGrid* m_tileGrid; 58 RetainPtr<LegacyTileLayer> m_tileLayer; 59 59 IntRect m_rect; 60 60 }; … … 63 63 64 64 #endif // PLATFORM(IOS) 65 #endif // TileGridTile_h65 #endif // LegacyTileGridTile_h -
trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm
r166453 r166529 25 25 26 26 #include "config.h" 27 #include " TileGrid.h"27 #include "LegacyTileGridTile.h" 28 28 29 29 #if PLATFORM(IOS) 30 30 31 31 #include "Color.h" 32 #include " TileCache.h"33 #include " TileGridTile.h"34 #include " TileLayer.h"35 #include " TileLayerPool.h"32 #include "LegacyTileCache.h" 33 #include "LegacyTileGrid.h" 34 #include "LegacyTileLayer.h" 35 #include "LegacyTileLayerPool.h" 36 36 #include "WAKWindow.h" 37 37 #include <QuartzCore/QuartzCore.h> … … 46 46 #endif 47 47 48 TileGridTile::TileGridTile(TileGrid* tileGrid, const IntRect& tileRect)48 LegacyTileGridTile::LegacyTileGridTile(LegacyTileGrid* tileGrid, const IntRect& tileRect) 49 49 : m_tileGrid(tileGrid) 50 50 , m_rect(tileRect) … … 54 54 const CGFloat screenScale = m_tileGrid->tileCache()->screenScale(); 55 55 pixelSize.scale(screenScale); 56 m_tileLayer = TileLayerPool::sharedPool()->takeLayerWithSize(pixelSize);56 m_tileLayer = LegacyTileLayerPool::sharedPool()->takeLayerWithSize(pixelSize); 57 57 if (!m_tileLayer) { 58 58 #if LOG_TILING 59 59 NSLog(@"unable to reuse layer with size %d x %d, creating one", pixelSize.width(), pixelSize.height()); 60 60 #endif 61 m_tileLayer = adoptNS([[ TileLayer alloc] init]);61 m_tileLayer = adoptNS([[LegacyTileLayer alloc] init]); 62 62 } 63 TileLayer* layer = m_tileLayer.get();63 LegacyTileLayer* layer = m_tileLayer.get(); 64 64 [layer setTileGrid:tileGrid]; 65 65 [layer setOpaque:m_tileGrid->tileCache()->tilesOpaque()]; … … 82 82 } 83 83 84 TileGridTile::~TileGridTile()84 LegacyTileGridTile::~LegacyTileGridTile() 85 85 { 86 86 [tileLayer() setTileGrid:0]; 87 87 [tileLayer() removeFromSuperlayer]; 88 TileLayerPool::sharedPool()->addLayer(tileLayer());88 LegacyTileLayerPool::sharedPool()->addLayer(tileLayer()); 89 89 #if LOG_TILING 90 90 --totalTileCount; … … 93 93 } 94 94 95 void TileGridTile::invalidateRect(const IntRect& windowDirtyRect)95 void LegacyTileGridTile::invalidateRect(const IntRect& windowDirtyRect) 96 96 { 97 97 IntRect dirtyRect = intersection(windowDirtyRect, m_rect); … … 105 105 } 106 106 107 void TileGridTile::setRect(const IntRect& tileRect)107 void LegacyTileGridTile::setRect(const IntRect& tileRect) 108 108 { 109 109 if (m_rect == tileRect) 110 110 return; 111 111 m_rect = tileRect; 112 TileLayer* layer = m_tileLayer.get();112 LegacyTileLayer* layer = m_tileLayer.get(); 113 113 [layer setFrame:m_rect]; 114 114 [layer setNeedsDisplay]; 115 115 } 116 116 117 void TileGridTile::showBorder(bool flag)117 void LegacyTileGridTile::showBorder(bool flag) 118 118 { 119 TileLayer* layer = m_tileLayer.get();119 LegacyTileLayer* layer = m_tileLayer.get(); 120 120 if (flag) { 121 121 [layer setBorderColor:cachedCGColor(m_tileGrid->tileCache()->colorForGridTileBorder(m_tileGrid), ColorSpaceDeviceRGB)]; -
trunk/Source/WebCore/platform/ios/LegacyTileLayer.h
r166453 r166529 24 24 */ 25 25 26 #ifndef TileLayer_h27 #define TileLayer_h26 #ifndef LegacyTileLayer_h 27 #define LegacyTileLayer_h 28 28 29 29 #if PLATFORM(IOS) … … 32 32 33 33 namespace WebCore { 34 class TileGrid;34 class LegacyTileGrid; 35 35 }; 36 36 37 @interface TileLayer : CALayer {38 WebCore:: TileGrid* _tileGrid;37 @interface LegacyTileLayer : CALayer { 38 WebCore::LegacyTileGrid* _tileGrid; 39 39 unsigned _paintCount; 40 40 } 41 41 @property (nonatomic) unsigned paintCount; 42 @property (nonatomic) WebCore:: TileGrid* tileGrid;43 + ( TileLayer *)layerBeingPainted;42 @property (nonatomic) WebCore::LegacyTileGrid* tileGrid; 43 + (LegacyTileLayer *)layerBeingPainted; 44 44 @end 45 45 46 @interface TileHostLayer : CALayer {47 WebCore:: TileGrid* _tileGrid;46 @interface LegacyTileHostLayer : CALayer { 47 WebCore::LegacyTileGrid* _tileGrid; 48 48 } 49 - (id)initWithTileGrid:(WebCore:: TileGrid*)tileGrid;49 - (id)initWithTileGrid:(WebCore::LegacyTileGrid*)tileGrid; 50 50 @end 51 51 -
trunk/Source/WebCore/platform/ios/LegacyTileLayer.mm
r166453 r166529 25 25 26 26 #include "config.h" 27 #include " TileLayer.h"27 #include "LegacyTileLayer.h" 28 28 29 29 #if PLATFORM(IOS) 30 30 31 #include " TileCache.h"32 #include " TileGrid.h"31 #include "LegacyTileCache.h" 32 #include "LegacyTileGrid.h" 33 33 #include "WebCoreThread.h" 34 34 35 @implementation TileHostLayer36 - (id)initWithTileGrid:(WebCore:: TileGrid*)tileGrid35 @implementation LegacyTileHostLayer 36 - (id)initWithTileGrid:(WebCore::LegacyTileGrid*)tileGrid 37 37 { 38 38 self = [super init]; … … 60 60 @end 61 61 62 @implementation TileLayer62 @implementation LegacyTileLayer 63 63 @synthesize paintCount = _paintCount; 64 64 @synthesize tileGrid = _tileGrid; 65 65 66 static TileLayer *layerBeingPainted;66 static LegacyTileLayer *layerBeingPainted; 67 67 68 68 - (void)setNeedsDisplayInRect:(CGRect)rect … … 94 94 } 95 95 96 + ( TileLayer *)layerBeingPainted96 + (LegacyTileLayer *)layerBeingPainted 97 97 { 98 98 return layerBeingPainted; -
trunk/Source/WebCore/platform/ios/LegacyTileLayerPool.h
r166453 r166529 24 24 */ 25 25 26 #ifndef TileLayerPool_h27 #define TileLayerPool_h26 #ifndef LegacyTileLayerPool_h 27 #define LegacyTileLayerPool_h 28 28 29 29 #if PLATFORM(IOS) … … 40 40 #include <wtf/Vector.h> 41 41 42 @class TileLayer;42 @class LegacyTileLayer; 43 43 44 44 namespace WebCore { 45 45 46 class TileLayerPool {47 WTF_MAKE_NONCOPYABLE( TileLayerPool);46 class LegacyTileLayerPool { 47 WTF_MAKE_NONCOPYABLE(LegacyTileLayerPool); 48 48 public: 49 static TileLayerPool* sharedPool();49 static LegacyTileLayerPool* sharedPool(); 50 50 51 void addLayer(const RetainPtr< TileLayer>&);52 RetainPtr< TileLayer> takeLayerWithSize(const IntSize&);51 void addLayer(const RetainPtr<LegacyTileLayer>&); 52 RetainPtr<LegacyTileLayer> takeLayerWithSize(const IntSize&); 53 53 54 54 // The maximum size of all queued layers in bytes. … … 62 62 63 63 private: 64 TileLayerPool();64 LegacyTileLayerPool(); 65 65 66 typedef Deque<RetainPtr< TileLayer> > LayerList;66 typedef Deque<RetainPtr<LegacyTileLayer> > LayerList; 67 67 68 68 bool canReuseLayerWithSize(const IntSize& size) const { return m_capacity && !size.isEmpty(); } … … 82 82 bool m_needsPrune; 83 83 84 friend NeverDestroyed< TileLayerPool>;84 friend NeverDestroyed<LegacyTileLayerPool>; 85 85 }; 86 86 -
trunk/Source/WebCore/platform/ios/LegacyTileLayerPool.mm
r166453 r166529 25 25 26 26 #include "config.h" 27 #include " TileLayerPool.h"27 #include "LegacyTileLayerPool.h" 28 28 29 29 #if PLATFORM(IOS) 30 30 31 #include "LegacyTileLayer.h" 32 #include "LegacyTileGrid.h" 31 33 #include "Logging.h" 32 34 #include "MemoryPressureHandler.h" 33 #include "TileLayer.h"34 #include "TileGrid.h"35 35 #include <wtf/CurrentTime.h> 36 36 #include <wtf/NeverDestroyed.h> … … 40 40 static const double capacityDecayTime = 5; 41 41 42 TileLayerPool::TileLayerPool()42 LegacyTileLayerPool::LegacyTileLayerPool() 43 43 : m_totalBytes(0) 44 44 , m_capacity(0) … … 48 48 } 49 49 50 TileLayerPool*TileLayerPool::sharedPool()50 LegacyTileLayerPool* LegacyTileLayerPool::sharedPool() 51 51 { 52 static NeverDestroyed< TileLayerPool> sharedPool;52 static NeverDestroyed<LegacyTileLayerPool> sharedPool; 53 53 return &sharedPool.get(); 54 54 } 55 55 56 unsigned TileLayerPool::bytesBackingLayerWithPixelSize(const IntSize& size)56 unsigned LegacyTileLayerPool::bytesBackingLayerWithPixelSize(const IntSize& size) 57 57 { 58 58 return size.width() * size.height() * 4; 59 59 } 60 60 61 TileLayerPool::LayerList&TileLayerPool::listOfLayersWithSize(const IntSize& size, AccessType accessType)61 LegacyTileLayerPool::LayerList& LegacyTileLayerPool::listOfLayersWithSize(const IntSize& size, AccessType accessType) 62 62 { 63 63 ASSERT(!m_layerPoolMutex.tryLock()); … … 73 73 } 74 74 75 void TileLayerPool::addLayer(const RetainPtr<TileLayer>& layer)75 void LegacyTileLayerPool::addLayer(const RetainPtr<LegacyTileLayer>& layer) 76 76 { 77 77 IntSize layerSize([layer.get() frame].size); … … 93 93 } 94 94 95 RetainPtr< TileLayer>TileLayerPool::takeLayerWithSize(const IntSize& size)95 RetainPtr<LegacyTileLayer> LegacyTileLayerPool::takeLayerWithSize(const IntSize& size) 96 96 { 97 97 if (!canReuseLayerWithSize(size)) … … 105 105 } 106 106 107 void TileLayerPool::setCapacity(unsigned capacity)107 void LegacyTileLayerPool::setCapacity(unsigned capacity) 108 108 { 109 109 MutexLocker reuseLocker(m_layerPoolMutex); … … 113 113 } 114 114 115 unsigned TileLayerPool::decayedCapacity() const115 unsigned LegacyTileLayerPool::decayedCapacity() const 116 116 { 117 117 // Decay to one quarter over capacityDecayTime … … 123 123 } 124 124 125 void TileLayerPool::schedulePrune()125 void LegacyTileLayerPool::schedulePrune() 126 126 { 127 127 ASSERT(!m_layerPoolMutex.tryLock()); … … 135 135 } 136 136 137 void TileLayerPool::prune()137 void LegacyTileLayerPool::prune() 138 138 { 139 139 MutexLocker locker(m_layerPoolMutex); … … 162 162 } 163 163 164 void TileLayerPool::drain()164 void LegacyTileLayerPool::drain() 165 165 { 166 166 MutexLocker reuseLocker(m_layerPoolMutex); -
trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm
r166394 r166529 237 237 } 238 238 239 TileCache* ScrollView::tileCache()239 LegacyTileCache* ScrollView::legacyTileCache() 240 240 { 241 241 // Make tile cache pointer available via the main frame only. Tile cache interaction should be managed by -
trunk/Source/WebCore/platform/ios/wak/WAKWindow.h
r161603 r166529 41 41 #ifdef __cplusplus 42 42 namespace WebCore { 43 class TileCache;43 class LegacyTileCache; 44 44 } 45 typedef WebCore:: TileCacheTileCache;45 typedef WebCore::LegacyTileCache LegacyTileCache; 46 46 #else 47 typedef struct TileCacheTileCache;47 typedef struct LegacyTileCache LegacyTileCache; 48 48 #endif 49 49 … … 70 70 { 71 71 CALayer* _hostLayer; 72 TileCache* _tileCache;72 LegacyTileCache* _tileCache; 73 73 CGRect _frozenVisibleRect; 74 74 CALayer *_rootLayer; … … 161 161 - (void)setKeepsZoomedOutTiles:(BOOL)keepsZoomedOutTiles; 162 162 - (BOOL)keepsZoomedOutTiles; 163 - ( TileCache *)tileCache;163 - (LegacyTileCache *)tileCache; 164 164 165 165 - (void)dumpTiles; -
trunk/Source/WebCore/platform/ios/wak/WAKWindow.mm
r161603 r166529 29 29 #if PLATFORM(IOS) 30 30 31 #import " TileCache.h"31 #import "LegacyTileCache.h" 32 32 #import "WAKViewPrivate.h" 33 33 #import "WebCoreSystemInterface.h" … … 74 74 _screenScale = wkGetScreenScaleFactor(); 75 75 76 _tileCache = new TileCache(self);76 _tileCache = new LegacyTileCache(self); 77 77 78 78 _frozenVisibleRect = CGRectNull; … … 485 485 if (!_tileCache) 486 486 return; 487 _tileCache->setTilingMode(( TileCache::TilingMode)mode);487 _tileCache->setTilingMode((LegacyTileCache::TilingMode)mode); 488 488 } 489 489 … … 499 499 if (!_tileCache) 500 500 return; 501 _tileCache->setTilingDirection(( TileCache::TilingDirection)tilingDirection);501 _tileCache->setTilingDirection((LegacyTileCache::TilingDirection)tilingDirection); 502 502 } 503 503 … … 551 551 } 552 552 553 - ( TileCache*)tileCache553 - (LegacyTileCache*)tileCache 554 554 { 555 555 return _tileCache; -
trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp
r166489 r166529 67 67 68 68 #if PLATFORM(IOS) 69 #include "LegacyTileCache.h" 69 70 #include "MainFrame.h" 70 71 #include "Region.h" 71 72 #include "RenderScrollbar.h" 72 #include "TileCache.h"73 73 #endif 74 74 … … 2682 2682 { 2683 2683 #if PLATFORM(IOS) 2684 TileCache* tileCache = nullptr;2684 LegacyTileCache* tileCache = nullptr; 2685 2685 if (Page* page = this->page()) { 2686 2686 if (FrameView* frameView = page->mainFrame().view()) 2687 tileCache = frameView-> tileCache();2687 tileCache = frameView->legacyTileCache(); 2688 2688 } 2689 2689 … … 2691 2691 return 1; 2692 2692 2693 return tileCache->tilingMode() == TileCache::Zooming ? 0.125 : 1;2693 return tileCache->tilingMode() == LegacyTileCache::Zooming ? 0.125 : 1; 2694 2694 #else 2695 2695 return 1; -
trunk/Source/WebKit/mac/ChangeLog
r166448 r166529 1 2014-03-31 Antti Koivisto <antti@apple.com> 2 3 Rename TileCache to LegacyTileCache 4 https://bugs.webkit.org/show_bug.cgi?id=130986 5 6 Reviewed by Simon Fraser. 7 8 * WebView/WebView.mm: 9 (+[WebView drainLayerPool]): 10 (+[WebView _setTileCacheLayerPoolCapacity:]): 11 1 12 2014-03-28 Darin Adler <darin@apple.com> 2 13 -
trunk/Source/WebKit/mac/WebView/WebView.mm
r166378 r166529 233 233 #import <WebCore/GraphicsLayer.h> 234 234 #import <WebCore/IconController.h> 235 #import <WebCore/LegacyTileCache.h> 235 236 #import <WebCore/NetworkStateNotifier.h> 236 237 #import <WebCore/RuntimeApplicationChecksIOS.h> … … 238 239 #import <WebCore/SmartReplace.h> 239 240 #import <WebCore/TextRun.h> 240 #import <WebCore/TileCache.h>241 241 #import <WebCore/TileControllerMemoryHandlerIOS.h> 242 242 #import <WebCore/WAKWindow.h> … … 1331 1331 ASSERT(WebThreadIsCurrent()); 1332 1332 WebKit::MemoryMeasure measurer("Memory warning: Draining layer pool."); 1333 WebCore:: TileCache::drainLayerPool();1333 WebCore::LegacyTileCache::drainLayerPool(); 1334 1334 } 1335 1335 … … 4550 4550 + (void)_setTileCacheLayerPoolCapacity:(unsigned)capacity 4551 4551 { 4552 TileCache::setLayerPoolCapacity(capacity);4552 LegacyTileCache::setLayerPoolCapacity(capacity); 4553 4553 } 4554 4554 #endif // PLATFORM(IOS)
Note: See TracChangeset
for help on using the changeset viewer.