Changeset 218421 in webkit
- Timestamp:
- Jun 16, 2017 3:46:21 PM (7 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 6 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r218395 r218421 2273 2273 platform/graphics/FontCascadeFonts.cpp 2274 2274 platform/graphics/FontDescription.cpp 2275 platform/graphics/FontFamilySpecificationNull.cpp 2275 2276 platform/graphics/FontSelectionAlgorithm.cpp 2276 2277 platform/graphics/FontTaggedSettings.cpp -
trunk/Source/WebCore/ChangeLog
r218419 r218421 1 2017-06-16 Myles C. Maxfield <mmaxfield@apple.com> 2 3 Make builds faster after r218371 4 https://bugs.webkit.org/show_bug.cgi?id=173453 5 6 Reviewed by Tim Horton. 7 8 Remove #includes from .h files. 9 10 No new tests because there is no behavior change. 11 12 * CMakeLists.txt: 13 * WebCore.xcodeproj/project.pbxproj: Add new .cpp file, and sort the project file 14 * platform/graphics/FontFamilySpecificationNull.cpp: Copied from Source/WebCore/platform/graphics/FontFamilySpecificationNull.h. 15 (WebCore::FontFamilySpecificationNull::fontRanges): 16 * platform/graphics/FontFamilySpecificationNull.h: 17 (WebCore::FontFamilySpecificationNull::fontRanges): Deleted. 18 * platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp: 19 (WebCore::FontFamilySpecificationCoreText::FontFamilySpecificationCoreText): 20 (WebCore::FontFamilySpecificationCoreText::~FontFamilySpecificationCoreText): 21 * platform/graphics/cocoa/FontFamilySpecificationCoreText.h: 22 (WebCore::FontFamilySpecificationCoreText::FontFamilySpecificationCoreText): Deleted. 23 1 24 2017-06-16 Chris Dumez <cdumez@apple.com> 2 25 -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r218395 r218421 2870 2870 69A6CBAC1C6BE42C00B836E9 /* AccessibilitySVGElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 697101071C6BE1550018C7F1 /* AccessibilitySVGElement.cpp */; }; 2871 2871 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 697101081C6BE1550018C7F1 /* AccessibilitySVGElement.h */; }; 2872 6A32D7CE1A16D8C000412F0B /* InspectorCanvasAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A4B6D6619D225D8006F11D3 /* InspectorCanvasAgent.cpp */; }; 2873 6A4B6D6519D22519006F11D3 /* InspectorCanvasAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 6A4B6D6419D22519006F11D3 /* InspectorCanvasAgent.h */; }; 2872 2874 6B3480940EEF50D400AC1B41 /* NativeImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B3480920EEF50D400AC1B41 /* NativeImage.h */; settings = {ATTRIBUTES = (Private, ); }; }; 2873 2875 6B693A2E1C51A82E00B03BEF /* ResourceLoadObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B693A2D1C51A82E00B03BEF /* ResourceLoadObserver.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 6010 6012 C28083401C6DC275001451B6 /* JSFontFace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C280833D1C6DC22C001451B6 /* JSFontFace.cpp */; }; 6011 6013 C28083421C6DC96A001451B6 /* JSFontFaceCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C28083411C6DC96A001451B6 /* JSFontFaceCustom.cpp */; }; 6014 C280B3FE1EF4608900D35135 /* FontFamilySpecificationNull.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C280B3FD1EF4608900D35135 /* FontFamilySpecificationNull.cpp */; }; 6012 6015 C2AB0AF61E6B3C6C001348C5 /* FontSelectionAlgorithm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2AB0AF41E6B3C6C001348C5 /* FontSelectionAlgorithm.cpp */; }; 6013 6016 C2AB0AF71E6B3C6C001348C5 /* FontSelectionAlgorithm.h in Headers */ = {isa = PBXBuildFile; fileRef = C2AB0AF51E6B3C6C001348C5 /* FontSelectionAlgorithm.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 10710 10713 697101071C6BE1550018C7F1 /* AccessibilitySVGElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilitySVGElement.cpp; sourceTree = "<group>"; }; 10711 10714 697101081C6BE1550018C7F1 /* AccessibilitySVGElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilitySVGElement.h; sourceTree = "<group>"; }; 10715 6A4B6D6419D22519006F11D3 /* InspectorCanvasAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorCanvasAgent.h; sourceTree = "<group>"; }; 10716 6A4B6D6619D225D8006F11D3 /* InspectorCanvasAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorCanvasAgent.cpp; sourceTree = "<group>"; }; 10712 10717 6B3480920EEF50D400AC1B41 /* NativeImage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NativeImage.h; sourceTree = "<group>"; }; 10713 10718 6B693A2D1C51A82E00B03BEF /* ResourceLoadObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceLoadObserver.h; sourceTree = "<group>"; }; … … 14534 14539 C280833E1C6DC22C001451B6 /* JSFontFace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSFontFace.h; sourceTree = "<group>"; }; 14535 14540 C28083411C6DC96A001451B6 /* JSFontFaceCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFontFaceCustom.cpp; sourceTree = "<group>"; }; 14541 C280B3FD1EF4608900D35135 /* FontFamilySpecificationNull.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontFamilySpecificationNull.cpp; sourceTree = "<group>"; }; 14536 14542 C2AB0AF41E6B3C6C001348C5 /* FontSelectionAlgorithm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontSelectionAlgorithm.cpp; sourceTree = "<group>"; }; 14537 14543 C2AB0AF51E6B3C6C001348C5 /* FontSelectionAlgorithm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontSelectionAlgorithm.h; sourceTree = "<group>"; }; 14538 14544 C2AB0B021E6DE32B001348C5 /* FontSelectionKeywordValues.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FontSelectionKeywordValues.h; sourceTree = "<group>"; }; 14539 14545 C2AB0B031E6DE92C001348C5 /* FontSelectionValueInlines.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FontSelectionValueInlines.h; sourceTree = "<group>"; }; 14546 C2C2CF551EF3761A004281A8 /* FontFamilySpecificationNull.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontFamilySpecificationNull.h; sourceTree = "<group>"; }; 14540 14547 C2E38EFB1E8396FD00CA3ADF /* CSSFontStyleValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSFontStyleValue.cpp; sourceTree = "<group>"; }; 14541 14548 C2E38EFC1E8396FD00CA3ADF /* CSSFontStyleValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSFontStyleValue.h; sourceTree = "<group>"; }; … … 23194 23201 37ACCE620DA2AA960089E602 /* FontDescription.cpp */, 23195 23202 B2C3DA550D006CD600EF6F26 /* FontDescription.h */, 23203 C280B3FD1EF4608900D35135 /* FontFamilySpecificationNull.cpp */, 23204 C2C2CF551EF3761A004281A8 /* FontFamilySpecificationNull.h */, 23196 23205 E44EE3A617576E5500EEE8CF /* FontGenericFamilies.cpp */, 23197 23206 E44EE3A717576E5500EEE8CF /* FontGenericFamilies.h */, … … 23210 23219 7CE6CBFC187F394900D46BF5 /* FormatConverter.cpp */, 23211 23220 7CE6CBFA187F370700D46BF5 /* FormatConverter.h */, 23221 CD525BA11EE0B10700788DF5 /* FourCC.cpp */, 23222 CD525BA21EE0B10700788DF5 /* FourCC.h */, 23212 23223 4FB390AC15EF61F3007AD51F /* GeneratedImage.cpp */, 23213 23224 BC23F0DA0DAFF4A4009FDC91 /* GeneratedImage.h */, … … 23332 23343 379919941200DDF400EA041C /* WOFFFileFormat.cpp */, 23333 23344 379919951200DDF400EA041C /* WOFFFileFormat.h */, 23334 CD525BA11EE0B10700788DF5 /* FourCC.cpp */,23335 CD525BA21EE0B10700788DF5 /* FourCC.h */,23336 23345 ); 23337 23346 path = graphics; … … 23469 23478 B2AFFC780D00A5C10030074D /* FontCascadeCocoa.mm */, 23470 23479 7C4EDD731A7B607800198C4D /* FontCocoa.mm */, 23480 1C12AC2C1EE779950079E0A0 /* FontDescriptionCocoa.cpp */, 23481 1C12AC281EE778AE0079E0A0 /* FontFamilySpecificationCoreText.cpp */, 23482 1C12AC291EE778AE0079E0A0 /* FontFamilySpecificationCoreText.h */, 23471 23483 B5320D6A122A24E9002D1440 /* FontPlatformDataCocoa.mm */, 23472 23484 316BDBA51E71FA6F00DE0D5A /* GPUBufferMetal.mm */, … … 23504 23516 316BDB8A1E6E153000DE0D5A /* WebGPULayer.h */, 23505 23517 316BDB891E6E153000DE0D5A /* WebGPULayer.mm */, 23506 1C12AC281EE778AE0079E0A0 /* FontFamilySpecificationCoreText.cpp */,23507 1C12AC291EE778AE0079E0A0 /* FontFamilySpecificationCoreText.h */,23508 1C12AC2C1EE779950079E0A0 /* FontDescriptionCocoa.cpp */,23509 23518 ); 23510 23519 path = cocoa; … … 24492 24501 CD54A760180F9F7000B076C9 /* AudioTrackPrivateMediaSourceAVFObjC.cpp */, 24493 24502 CD54A761180F9F7000B076C9 /* AudioTrackPrivateMediaSourceAVFObjC.h */, 24503 CDECA8991EDF447D00DCB08B /* AVAssetTrackUtilities.h */, 24504 CDECA8981EDF447D00DCB08B /* AVAssetTrackUtilities.mm */, 24494 24505 07C8AD121D073D630087C5CE /* AVFoundationMIMETypeCache.h */, 24495 24506 07C8AD111D073D630087C5CE /* AVFoundationMIMETypeCache.mm */, … … 24529 24540 CD7E05201651A84100C1201F /* WebCoreAVFResourceLoader.h */, 24530 24541 CD7E05211651A84100C1201F /* WebCoreAVFResourceLoader.mm */, 24531 CDECA8981EDF447D00DCB08B /* AVAssetTrackUtilities.mm */,24532 CDECA8991EDF447D00DCB08B /* AVAssetTrackUtilities.h */,24533 24542 ); 24534 24543 path = objc; … … 26638 26647 45830D4E1679B4F800ACF8C3 /* AutoscrollController.h in Headers */, 26639 26648 A8CFF04E0A154F09000A4234 /* AutoTableLayout.h in Headers */, 26649 CDECA89B1EDF447D00DCB08B /* AVAssetTrackUtilities.h in Headers */, 26640 26650 CDC675271EAEA9D400727C84 /* AVAudioSessionCaptureDevice.h in Headers */, 26641 26651 CDC675231EAEA9B700727C84 /* AVAudioSessionCaptureDeviceManager.h in Headers */, … … 26826 26836 51FB67DC1AE6B82F00D06C5A /* ContentExtensionStyleSheet.h in Headers */, 26827 26837 A149786F1ABAF33800CEF7E4 /* ContentFilter.h in Headers */, 26828 1C12AC2B1EE778AE0079E0A0 /* FontFamilySpecificationCoreText.h in Headers */,26829 26838 A14090FD1AA51E480091191A /* ContentFilterUnblockHandler.h in Headers */, 26830 26839 97C471DC12F925BD0086354B /* ContentSecurityPolicy.h in Headers */, … … 27363 27372 1C6626111C6E7CA600AB527C /* FontFace.h in Headers */, 27364 27373 1C24EEA51C729CE40080F8FC /* FontFaceSet.h in Headers */, 27374 1C12AC2B1EE778AE0079E0A0 /* FontFamilySpecificationCoreText.h in Headers */, 27365 27375 0845680812B90DA600960A9F /* FontMetrics.h in Headers */, 27366 27376 B5320D6B122A24E9002D1440 /* FontPlatformData.h in Headers */, … … 27383 27393 656D373A0ADBA5DE00A4554D /* FormState.h in Headers */, 27384 27394 41885B9311B6FDA6003383BB /* FormSubmission.h in Headers */, 27395 CD525BA41EE0B10700788DF5 /* FourCC.h in Headers */, 27385 27396 A853123D11D0471B00D4D077 /* FragmentScriptingPermission.h in Headers */, 27386 27397 65BF022F0974816300C43196 /* Frame.h in Headers */, … … 28273 28284 AA7FEEA916A4E6F3004C0C33 /* JSSpeechSynthesisVoice.h in Headers */, 28274 28285 BC8243290D0CE8A200460C8F /* JSSQLError.h in Headers */, 28275 CDECA89B1EDF447D00DCB08B /* AVAssetTrackUtilities.h in Headers */,28276 28286 B525A96511CA2340003A23A8 /* JSSQLException.h in Headers */, 28277 28287 1AE82FED0CAB07EE002237AE /* JSSQLResultSet.h in Headers */, … … 29408 29418 7AAFE8D019CB8672000F56D8 /* ScrollLatchingState.h in Headers */, 29409 29419 F478755419983AFF0024A287 /* ScrollSnapAnimatorState.h in Headers */, 29410 CD525BA41EE0B10700788DF5 /* FourCC.h in Headers */,29411 29420 F46729281E0DE68500ACC3D8 /* ScrollSnapOffsetsInfo.h in Headers */, 29412 29421 83C5795D1DA5C301006FACA8 /* ScrollToOptions.h in Headers */, … … 30772 30781 45830D4D1679B4F800ACF8C3 /* AutoscrollController.cpp in Sources */, 30773 30782 A8CFF0500A154F09000A4234 /* AutoTableLayout.cpp in Sources */, 30783 CDECA89A1EDF447D00DCB08B /* AVAssetTrackUtilities.mm in Sources */, 30774 30784 CDC675261EAEA9D400727C84 /* AVAudioSessionCaptureDevice.mm in Sources */, 30775 30785 CDC675221EAEA9B700727C84 /* AVAudioSessionCaptureDeviceManager.mm in Sources */, … … 31254 31264 B5B7A17017C10AA800E4AA0A /* ElementData.cpp in Sources */, 31255 31265 4FFC022D1643B726004E1638 /* ElementRareData.cpp in Sources */, 31256 CD525BA31EE0B10700788DF5 /* FourCC.cpp in Sources */,31257 31266 FBDB619B16D6032A00BB3394 /* ElementRuleCollector.cpp in Sources */, 31258 31267 A8CFF6CB0A1561CD000A4234 /* EllipsisBox.cpp in Sources */, … … 31372 31381 B2AFFC7D0D00A5C10030074D /* FontCustomPlatformData.cpp in Sources */, 31373 31382 37ACCF690DA414E70089E602 /* FontDescription.cpp in Sources */, 31383 1C12AC2D1EE779950079E0A0 /* FontDescriptionCocoa.cpp in Sources */, 31374 31384 1C6626101C6E7CA600AB527C /* FontFace.cpp in Sources */, 31375 31385 1C24EEA41C729CE40080F8FC /* FontFaceSet.cpp in Sources */, 31386 1C12AC2A1EE778AE0079E0A0 /* FontFamilySpecificationCoreText.cpp in Sources */, 31387 C280B3FE1EF4608900D35135 /* FontFamilySpecificationNull.cpp in Sources */, 31376 31388 E44EE3A817577EBD00EEE8CF /* FontGenericFamilies.cpp in Sources */, 31377 31389 84B62685133138F90095A489 /* FontPlatformData.cpp in Sources */, … … 31382 31394 1C3249111C6D6A3B007EDB32 /* FontVariantBuilder.cpp in Sources */, 31383 31395 4A0DA2FE129B241900AB61E1 /* FormAssociatedElement.cpp in Sources */, 31384 1C12AC2A1EE778AE0079E0A0 /* FontFamilySpecificationCoreText.cpp in Sources */,31385 31396 D05CED290A40BB2C00C5AF38 /* FormatBlockCommand.cpp in Sources */, 31386 31397 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, … … 31393 31404 656D373B0ADBA5DE00A4554D /* FormState.cpp in Sources */, 31394 31405 41885B9411B6FDA6003383BB /* FormSubmission.cpp in Sources */, 31406 CD525BA31EE0B10700788DF5 /* FourCC.cpp in Sources */, 31395 31407 65BF022E0974816300C43196 /* Frame.cpp in Sources */, 31396 31408 974A862214B7ADBB003FDC76 /* FrameDestructionObserver.cpp in Sources */, … … 32607 32619 CDE8B5F01A69778B00B4B66A /* LegacyCDMSessionClearKey.cpp in Sources */, 32608 32620 E4C3B1FC0F0E4170009693F6 /* LegacyTileCache.mm in Sources */, 32609 1C12AC2D1EE779950079E0A0 /* FontDescriptionCocoa.cpp in Sources */,32610 32621 E4B65A5A132FAAF90070E7BE /* LegacyTileGrid.mm in Sources */, 32611 32622 E424A3A01330DF1E00CF6DC9 /* LegacyTileGridTile.mm in Sources */, … … 33249 33260 93EF7D551954F13900DFB71D /* ScrollingStateNode.mm in Sources */, 33250 33261 0FEA3E83191B31BF000F1B55 /* ScrollingStateOverflowScrollingNode.cpp in Sources */, 33251 CDECA89A1EDF447D00DCB08B /* AVAssetTrackUtilities.mm in Sources */,33252 33262 931CBD0E161A44E900E4C874 /* ScrollingStateScrollingNode.cpp in Sources */, 33253 33263 0FB8890E167D30160010CDA5 /* ScrollingStateStickyNode.cpp in Sources */, -
trunk/Source/WebCore/platform/graphics/FontFamilySpecificationNull.cpp
r218420 r218421 24 24 */ 25 25 26 #pragma once 26 #include "config.h" 27 #include "FontFamilySpecificationNull.h" 27 28 28 29 #include "FontSelector.h" … … 30 31 namespace WebCore { 31 32 32 class FontFamilySpecificationNull { 33 public: 34 FontFamilySpecificationNull() = delete; 35 36 FontRanges fontRanges(const FontDescription&) const 37 { 38 ASSERT_NOT_REACHED(); 39 return FontRanges(); 40 } 41 }; 33 FontRanges FontFamilySpecificationNull::fontRanges(const FontDescription&) const 34 { 35 ASSERT_NOT_REACHED(); 36 return FontRanges(); 37 } 42 38 43 39 } 44 -
trunk/Source/WebCore/platform/graphics/FontFamilySpecificationNull.h
r218372 r218421 26 26 #pragma once 27 27 28 #include "FontSelector.h" 28 namespace WebCore { 29 29 30 namespace WebCore { 30 class FontDescription; 31 class FontRanges; 31 32 32 33 class FontFamilySpecificationNull { … … 34 35 FontFamilySpecificationNull() = delete; 35 36 36 FontRanges fontRanges(const FontDescription&) const 37 { 38 ASSERT_NOT_REACHED(); 39 return FontRanges(); 40 } 37 FontRanges fontRanges(const FontDescription&) const; 41 38 }; 42 39 -
trunk/Source/WebCore/platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp
r218372 r218421 28 28 29 29 #include "FontCache.h" 30 #include "FontSelector.h" 31 #include <CoreText/CoreText.h> 30 32 31 33 namespace WebCore { 34 35 FontFamilySpecificationCoreText::FontFamilySpecificationCoreText(CTFontDescriptorRef fontDescriptor) 36 : m_fontDescriptor(fontDescriptor) 37 { 38 } 39 40 FontFamilySpecificationCoreText::~FontFamilySpecificationCoreText() 41 { 42 } 32 43 33 44 FontRanges FontFamilySpecificationCoreText::fontRanges(const FontDescription& fontDescription) const -
trunk/Source/WebCore/platform/graphics/cocoa/FontFamilySpecificationCoreText.h
r218372 r218421 26 26 #pragma once 27 27 28 #include "FontSelector.h"29 #include <CoreText/CoreText.h>30 28 #include <wtf/RetainPtr.h> 29 30 typedef const struct __CTFontDescriptor* CTFontDescriptorRef; 31 31 32 32 namespace WebCore { 33 33 34 class FontDescription; 35 class FontRanges; 36 34 37 class FontFamilySpecificationCoreText { 35 38 public: 36 FontFamilySpecificationCoreText(CTFontDescriptorRef fontDescriptor) 37 : m_fontDescriptor(fontDescriptor) 38 { 39 } 39 FontFamilySpecificationCoreText(CTFontDescriptorRef); 40 ~FontFamilySpecificationCoreText(); 40 41 41 42 FontRanges fontRanges(const FontDescription&) const;
Note: See TracChangeset
for help on using the changeset viewer.