Make builds faster after r218371
authormmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Jun 2017 22:46:21 +0000 (22:46 +0000)
committermmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Jun 2017 22:46:21 +0000 (22:46 +0000)
https://bugs.webkit.org/show_bug.cgi?id=173453

Reviewed by Tim Horton.

Remove #includes from .h files.

No new tests because there is no behavior change.

* CMakeLists.txt:
* WebCore.xcodeproj/project.pbxproj: Add new .cpp file, and sort the project file
* platform/graphics/FontFamilySpecificationNull.cpp: Copied from Source/WebCore/platform/graphics/FontFamilySpecificationNull.h.
(WebCore::FontFamilySpecificationNull::fontRanges):
* platform/graphics/FontFamilySpecificationNull.h:
(WebCore::FontFamilySpecificationNull::fontRanges): Deleted.
* platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp:
(WebCore::FontFamilySpecificationCoreText::FontFamilySpecificationCoreText):
(WebCore::FontFamilySpecificationCoreText::~FontFamilySpecificationCoreText):
* platform/graphics/cocoa/FontFamilySpecificationCoreText.h:
(WebCore::FontFamilySpecificationCoreText::FontFamilySpecificationCoreText): Deleted.

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

Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/platform/graphics/FontFamilySpecificationNull.cpp [new file with mode: 0644]
Source/WebCore/platform/graphics/FontFamilySpecificationNull.h
Source/WebCore/platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp
Source/WebCore/platform/graphics/cocoa/FontFamilySpecificationCoreText.h

index 3fe925c..38a0ba1 100644 (file)
@@ -2272,6 +2272,7 @@ set(WebCore_SOURCES
     platform/graphics/FontCascade.cpp
     platform/graphics/FontCascadeFonts.cpp
     platform/graphics/FontDescription.cpp
+    platform/graphics/FontFamilySpecificationNull.cpp
     platform/graphics/FontSelectionAlgorithm.cpp
     platform/graphics/FontTaggedSettings.cpp
     platform/graphics/FontGenericFamilies.cpp
index ebfb4a8..4284d79 100644 (file)
@@ -1,3 +1,26 @@
+2017-06-16  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Make builds faster after r218371
+        https://bugs.webkit.org/show_bug.cgi?id=173453
+
+        Reviewed by Tim Horton.
+
+        Remove #includes from .h files.
+
+        No new tests because there is no behavior change.
+
+        * CMakeLists.txt:
+        * WebCore.xcodeproj/project.pbxproj: Add new .cpp file, and sort the project file
+        * platform/graphics/FontFamilySpecificationNull.cpp: Copied from Source/WebCore/platform/graphics/FontFamilySpecificationNull.h.
+        (WebCore::FontFamilySpecificationNull::fontRanges):
+        * platform/graphics/FontFamilySpecificationNull.h:
+        (WebCore::FontFamilySpecificationNull::fontRanges): Deleted.
+        * platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp:
+        (WebCore::FontFamilySpecificationCoreText::FontFamilySpecificationCoreText):
+        (WebCore::FontFamilySpecificationCoreText::~FontFamilySpecificationCoreText):
+        * platform/graphics/cocoa/FontFamilySpecificationCoreText.h:
+        (WebCore::FontFamilySpecificationCoreText::FontFamilySpecificationCoreText): Deleted.
+
 2017-06-16  Chris Dumez  <cdumez@apple.com>
 
         [WK2] Add WKProcessPool SPI to efficiently reset all plugin load client policies
index d3b5034..72dd954 100644 (file)
                65FEA86909833ADE00BED4AB /* Page.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65FEA86809833ADE00BED4AB /* Page.cpp */; };
                69A6CBAC1C6BE42C00B836E9 /* AccessibilitySVGElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 697101071C6BE1550018C7F1 /* AccessibilitySVGElement.cpp */; };
                69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 697101081C6BE1550018C7F1 /* AccessibilitySVGElement.h */; };
+               6A32D7CE1A16D8C000412F0B /* InspectorCanvasAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A4B6D6619D225D8006F11D3 /* InspectorCanvasAgent.cpp */; };
+               6A4B6D6519D22519006F11D3 /* InspectorCanvasAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 6A4B6D6419D22519006F11D3 /* InspectorCanvasAgent.h */; };
                6B3480940EEF50D400AC1B41 /* NativeImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B3480920EEF50D400AC1B41 /* NativeImage.h */; settings = {ATTRIBUTES = (Private, ); }; };
                6B693A2E1C51A82E00B03BEF /* ResourceLoadObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B693A2D1C51A82E00B03BEF /* ResourceLoadObserver.h */; settings = {ATTRIBUTES = (Private, ); }; };
                6B693A341C51A95D00B03BEF /* ResourceLoadObserver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B693A331C51A95D00B03BEF /* ResourceLoadObserver.cpp */; };
                C280833F1C6DC26F001451B6 /* JSFontFace.h in Headers */ = {isa = PBXBuildFile; fileRef = C280833E1C6DC22C001451B6 /* JSFontFace.h */; };
                C28083401C6DC275001451B6 /* JSFontFace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C280833D1C6DC22C001451B6 /* JSFontFace.cpp */; };
                C28083421C6DC96A001451B6 /* JSFontFaceCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C28083411C6DC96A001451B6 /* JSFontFaceCustom.cpp */; };
+               C280B3FE1EF4608900D35135 /* FontFamilySpecificationNull.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C280B3FD1EF4608900D35135 /* FontFamilySpecificationNull.cpp */; };
                C2AB0AF61E6B3C6C001348C5 /* FontSelectionAlgorithm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2AB0AF41E6B3C6C001348C5 /* FontSelectionAlgorithm.cpp */; };
                C2AB0AF71E6B3C6C001348C5 /* FontSelectionAlgorithm.h in Headers */ = {isa = PBXBuildFile; fileRef = C2AB0AF51E6B3C6C001348C5 /* FontSelectionAlgorithm.h */; settings = {ATTRIBUTES = (Private, ); }; };
                C2E1F43F1D6254E10094625C /* BreakLines.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA4816097D93020094C9E4 /* BreakLines.h */; settings = {ATTRIBUTES = (Private, ); }; };
                65FEA86809833ADE00BED4AB /* Page.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Page.cpp; sourceTree = "<group>"; };
                697101071C6BE1550018C7F1 /* AccessibilitySVGElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilitySVGElement.cpp; sourceTree = "<group>"; };
                697101081C6BE1550018C7F1 /* AccessibilitySVGElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilitySVGElement.h; sourceTree = "<group>"; };
+               6A4B6D6419D22519006F11D3 /* InspectorCanvasAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorCanvasAgent.h; sourceTree = "<group>"; };
+               6A4B6D6619D225D8006F11D3 /* InspectorCanvasAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorCanvasAgent.cpp; sourceTree = "<group>"; };
                6B3480920EEF50D400AC1B41 /* NativeImage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NativeImage.h; sourceTree = "<group>"; };
                6B693A2D1C51A82E00B03BEF /* ResourceLoadObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceLoadObserver.h; sourceTree = "<group>"; };
                6B693A331C51A95D00B03BEF /* ResourceLoadObserver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceLoadObserver.cpp; sourceTree = "<group>"; };
                C280833D1C6DC22C001451B6 /* JSFontFace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFontFace.cpp; sourceTree = "<group>"; };
                C280833E1C6DC22C001451B6 /* JSFontFace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSFontFace.h; sourceTree = "<group>"; };
                C28083411C6DC96A001451B6 /* JSFontFaceCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFontFaceCustom.cpp; sourceTree = "<group>"; };
+               C280B3FD1EF4608900D35135 /* FontFamilySpecificationNull.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontFamilySpecificationNull.cpp; sourceTree = "<group>"; };
                C2AB0AF41E6B3C6C001348C5 /* FontSelectionAlgorithm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontSelectionAlgorithm.cpp; sourceTree = "<group>"; };
                C2AB0AF51E6B3C6C001348C5 /* FontSelectionAlgorithm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontSelectionAlgorithm.h; sourceTree = "<group>"; };
                C2AB0B021E6DE32B001348C5 /* FontSelectionKeywordValues.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FontSelectionKeywordValues.h; sourceTree = "<group>"; };
                C2AB0B031E6DE92C001348C5 /* FontSelectionValueInlines.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FontSelectionValueInlines.h; sourceTree = "<group>"; };
+               C2C2CF551EF3761A004281A8 /* FontFamilySpecificationNull.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontFamilySpecificationNull.h; sourceTree = "<group>"; };
                C2E38EFB1E8396FD00CA3ADF /* CSSFontStyleValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSFontStyleValue.cpp; sourceTree = "<group>"; };
                C2E38EFC1E8396FD00CA3ADF /* CSSFontStyleValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSFontStyleValue.h; sourceTree = "<group>"; };
                C2E38EFF1E84573500CA3ADF /* CSSFontStyleRangeValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSFontStyleRangeValue.cpp; sourceTree = "<group>"; };
                                B2C3DA570D006CD600EF6F26 /* FontCascadeFonts.h */,
                                37ACCE620DA2AA960089E602 /* FontDescription.cpp */,
                                B2C3DA550D006CD600EF6F26 /* FontDescription.h */,
+                               C280B3FD1EF4608900D35135 /* FontFamilySpecificationNull.cpp */,
+                               C2C2CF551EF3761A004281A8 /* FontFamilySpecificationNull.h */,
                                E44EE3A617576E5500EEE8CF /* FontGenericFamilies.cpp */,
                                E44EE3A717576E5500EEE8CF /* FontGenericFamilies.h */,
                                0845680712B90DA600960A9F /* FontMetrics.h */,
                                4A6E9FC613C17D570046A7F8 /* FontTaggedSettings.h */,
                                7CE6CBFC187F394900D46BF5 /* FormatConverter.cpp */,
                                7CE6CBFA187F370700D46BF5 /* FormatConverter.h */,
+                               CD525BA11EE0B10700788DF5 /* FourCC.cpp */,
+                               CD525BA21EE0B10700788DF5 /* FourCC.h */,
                                4FB390AC15EF61F3007AD51F /* GeneratedImage.cpp */,
                                BC23F0DA0DAFF4A4009FDC91 /* GeneratedImage.h */,
                                0FB6252C18DE1B1500A07C05 /* GeometryUtilities.cpp */,
                                501BAAA813950E2C00F7ACEB /* WindRule.h */,
                                379919941200DDF400EA041C /* WOFFFileFormat.cpp */,
                                379919951200DDF400EA041C /* WOFFFileFormat.h */,
-                               CD525BA11EE0B10700788DF5 /* FourCC.cpp */,
-                               CD525BA21EE0B10700788DF5 /* FourCC.h */,
                        );
                        path = graphics;
                        sourceTree = "<group>";
                                1C3969CF1B74211E002BCFA7 /* FontCacheCoreText.cpp */,
                                B2AFFC780D00A5C10030074D /* FontCascadeCocoa.mm */,
                                7C4EDD731A7B607800198C4D /* FontCocoa.mm */,
+                               1C12AC2C1EE779950079E0A0 /* FontDescriptionCocoa.cpp */,
+                               1C12AC281EE778AE0079E0A0 /* FontFamilySpecificationCoreText.cpp */,
+                               1C12AC291EE778AE0079E0A0 /* FontFamilySpecificationCoreText.h */,
                                B5320D6A122A24E9002D1440 /* FontPlatformDataCocoa.mm */,
                                316BDBA51E71FA6F00DE0D5A /* GPUBufferMetal.mm */,
                                316BDBC61E75EE3D00DE0D5A /* GPUCommandBufferMetal.mm */,
                                CD5D27751E8318E000D80A3D /* WebCoreDecompressionSession.mm */,
                                316BDB8A1E6E153000DE0D5A /* WebGPULayer.h */,
                                316BDB891E6E153000DE0D5A /* WebGPULayer.mm */,
-                               1C12AC281EE778AE0079E0A0 /* FontFamilySpecificationCoreText.cpp */,
-                               1C12AC291EE778AE0079E0A0 /* FontFamilySpecificationCoreText.h */,
-                               1C12AC2C1EE779950079E0A0 /* FontDescriptionCocoa.cpp */,
                        );
                        path = cocoa;
                        sourceTree = "<group>";
                                CDE3A85517F6020400C5BE20 /* AudioTrackPrivateAVFObjC.mm */,
                                CD54A760180F9F7000B076C9 /* AudioTrackPrivateMediaSourceAVFObjC.cpp */,
                                CD54A761180F9F7000B076C9 /* AudioTrackPrivateMediaSourceAVFObjC.h */,
+                               CDECA8991EDF447D00DCB08B /* AVAssetTrackUtilities.h */,
+                               CDECA8981EDF447D00DCB08B /* AVAssetTrackUtilities.mm */,
                                07C8AD121D073D630087C5CE /* AVFoundationMIMETypeCache.h */,
                                07C8AD111D073D630087C5CE /* AVFoundationMIMETypeCache.mm */,
                                CDE595941BF166D100A1CBE8 /* CDMSessionAVContentKeySession.h */,
                                CD8B5A40180D149A008B8E65 /* VideoTrackPrivateMediaSourceAVFObjC.mm */,
                                CD7E05201651A84100C1201F /* WebCoreAVFResourceLoader.h */,
                                CD7E05211651A84100C1201F /* WebCoreAVFResourceLoader.mm */,
-                               CDECA8981EDF447D00DCB08B /* AVAssetTrackUtilities.mm */,
-                               CDECA8991EDF447D00DCB08B /* AVAssetTrackUtilities.h */,
                        );
                        path = objc;
                        sourceTree = "<group>";
                                C9D467051E60C465008195FB /* AutoplayEvent.h in Headers */,
                                45830D4E1679B4F800ACF8C3 /* AutoscrollController.h in Headers */,
                                A8CFF04E0A154F09000A4234 /* AutoTableLayout.h in Headers */,
+                               CDECA89B1EDF447D00DCB08B /* AVAssetTrackUtilities.h in Headers */,
                                CDC675271EAEA9D400727C84 /* AVAudioSessionCaptureDevice.h in Headers */,
                                CDC675231EAEA9B700727C84 /* AVAudioSessionCaptureDeviceManager.h in Headers */,
                                070363E2181A1CDC00C074A5 /* AVCaptureDeviceManager.h in Headers */,
                                262391361A648CEE007251A3 /* ContentExtensionsDebugging.h in Headers */,
                                51FB67DC1AE6B82F00D06C5A /* ContentExtensionStyleSheet.h in Headers */,
                                A149786F1ABAF33800CEF7E4 /* ContentFilter.h in Headers */,
-                               1C12AC2B1EE778AE0079E0A0 /* FontFamilySpecificationCoreText.h in Headers */,
                                A14090FD1AA51E480091191A /* ContentFilterUnblockHandler.h in Headers */,
                                97C471DC12F925BD0086354B /* ContentSecurityPolicy.h in Headers */,
                                CE799FA41C6A503A0097B518 /* ContentSecurityPolicyDirective.h in Headers */,
                                B2C3DA660D006CD600EF6F26 /* FontDescription.h in Headers */,
                                1C6626111C6E7CA600AB527C /* FontFace.h in Headers */,
                                1C24EEA51C729CE40080F8FC /* FontFaceSet.h in Headers */,
+                               1C12AC2B1EE778AE0079E0A0 /* FontFamilySpecificationCoreText.h in Headers */,
                                0845680812B90DA600960A9F /* FontMetrics.h in Headers */,
                                B5320D6B122A24E9002D1440 /* FontPlatformData.h in Headers */,
                                371F4FFC0D25E7F300ECE0D5 /* FontRanges.h in Headers */,
                                9B50B1DE17CD4C0F0087F63C /* FormNamedItem.h in Headers */,
                                656D373A0ADBA5DE00A4554D /* FormState.h in Headers */,
                                41885B9311B6FDA6003383BB /* FormSubmission.h in Headers */,
+                               CD525BA41EE0B10700788DF5 /* FourCC.h in Headers */,
                                A853123D11D0471B00D4D077 /* FragmentScriptingPermission.h in Headers */,
                                65BF022F0974816300C43196 /* Frame.h in Headers */,
                                974A862314B7ADBB003FDC76 /* FrameDestructionObserver.h in Headers */,
                                AA7FEEA716A4E6F3004C0C33 /* JSSpeechSynthesisUtterance.h in Headers */,
                                AA7FEEA916A4E6F3004C0C33 /* JSSpeechSynthesisVoice.h in Headers */,
                                BC8243290D0CE8A200460C8F /* JSSQLError.h in Headers */,
-                               CDECA89B1EDF447D00DCB08B /* AVAssetTrackUtilities.h in Headers */,
                                B525A96511CA2340003A23A8 /* JSSQLException.h in Headers */,
                                1AE82FED0CAB07EE002237AE /* JSSQLResultSet.h in Headers */,
                                1AFE119A0CBFFCC4003017FA /* JSSQLResultSetRowList.h in Headers */,
                                0FB8890A167D2FA10010CDA5 /* ScrollingTreeStickyNode.h in Headers */,
                                7AAFE8D019CB8672000F56D8 /* ScrollLatchingState.h in Headers */,
                                F478755419983AFF0024A287 /* ScrollSnapAnimatorState.h in Headers */,
-                               CD525BA41EE0B10700788DF5 /* FourCC.h in Headers */,
                                F46729281E0DE68500ACC3D8 /* ScrollSnapOffsetsInfo.h in Headers */,
                                83C5795D1DA5C301006FACA8 /* ScrollToOptions.h in Headers */,
                                93C09C860B0657AA005ABD4D /* ScrollTypes.h in Headers */,
                                7C1E97271A9F9834007BF0FB /* AutoFillButtonElement.cpp in Sources */,
                                45830D4D1679B4F800ACF8C3 /* AutoscrollController.cpp in Sources */,
                                A8CFF0500A154F09000A4234 /* AutoTableLayout.cpp in Sources */,
+                               CDECA89A1EDF447D00DCB08B /* AVAssetTrackUtilities.mm in Sources */,
                                CDC675261EAEA9D400727C84 /* AVAudioSessionCaptureDevice.mm in Sources */,
                                CDC675221EAEA9B700727C84 /* AVAudioSessionCaptureDeviceManager.mm in Sources */,
                                070363E3181A1CDC00C074A5 /* AVCaptureDeviceManager.mm in Sources */,
                                A8C4A80809D563270003AC8D /* Element.cpp in Sources */,
                                B5B7A17017C10AA800E4AA0A /* ElementData.cpp in Sources */,
                                4FFC022D1643B726004E1638 /* ElementRareData.cpp in Sources */,
-                               CD525BA31EE0B10700788DF5 /* FourCC.cpp in Sources */,
                                FBDB619B16D6032A00BB3394 /* ElementRuleCollector.cpp in Sources */,
                                A8CFF6CB0A1561CD000A4234 /* EllipsisBox.cpp in Sources */,
                                F55B3DBB1251F12D003EF269 /* EmailInputType.cpp in Sources */,
                                7C4EDD741A7B607800198C4D /* FontCocoa.mm in Sources */,
                                B2AFFC7D0D00A5C10030074D /* FontCustomPlatformData.cpp in Sources */,
                                37ACCF690DA414E70089E602 /* FontDescription.cpp in Sources */,
+                               1C12AC2D1EE779950079E0A0 /* FontDescriptionCocoa.cpp in Sources */,
                                1C6626101C6E7CA600AB527C /* FontFace.cpp in Sources */,
                                1C24EEA41C729CE40080F8FC /* FontFaceSet.cpp in Sources */,
+                               1C12AC2A1EE778AE0079E0A0 /* FontFamilySpecificationCoreText.cpp in Sources */,
+                               C280B3FE1EF4608900D35135 /* FontFamilySpecificationNull.cpp in Sources */,
                                E44EE3A817577EBD00EEE8CF /* FontGenericFamilies.cpp in Sources */,
                                84B62685133138F90095A489 /* FontPlatformData.cpp in Sources */,
                                B5320D6C122A24E9002D1440 /* FontPlatformDataCocoa.mm in Sources */,
                                4A6E9FC713C17D570046A7F8 /* FontTaggedSettings.cpp in Sources */,
                                1C3249111C6D6A3B007EDB32 /* FontVariantBuilder.cpp in Sources */,
                                4A0DA2FE129B241900AB61E1 /* FormAssociatedElement.cpp in Sources */,
-                               1C12AC2A1EE778AE0079E0A0 /* FontFamilySpecificationCoreText.cpp in Sources */,
                                D05CED290A40BB2C00C5AF38 /* FormatBlockCommand.cpp in Sources */,
                                7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */,
                                F50664F7157F52DC00AC226F /* FormController.cpp in Sources */,
                                514C764F0CE9234E007EF3CD /* FormDataStreamMac.mm in Sources */,
                                656D373B0ADBA5DE00A4554D /* FormState.cpp in Sources */,
                                41885B9411B6FDA6003383BB /* FormSubmission.cpp in Sources */,
+                               CD525BA31EE0B10700788DF5 /* FourCC.cpp in Sources */,
                                65BF022E0974816300C43196 /* Frame.cpp in Sources */,
                                974A862214B7ADBB003FDC76 /* FrameDestructionObserver.cpp in Sources */,
                                FED13D3D0CEA936A00D89466 /* FrameIOS.mm in Sources */,
                                CDCA98EB18B2C8EB00C12FF9 /* LegacyCDMPrivateMediaPlayer.cpp in Sources */,
                                CDE8B5F01A69778B00B4B66A /* LegacyCDMSessionClearKey.cpp in Sources */,
                                E4C3B1FC0F0E4170009693F6 /* LegacyTileCache.mm in Sources */,
-                               1C12AC2D1EE779950079E0A0 /* FontDescriptionCocoa.cpp in Sources */,
                                E4B65A5A132FAAF90070E7BE /* LegacyTileGrid.mm in Sources */,
                                E424A3A01330DF1E00CF6DC9 /* LegacyTileGridTile.mm in Sources */,
                                E4B65A5E132FADB60070E7BE /* LegacyTileLayer.mm in Sources */,
                                931CBD0C161A44E900E4C874 /* ScrollingStateNode.cpp in Sources */,
                                93EF7D551954F13900DFB71D /* ScrollingStateNode.mm in Sources */,
                                0FEA3E83191B31BF000F1B55 /* ScrollingStateOverflowScrollingNode.cpp in Sources */,
-                               CDECA89A1EDF447D00DCB08B /* AVAssetTrackUtilities.mm in Sources */,
                                931CBD0E161A44E900E4C874 /* ScrollingStateScrollingNode.cpp in Sources */,
                                0FB8890E167D30160010CDA5 /* ScrollingStateStickyNode.cpp in Sources */,
                                931CBD10161A44E900E4C874 /* ScrollingStateTree.cpp in Sources */,
diff --git a/Source/WebCore/platform/graphics/FontFamilySpecificationNull.cpp b/Source/WebCore/platform/graphics/FontFamilySpecificationNull.cpp
new file mode 100644 (file)
index 0000000..217691f
--- /dev/null
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "FontFamilySpecificationNull.h"
+
+#include "FontSelector.h"
+
+namespace WebCore {
+
+FontRanges FontFamilySpecificationNull::fontRanges(const FontDescription&) const
+{
+    ASSERT_NOT_REACHED();
+    return FontRanges();
+}
+
+}
index 55fee7b..6279e79 100644 (file)
 
 #pragma once
 
-#include "FontSelector.h"
-
 namespace WebCore {
 
+class FontDescription;
+class FontRanges;
+
 class FontFamilySpecificationNull {
 public:
     FontFamilySpecificationNull() = delete;
 
-    FontRanges fontRanges(const FontDescription&) const
-    {
-        ASSERT_NOT_REACHED();
-        return FontRanges();
-    }
+    FontRanges fontRanges(const FontDescription&) const;
 };
 
 }
index e8b3692..4321470 100644 (file)
 #include "FontFamilySpecificationCoreText.h"
 
 #include "FontCache.h"
+#include "FontSelector.h"
+#include <CoreText/CoreText.h>
 
 namespace WebCore {
 
+FontFamilySpecificationCoreText::FontFamilySpecificationCoreText(CTFontDescriptorRef fontDescriptor)
+    : m_fontDescriptor(fontDescriptor)
+{
+}
+
+FontFamilySpecificationCoreText::~FontFamilySpecificationCoreText()
+{
+}
+
 FontRanges FontFamilySpecificationCoreText::fontRanges(const FontDescription& fontDescription) const
 {
     auto size = fontDescription.computedSize();
index cc62458..3294d87 100644 (file)
 
 #pragma once
 
-#include "FontSelector.h"
-#include <CoreText/CoreText.h>
 #include <wtf/RetainPtr.h>
 
+typedef const struct __CTFontDescriptor* CTFontDescriptorRef;
+
 namespace WebCore {
 
+class FontDescription;
+class FontRanges;
+
 class FontFamilySpecificationCoreText {
 public:
-    FontFamilySpecificationCoreText(CTFontDescriptorRef fontDescriptor)
-        : m_fontDescriptor(fontDescriptor)
-    {
-    }
+    FontFamilySpecificationCoreText(CTFontDescriptorRef);
+    ~FontFamilySpecificationCoreText();
 
     FontRanges fontRanges(const FontDescription&) const;