Remove dead FontLoader code
authormmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 24 Feb 2016 07:07:11 +0000 (07:07 +0000)
committermmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 24 Feb 2016 07:07:11 +0000 (07:07 +0000)
https://bugs.webkit.org/show_bug.cgi?id=154625

Reviewed by Darin Adler.

This code has been replaced by FontFaceSet.

No new tests because there is no behavior change.

* CMakeLists.txt:
* DerivedSources.cpp:
* DerivedSources.make:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* css/CSSAllInOne.cpp:
* css/FontLoader.cpp: Removed.
(WebCore::LoadFontCallback::create): Deleted.
(WebCore::LoadFontCallback::createFromParams): Deleted.
(WebCore::LoadFontCallback::~LoadFontCallback): Deleted.
(WebCore::LoadFontCallback::familyCount): Deleted.
(WebCore::LoadFontCallback::LoadFontCallback): Deleted.
(WebCore::LoadFontCallback::notifyLoaded): Deleted.
(WebCore::LoadFontCallback::notifyError): Deleted.
(WebCore::FontLoader::loadFontDone): Deleted.
(WebCore::FontLoader::FontLoader): Deleted.
(WebCore::FontLoader::~FontLoader): Deleted.
(WebCore::FontLoader::eventTargetData): Deleted.
(WebCore::FontLoader::ensureEventTargetData): Deleted.
(WebCore::FontLoader::eventTargetInterface): Deleted.
(WebCore::FontLoader::scriptExecutionContext): Deleted.
(WebCore::FontLoader::didLayout): Deleted.
(WebCore::FontLoader::activeDOMObjectName): Deleted.
(WebCore::FontLoader::canSuspendForDocumentSuspension): Deleted.
(WebCore::FontLoader::scheduleEvent): Deleted.
(WebCore::FontLoader::firePendingEvents): Deleted.
(WebCore::FontLoader::beginFontLoading): Deleted.
(WebCore::FontLoader::fontLoaded): Deleted.
(WebCore::FontLoader::loadError): Deleted.
(WebCore::FontLoader::notifyWhenFontsReady): Deleted.
(WebCore::FontLoader::loadingDone): Deleted.
(WebCore::FontLoader::loadFont): Deleted.
(WebCore::FontLoader::checkFont): Deleted.
(WebCore::applyPropertyToCurrentStyle): Deleted.
(WebCore::FontLoader::resolveFontStyle): Deleted.
* css/FontLoader.h: Removed.
* css/FontLoader.idl: Removed.
* page/FrameView.cpp:

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

12 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/DerivedSources.cpp
Source/WebCore/DerivedSources.make
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/css/CSSAllInOne.cpp
Source/WebCore/css/FontLoader.cpp [deleted file]
Source/WebCore/css/FontLoader.h [deleted file]
Source/WebCore/css/FontLoader.idl [deleted file]
Source/WebCore/page/FrameView.cpp

index fca90a6..c6fdad4 100644 (file)
@@ -332,7 +332,6 @@ set(WebCore_NON_SVG_IDL_FILES
     css/DOMWindowCSS.idl
     css/FontFace.idl
     css/FontFaceSet.idl
-    css/FontLoader.idl
     css/MediaList.idl
     css/MediaQueryList.idl
     css/MediaQueryListListener.idl
@@ -1362,7 +1361,6 @@ set(WebCore_SOURCES
     css/DOMWindowCSS.cpp
     css/DocumentRuleSets.cpp
     css/ElementRuleCollector.cpp
-    css/FontLoader.cpp
     css/FontVariantBuilder.cpp
     css/InspectorCSSOMWrappers.cpp
     css/LengthFunctions.cpp
index 1698ee0..a78a942 100644 (file)
@@ -1,3 +1,54 @@
+2016-02-23  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Remove dead FontLoader code
+        https://bugs.webkit.org/show_bug.cgi?id=154625
+
+        Reviewed by Darin Adler.
+
+        This code has been replaced by FontFaceSet.
+
+        No new tests because there is no behavior change.
+
+        * CMakeLists.txt:
+        * DerivedSources.cpp:
+        * DerivedSources.make:
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * WebCore.xcodeproj/project.pbxproj:
+        * css/CSSAllInOne.cpp:
+        * css/FontLoader.cpp: Removed.
+        (WebCore::LoadFontCallback::create): Deleted.
+        (WebCore::LoadFontCallback::createFromParams): Deleted.
+        (WebCore::LoadFontCallback::~LoadFontCallback): Deleted.
+        (WebCore::LoadFontCallback::familyCount): Deleted.
+        (WebCore::LoadFontCallback::LoadFontCallback): Deleted.
+        (WebCore::LoadFontCallback::notifyLoaded): Deleted.
+        (WebCore::LoadFontCallback::notifyError): Deleted.
+        (WebCore::FontLoader::loadFontDone): Deleted.
+        (WebCore::FontLoader::FontLoader): Deleted.
+        (WebCore::FontLoader::~FontLoader): Deleted.
+        (WebCore::FontLoader::eventTargetData): Deleted.
+        (WebCore::FontLoader::ensureEventTargetData): Deleted.
+        (WebCore::FontLoader::eventTargetInterface): Deleted.
+        (WebCore::FontLoader::scriptExecutionContext): Deleted.
+        (WebCore::FontLoader::didLayout): Deleted.
+        (WebCore::FontLoader::activeDOMObjectName): Deleted.
+        (WebCore::FontLoader::canSuspendForDocumentSuspension): Deleted.
+        (WebCore::FontLoader::scheduleEvent): Deleted.
+        (WebCore::FontLoader::firePendingEvents): Deleted.
+        (WebCore::FontLoader::beginFontLoading): Deleted.
+        (WebCore::FontLoader::fontLoaded): Deleted.
+        (WebCore::FontLoader::loadError): Deleted.
+        (WebCore::FontLoader::notifyWhenFontsReady): Deleted.
+        (WebCore::FontLoader::loadingDone): Deleted.
+        (WebCore::FontLoader::loadFont): Deleted.
+        (WebCore::FontLoader::checkFont): Deleted.
+        (WebCore::applyPropertyToCurrentStyle): Deleted.
+        (WebCore::FontLoader::resolveFontStyle): Deleted.
+        * css/FontLoader.h: Removed.
+        * css/FontLoader.idl: Removed.
+        * page/FrameView.cpp:
+
 2016-02-23  Per Arne Vollan  <peavo@outlook.com>
 
         [WinCairo][MediaFoundation] Implement methods to set volume.
index be0e395..38078d8 100644 (file)
 #include "JSFileReader.cpp"
 #include "JSFileReaderSync.cpp"
 #include "JSFocusEvent.cpp"
-#if ENABLE(FONT_LOAD_EVENTS)
-#include "JSFontLoader.cpp"
-#endif
 #include "JSFontFace.cpp"
 #include "JSGeolocation.cpp"
 #include "JSGeoposition.cpp"
index 599f5ce..46a19db 100644 (file)
@@ -243,7 +243,6 @@ NON_SVG_BINDING_IDLS = \
     $(WebCore)/css/DOMWindowCSS.idl \
     $(WebCore)/css/FontFace.idl \
     $(WebCore)/css/FontFaceSet.idl \
-    $(WebCore)/css/FontLoader.idl \
     $(WebCore)/css/MediaList.idl \
     $(WebCore)/css/MediaQueryList.idl \
     $(WebCore)/css/MediaQueryListListener.idl \
index a6b3459..eb2cb7e 100644 (file)
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSFontLoader.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSGamepad.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\css\FontLoader.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\css\LengthFunctions.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSFileList.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSFileReader.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSFileReaderSync.h" />
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSFontLoader.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSFontFaceSet.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSFontFace.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSGamepad.h" />
     <ClInclude Include="..\css\CSSVariableDependentValue.h" />
     <ClInclude Include="..\css\CSSVariableValue.h" />
     <ClInclude Include="..\css\DashboardRegion.h" />
-    <ClInclude Include="..\css\FontLoader.h" />
     <ClInclude Include="..\css\LengthFunctions.h" />
     <ClInclude Include="..\css\LengthRepeat.h" />
     <ClInclude Include="..\css\MediaFeatureNames.h" />
index c1c5103..3c463a1 100644 (file)
     <ClCompile Include="..\css\FontVariantBuilder.cpp">
       <Filter>css</Filter>
     </ClCompile>
-    <ClCompile Include="..\css\FontLoader.cpp">
-      <Filter>css</Filter>
-    </ClCompile>
     <ClCompile Include="..\css\LengthFunctions.cpp">
       <Filter>css</Filter>
     </ClCompile>
     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSFontFace.cpp">
       <Filter>DerivedSources</Filter>
     </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSFontLoader.cpp">
-      <Filter>DerivedSources</Filter>
-    </ClCompile>
     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSGeolocation.cpp">
       <Filter>DerivedSources</Filter>
     </ClCompile>
     <ClInclude Include="..\css\DashboardRegion.h">
       <Filter>css</Filter>
     </ClInclude>
-    <ClInclude Include="..\css\FontLoader.h">
-      <Filter>css</Filter>
-    </ClInclude>
     <ClInclude Include="..\css\LengthFunctions.h">
       <Filter>css</Filter>
     </ClInclude>
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSFontFace.h">
       <Filter>DerivedSources</Filter>
     </ClInclude>
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSFontLoader.h">
-      <Filter>DerivedSources</Filter>
-    </ClInclude>
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSGeolocation.h">
       <Filter>DerivedSources</Filter>
     </ClInclude>
index 66a614e..53eaa34 100644 (file)
                3FFFF9AE159D9B060020BBD5 /* ViewportStyleResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FFFF9AC159D9B060020BBD5 /* ViewportStyleResolver.h */; };
                409EBDB116B7EE7100CBA3FC /* CSSFontFaceLoadEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 409EBDAE16B7EE2800CBA3FC /* CSSFontFaceLoadEvent.h */; };
                409EBDB216B7EE7400CBA3FC /* CSSFontFaceLoadEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 409EBDAC16B7EE1C00CBA3FC /* CSSFontFaceLoadEvent.cpp */; };
-               409EBDB616B7EEA300CBA3FC /* FontLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 409EBDB516B7EEA300CBA3FC /* FontLoader.h */; };
-               409EBDC016B7F38E00CBA3FC /* JSFontLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 409EBDBF16B7F38E00CBA3FC /* JSFontLoader.h */; };
                409EBDC316B7F3A600CBA3FC /* JSCSSFontFaceLoadEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 409EBDC216B7F3A600CBA3FC /* JSCSSFontFaceLoadEvent.h */; };
                409EBDC516B7F3CA00CBA3FC /* JSCSSFontFaceLoadEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 409EBDC416B7F3CA00CBA3FC /* JSCSSFontFaceLoadEvent.cpp */; };
                40ECAE7E16B8B67200C36103 /* JSDOMError.h in Headers */ = {isa = PBXBuildFile; fileRef = 40ECAE7D16B8B67200C36103 /* JSDOMError.h */; };
                FD45A959175D417100C21EC8 /* PolygonShape.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD08A87A175D3926002CD360 /* PolygonShape.cpp */; };
                FD45A95A175D417100C21EC8 /* RectangleShape.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD08A87C175D3926002CD360 /* RectangleShape.cpp */; };
                FD45A95B175D41EE00C21EC8 /* ShapeInterval.h in Headers */ = {isa = PBXBuildFile; fileRef = FD08A885175D3926002CD360 /* ShapeInterval.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               FD4E5D3B1983175500D93A77 /* JSFontLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD96C9A4198314A50086E156 /* JSFontLoader.cpp */; };
                FD537352137B651800008DCE /* ZeroPole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD537350137B651800008DCE /* ZeroPole.cpp */; };
                FD537353137B651800008DCE /* ZeroPole.h in Headers */ = {isa = PBXBuildFile; fileRef = FD537351137B651800008DCE /* ZeroPole.h */; };
                FD537356137B653B00008DCE /* DynamicsCompressorKernel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD537354137B653B00008DCE /* DynamicsCompressorKernel.cpp */; };
                FD8AA63E169514A700D2EA68 /* JSPannerNodeCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD8AA63D169514A700D2EA68 /* JSPannerNodeCustom.cpp */; };
                FD8C46EB154608E700A5910C /* AudioScheduledSourceNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD8C46E9154608E700A5910C /* AudioScheduledSourceNode.cpp */; };
                FD8C46EC154608E700A5910C /* AudioScheduledSourceNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8C46EA154608E700A5910C /* AudioScheduledSourceNode.h */; };
-               FD96C9971982FBDF0086E156 /* FontLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD96C9961982FB4C0086E156 /* FontLoader.cpp */; };
                FDA15E9D12B03EE1003A583A /* JSAudioBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15E8112B03EE1003A583A /* JSAudioBuffer.cpp */; };
                FDA15E9E12B03EE1003A583A /* JSAudioBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15E8212B03EE1003A583A /* JSAudioBuffer.h */; };
                FDA15E9F12B03EE1003A583A /* JSAudioBufferSourceNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15E8312B03EE1003A583A /* JSAudioBufferSourceNode.cpp */; };
                409EBDAC16B7EE1C00CBA3FC /* CSSFontFaceLoadEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSFontFaceLoadEvent.cpp; sourceTree = "<group>"; };
                409EBDAE16B7EE2800CBA3FC /* CSSFontFaceLoadEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSFontFaceLoadEvent.h; sourceTree = "<group>"; };
                409EBDAF16B7EE5700CBA3FC /* CSSFontFaceLoadEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CSSFontFaceLoadEvent.idl; sourceTree = "<group>"; };
-               409EBDB516B7EEA300CBA3FC /* FontLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontLoader.h; sourceTree = "<group>"; };
-               409EBDB716B7EEBA00CBA3FC /* FontLoader.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = FontLoader.idl; sourceTree = "<group>"; };
-               409EBDBF16B7F38E00CBA3FC /* JSFontLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSFontLoader.h; sourceTree = "<group>"; };
                409EBDC216B7F3A600CBA3FC /* JSCSSFontFaceLoadEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCSSFontFaceLoadEvent.h; sourceTree = "<group>"; };
                409EBDC416B7F3CA00CBA3FC /* JSCSSFontFaceLoadEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSFontFaceLoadEvent.cpp; sourceTree = "<group>"; };
                40ECAE7D16B8B67200C36103 /* JSDOMError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMError.h; sourceTree = "<group>"; };
                FD8AA63D169514A700D2EA68 /* JSPannerNodeCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPannerNodeCustom.cpp; sourceTree = "<group>"; };
                FD8C46E9154608E700A5910C /* AudioScheduledSourceNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioScheduledSourceNode.cpp; sourceTree = "<group>"; };
                FD8C46EA154608E700A5910C /* AudioScheduledSourceNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioScheduledSourceNode.h; sourceTree = "<group>"; };
-               FD96C9961982FB4C0086E156 /* FontLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontLoader.cpp; sourceTree = "<group>"; };
-               FD96C9A4198314A50086E156 /* JSFontLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFontLoader.cpp; sourceTree = "<group>"; };
                FDA15E8112B03EE1003A583A /* JSAudioBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAudioBuffer.cpp; sourceTree = "<group>"; };
                FDA15E8212B03EE1003A583A /* JSAudioBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAudioBuffer.h; sourceTree = "<group>"; };
                FDA15E8312B03EE1003A583A /* JSAudioBufferSourceNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAudioBufferSourceNode.cpp; sourceTree = "<group>"; };
                                409EBDC216B7F3A600CBA3FC /* JSCSSFontFaceLoadEvent.h */,
                                40ECAE8016B8B68A00C36103 /* JSDOMError.cpp */,
                                40ECAE7D16B8B67200C36103 /* JSDOMError.h */,
-                               FD96C9A4198314A50086E156 /* JSFontLoader.cpp */,
-                               409EBDBF16B7F38E00CBA3FC /* JSFontLoader.h */,
                                938E65F609F0985D008A48EC /* JSHTMLElementWrapperFactory.cpp */,
                                938E65F009F09840008A48EC /* JSHTMLElementWrapperFactory.h */,
                                8574D1F10ADE6122004CBA11 /* JSSVGElementWrapperFactory.cpp */,
                                FC9A0F73164094CF003D6B8D /* DOMWindowCSS.idl */,
                                FBDB619A16D6032A00BB3394 /* ElementRuleCollector.cpp */,
                                FBDB619E16D6036500BB3394 /* ElementRuleCollector.h */,
-                               FD96C9961982FB4C0086E156 /* FontLoader.cpp */,
-                               409EBDB516B7EEA300CBA3FC /* FontLoader.h */,
-                               409EBDB716B7EEBA00CBA3FC /* FontLoader.idl */,
                                C2015C091BE6FE2C00822389 /* FontVariantBuilder.h */,
                                CD4E0AFA11F7BC27009D3811 /* fullscreen.css */,
                                93CA4C9909DF93FA00DF8677 /* html.css */,
                                B2AFFC7E0D00A5C10030074D /* FontCustomPlatformData.h in Headers */,
                                B2C3DA660D006CD600EF6F26 /* FontDescription.h in Headers */,
                                4A6E9FC813C17D570046A7F8 /* FontFeatureSettings.h in Headers */,
-                               409EBDB616B7EEA300CBA3FC /* FontLoader.h in Headers */,
                                0845680812B90DA600960A9F /* FontMetrics.h in Headers */,
                                B5320D6B122A24E9002D1440 /* FontPlatformData.h in Headers */,
                                371F4FFC0D25E7F300ECE0D5 /* FontRanges.h in Headers */,
                                2E94F43C119207DA00B7F75D /* JSFileReader.h in Headers */,
                                898785F5122E1EAC003AABDA /* JSFileReaderSync.h in Headers */,
                                B6D9D27B14EAC0860090D75E /* JSFocusEvent.h in Headers */,
-                               409EBDC016B7F38E00CBA3FC /* JSFontLoader.h in Headers */,
                                FDA15EAC12B03EE1003A583A /* JSGainNode.h in Headers */,
                                518F5002194CAC3A0081BAAE /* JSGamepad.h in Headers */,
                                518F5004194CAC3A0081BAAE /* JSGamepadButton.h in Headers */,
                                37ACCF690DA414E70089E602 /* FontDescription.cpp in Sources */,
                                4A6E9FC713C17D570046A7F8 /* FontFeatureSettings.cpp in Sources */,
                                E44EE3A817577EBD00EEE8CF /* FontGenericFamilies.cpp in Sources */,
-                               FD96C9971982FBDF0086E156 /* FontLoader.cpp in Sources */,
                                84B62685133138F90095A489 /* FontPlatformData.cpp in Sources */,
                                B5320D6C122A24E9002D1440 /* FontPlatformDataCocoa.mm in Sources */,
                                371F4FFD0D25E7F300ECE0D5 /* FontRanges.cpp in Sources */,
                                2E7582EE12764F260062628B /* JSFileReaderCustom.cpp in Sources */,
                                898785F4122E1EAC003AABDA /* JSFileReaderSync.cpp in Sources */,
                                B6D9D27C14EAC0860090D75E /* JSFocusEvent.cpp in Sources */,
-                               FD4E5D3B1983175500D93A77 /* JSFontLoader.cpp in Sources */,
                                FDA15EAB12B03EE1003A583A /* JSGainNode.cpp in Sources */,
                                518F5001194CAC3A0081BAAE /* JSGamepad.cpp in Sources */,
                                518F5003194CAC3A0081BAAE /* JSGamepadButton.cpp in Sources */,
index 488ba23..d9265b8 100644 (file)
@@ -95,7 +95,6 @@
 #include "DocumentRuleSets.cpp"
 #include "ElementRuleCollector.cpp"
 #include "FontFace.cpp"
-#include "FontLoader.cpp"
 #include "FontVariantBuilder.cpp"
 #include "InspectorCSSOMWrappers.cpp"
 #include "LengthFunctions.cpp"
diff --git a/Source/WebCore/css/FontLoader.cpp b/Source/WebCore/css/FontLoader.cpp
deleted file mode 100644 (file)
index e1be474..0000000
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- * Copyright (C) 2013 Google 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. AND ITS CONTRIBUTORS ``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 ITS 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 "FontLoader.h"
-
-#if ENABLE(FONT_LOAD_EVENTS)
-
-#include "CSSFontFaceLoadEvent.h"
-#include "CSSFontFaceSource.h"
-#include "CSSFontSelector.h"
-#include "CSSParser.h"
-#include "CSSSegmentedFontFace.h"
-#include "Dictionary.h"
-#include "Document.h"
-#include "ExceptionCodeDescription.h"
-#include "FontCascade.h"
-#include "FrameView.h"
-#include "StyleProperties.h"
-#include "StyleResolver.h"
-
-namespace WebCore {
-
-static const int defaultFontSize = 10;
-static const char* const defaultFontFamily = "sans-serif";
-
-class LoadFontCallback : public CSSSegmentedFontFace::LoadFontCallback {
-public:
-    static Ref<LoadFontCallback> create(int numLoading, FontLoader& fontLoader, PassRefPtr<VoidCallback> loadCallback, PassRefPtr<VoidCallback> errorCallback)
-    {
-        return adoptRef(*new LoadFontCallback(numLoading, fontLoader, loadCallback, errorCallback));
-    }
-
-    static PassRefPtr<LoadFontCallback> createFromParams(const Dictionary& params, FontLoader& fontLoader, const FontCascade& font)
-    {
-        RefPtr<VoidCallback> onsuccess;
-        RefPtr<VoidCallback> onerror;
-        params.get("onsuccess", onsuccess);
-        params.get("onerror", onerror);
-        if (!onsuccess && !onerror)
-            return 0;
-        int numFamilies = font.familyCount();
-        return LoadFontCallback::create(numFamilies, fontLoader, onsuccess, onerror);
-    }
-
-    virtual void notifyLoaded() override;
-    virtual void notifyError() override;
-    virtual ~LoadFontCallback() { };
-
-    int familyCount() const { return m_familyCount; }
-
-private:
-    LoadFontCallback(int numLoading, FontLoader& fontLoader, PassRefPtr<VoidCallback> loadCallback, PassRefPtr<VoidCallback> errorCallback)
-        : m_familyCount(numLoading)
-        , m_numLoading(numLoading)
-        , m_errorOccured(false)
-        , m_fontLoader(fontLoader)
-        , m_loadCallback(loadCallback)
-        , m_errorCallback(errorCallback)
-    { }
-
-    int m_familyCount;
-    int m_numLoading;
-    bool m_errorOccured;
-    FontLoader& m_fontLoader;
-    RefPtr<VoidCallback> m_loadCallback;
-    RefPtr<VoidCallback> m_errorCallback;
-};
-
-void LoadFontCallback::notifyLoaded()
-{
-    m_numLoading--;
-    if (m_numLoading)
-        return;
-
-    m_fontLoader.loadFontDone(*this);
-
-    if (m_errorOccured) {
-        if (m_errorCallback)
-            m_errorCallback->handleEvent();
-    } else {
-        if (m_loadCallback)
-            m_loadCallback->handleEvent();
-    }
-}
-
-void LoadFontCallback::notifyError() 
-{
-    m_errorOccured = true;
-    notifyLoaded();
-}
-
-void FontLoader::loadFontDone(const LoadFontCallback& callback)
-{
-    m_numLoadingFromJS -= callback.familyCount();
-}
-
-FontLoader::FontLoader(Document* document)
-    : ActiveDOMObject(document)
-    , m_document(document)
-    , m_numLoadingFromCSS(0)
-    , m_numLoadingFromJS(0)
-    , m_pendingEventsTimer(*this, &FontLoader::firePendingEvents)
-{
-    suspendIfNeeded();
-}
-
-FontLoader::~FontLoader()
-{
-}
-
-EventTargetData* FontLoader::eventTargetData()
-{
-    return &m_eventTargetData;
-}
-
-EventTargetData& FontLoader::ensureEventTargetData()
-{
-    return m_eventTargetData;
-}
-
-EventTargetInterface FontLoader::eventTargetInterface() const
-{
-    return FontLoaderEventTargetInterfaceType;
-}
-
-ScriptExecutionContext* FontLoader::scriptExecutionContext() const
-{
-    return ActiveDOMObject::scriptExecutionContext();
-}
-
-void FontLoader::didLayout()
-{
-    loadingDone();
-}
-
-const char* FontLoader::activeDOMObjectName() const
-{
-    return "FontLoader";
-}
-
-bool FontLoader::canSuspendForDocumentSuspension() const
-{
-    return !m_numLoadingFromCSS && !m_numLoadingFromJS;
-}
-
-void FontLoader::scheduleEvent(Ref<Event>&& event)
-{
-    m_pendingEvents.append(WTFMove(event));
-    if (!m_pendingEventsTimer.isActive())
-        m_pendingEventsTimer.startOneShot(0);
-}
-
-void FontLoader::firePendingEvents()
-{
-    if (m_pendingEvents.isEmpty() && !m_loadingDoneEvent && !m_callbacks.isEmpty())
-        return;
-
-    Vector<Ref<Event>> pendingEvents;
-    m_pendingEvents.swap(pendingEvents);
-
-    bool loadingDone = false;
-    if (m_loadingDoneEvent) {
-        pendingEvents.append(m_loadingDoneEvent.releaseNonNull());
-        loadingDone = true;
-    }
-
-    for (size_t index = 0; index < pendingEvents.size(); ++index)
-        dispatchEvent(pendingEvents[index]);
-
-    if (loadingDone && !m_callbacks.isEmpty()) {
-        Vector<RefPtr<VoidCallback>> callbacks;
-        m_callbacks.swap(callbacks);
-        for (size_t index = 0; index < callbacks.size(); ++index)
-            callbacks[index]->handleEvent();
-    }
-}
-
-void FontLoader::beginFontLoading(CSSFontFaceRule* rule)
-{
-    ++m_numLoadingFromCSS;
-    if (m_numLoadingFromCSS == 1 && !m_loadingDoneEvent)
-        scheduleEvent(CSSFontFaceLoadEvent::createForFontFaceRule(eventNames().loadingEvent, rule));
-    scheduleEvent(CSSFontFaceLoadEvent::createForFontFaceRule(eventNames().loadstartEvent, rule));
-}
-
-void FontLoader::fontLoaded(CSSFontFaceRule* rule)
-{
-    ASSERT(m_numLoadingFromCSS > 0);
-    scheduleEvent(CSSFontFaceLoadEvent::createForFontFaceRule(eventNames().loadEvent, rule));
-
-    --m_numLoadingFromCSS;
-    if (!m_numLoadingFromCSS)
-        m_loadingDoneEvent = CSSFontFaceLoadEvent::createForFontFaceRule(eventNames().loadingdoneEvent, rule);
-}
-
-void FontLoader::loadError(CSSFontFaceRule* rule, CSSFontFaceSource* source)
-{
-    ASSERT(m_numLoadingFromCSS > 0);
-
-    // FIXME: We should report NetworkError in case of timeout, etc.
-    String errorName = (source && source->isDecodeError()) ? "InvalidFontDataError" : ExceptionCodeDescription(NOT_FOUND_ERR).name;
-    scheduleEvent(CSSFontFaceLoadEvent::createForError(rule, DOMError::create(errorName)));
-    --m_numLoadingFromCSS;
-    if (!m_numLoadingFromCSS)
-        m_loadingDoneEvent = CSSFontFaceLoadEvent::createForFontFaceRule(eventNames().loadingdoneEvent, rule);
-}
-
-void FontLoader::notifyWhenFontsReady(PassRefPtr<VoidCallback> callback)
-{
-    m_callbacks.append(callback);
-}
-
-void FontLoader::loadingDone()
-{
-    if (loading() || !m_document->haveStylesheetsLoaded())
-        return;
-    if (!m_loadingDoneEvent && m_callbacks.isEmpty() && m_pendingEvents.isEmpty())
-        return;
-
-    if (FrameView* view = m_document->view()) {
-        if (view->isInLayout() || view->needsLayout())
-            return;
-    }
-
-    if (!m_pendingEventsTimer.isActive())
-        m_pendingEventsTimer.startOneShot(0);
-}
-
-void FontLoader::loadFont(const Dictionary& params)
-{
-    // FIXME: The text member of params is ignored.
-    String fontString;
-    if (!params.get("font", fontString))
-        return;
-    FontCascade font;
-    if (!resolveFontStyle(fontString, font))
-        return;
-    RefPtr<LoadFontCallback> callback = LoadFontCallback::createFromParams(params, *this, font);
-    m_numLoadingFromJS += callback->familyCount();
-
-    for (unsigned i = 0; i < font.familyCount(); i++) {
-        CSSSegmentedFontFace* face = m_document->fontSelector().getFontFace(font.fontDescription(), font.familyAt(i));
-        if (!face) {
-            if (callback)
-                callback->notifyError();
-            continue;
-        }
-        face->loadFont(font.fontDescription(), callback);
-    }
-}
-
-bool FontLoader::checkFont(const String& fontString, const String&)
-{
-    // FIXME: The second parameter (text) is ignored.
-    FontCascade font;
-    if (!resolveFontStyle(fontString, font))
-        return false;
-    for (unsigned i = 0; i < font.familyCount(); i++) {
-        CSSSegmentedFontFace* face = m_document->fontSelector().getFontFace(font.fontDescription(), font.familyAt(i));
-        if (!face || !face->checkFont())
-            return false;
-    }
-    return true;
-}
-
-static void applyPropertyToCurrentStyle(StyleResolver& styleResolver, CSSPropertyID id, const RefPtr<StyleProperties>& parsedStyle)
-{
-    styleResolver.applyPropertyToCurrentStyle(id, parsedStyle->getPropertyCSSValue(id).get());
-}
-
-bool FontLoader::resolveFontStyle(const String& fontString, FontCascade& font)
-{
-    // Interpret fontString in the same way as the 'font' attribute of CanvasRenderingContext2D.
-    RefPtr<MutableStyleProperties> parsedStyle = MutableStyleProperties::create();
-    CSSParser::parseValue(parsedStyle.get(), CSSPropertyFont, fontString, true, CSSStrictMode, nullptr);
-    if (parsedStyle->isEmpty())
-        return false;
-    
-    String fontValue = parsedStyle->getPropertyValue(CSSPropertyFont);
-    if (fontValue == "inherit" || fontValue == "initial" || fontValue == "unset" || fontValue == "revert")
-        return false;
-
-    RefPtr<RenderStyle> style = RenderStyle::create();
-
-    FontDescription defaultFontDescription;
-    defaultFontDescription.setOneFamily(defaultFontFamily);
-    defaultFontDescription.setSpecifiedSize(defaultFontSize);
-    defaultFontDescription.setComputedSize(defaultFontSize);
-
-    style->setFontDescription(defaultFontDescription);
-
-    style->fontCascade().update(style->fontCascade().fontSelector());
-
-    // Now map the font property longhands into the style.
-    StyleResolver& styleResolver = m_document->ensureStyleResolver();
-    styleResolver.applyPropertyToStyle(CSSPropertyFontFamily, parsedStyle->getPropertyCSSValue(CSSPropertyFontFamily).get(), style.get());
-    applyPropertyToCurrentStyle(styleResolver, CSSPropertyFontStyle, parsedStyle);
-    applyPropertyToCurrentStyle(styleResolver, CSSPropertyFontVariant, parsedStyle);
-    applyPropertyToCurrentStyle(styleResolver, CSSPropertyFontWeight, parsedStyle);
-
-    // As described in BUG66291, setting font-size and line-height on a font may entail a CSSPrimitiveValue::computeLengthDouble call,
-    // which assumes the fontMetrics are available for the affected font, otherwise a crash occurs (see http://trac.webkit.org/changeset/96122).
-    // The updateFont() calls below update the fontMetrics and ensure the proper setting of font-size and line-height.
-    styleResolver.updateFont();
-    applyPropertyToCurrentStyle(styleResolver, CSSPropertyFontSize, parsedStyle);
-    styleResolver.updateFont();
-    applyPropertyToCurrentStyle(styleResolver, CSSPropertyLineHeight, parsedStyle);
-
-    font = style->fontCascade();
-    font.update(&m_document->fontSelector());
-    return true;
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(FONT_LOAD_EVENTS)
diff --git a/Source/WebCore/css/FontLoader.h b/Source/WebCore/css/FontLoader.h
deleted file mode 100644 (file)
index e1008fa..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (C) 2013 Google 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- */
-
-#if ENABLE(FONT_LOAD_EVENTS)
-
-#ifndef FontLoader_h
-#define FontLoader_h
-
-#include "ActiveDOMObject.h"
-#include "EventListener.h"
-#include "EventTarget.h"
-#include "Timer.h"
-#include "VoidCallback.h"
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-#include <wtf/Vector.h>
-
-namespace WebCore {
-
-class CachedFont;
-class CSSFontFaceRule;
-class CSSFontFaceSource;
-class Dictionary;
-class Document;
-class Event;
-class FontCascade;
-class LoadFontCallback;
-class ScriptExecutionContext;
-
-class FontLoader final : public RefCounted<FontLoader>, public ActiveDOMObject, public EventTarget {
-public:
-    static Ref<FontLoader> create(Document* document)
-    {
-        return adoptRef<FontLoader>(*new FontLoader(document));
-    }
-    virtual ~FontLoader();
-
-    bool checkFont(const String&, const String&);
-    void loadFont(const Dictionary&);
-    void loadFontDone(const LoadFontCallback&);
-
-    void notifyWhenFontsReady(PassRefPtr<VoidCallback>);
-
-    bool loading() const { return m_numLoadingFromCSS > 0 || m_numLoadingFromJS > 0; }
-
-    virtual ScriptExecutionContext* scriptExecutionContext() const override;
-    virtual EventTargetInterface eventTargetInterface() const override;
-
-    using RefCounted<FontLoader>::ref;
-    using RefCounted<FontLoader>::deref;
-
-    Document* document() const { return m_document; }
-
-    void didLayout();
-    void beginFontLoading(CSSFontFaceRule*);
-    void fontLoaded(CSSFontFaceRule*);
-    void loadError(CSSFontFaceRule*, CSSFontFaceSource*);
-    void loadingDone();
-
-private:
-    FontLoader(Document*);
-
-    virtual void refEventTarget() override { ref(); }
-    virtual void derefEventTarget() override { deref(); }
-    virtual EventTargetData* eventTargetData() override;
-    virtual EventTargetData& ensureEventTargetData() override;
-
-    // ActiveDOMObject API.
-    const char* activeDOMObjectName() const override;
-    bool canSuspendForDocumentSuspension() const override;
-
-    void scheduleEvent(PassRefPtr<Event>);
-    void firePendingEvents();
-    bool resolveFontStyle(const String&, FontCascade&);
-
-    Document* m_document;
-    EventTargetData m_eventTargetData;
-    unsigned m_numLoadingFromCSS;
-    unsigned m_numLoadingFromJS;
-    Vector<Ref<Event>> m_pendingEvents;
-    Vector<RefPtr<VoidCallback>> m_callbacks;
-    RefPtr<Event> m_loadingDoneEvent;
-    Timer m_pendingEventsTimer;
-};
-
-} // namespace WebCore
-
-#endif // FontLoader_h
-#endif // ENABLE(FONT_LOAD_EVENTS)
diff --git a/Source/WebCore/css/FontLoader.idl b/Source/WebCore/css/FontLoader.idl
deleted file mode 100644 (file)
index 78e7f11..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2013 Google 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:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 THE COPYRIGHT
- * OWNER 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.
- */
-
-[
-    NoInterfaceObject,
-    Conditional=FONT_LOAD_EVENTS,
-    ActiveDOMObject,
-    GenerateIsReachable=ImplDocument,
-] interface FontLoader : EventTarget {
-
-    attribute EventHandler onloading;
-    attribute EventHandler onloadingdone;
-    attribute EventHandler onloadstart;
-    attribute EventHandler onload;
-    attribute EventHandler onerror;
-
-    boolean checkFont(DOMString font, [Default=NullString] optional DOMString text);
-    void loadFont(Dictionary params);
-    void notifyWhenFontsReady(VoidCallback callback);
-    readonly attribute boolean loading;
-};
index 9aabb70..f5e1ed1 100644 (file)
@@ -40,7 +40,6 @@
 #include "EventHandler.h"
 #include "FloatRect.h"
 #include "FocusController.h"
-#include "FontLoader.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "FrameSelection.h"