<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[197016] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/197016">197016</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-02-23 23:07:11 -0800 (Tue, 23 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcescpp">trunk/Source/WebCore/DerivedSources.cpp</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorecssCSSAllInOnecpp">trunk/Source/WebCore/css/CSSAllInOne.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorecssFontLoadercpp">trunk/Source/WebCore/css/FontLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorecssFontLoaderh">trunk/Source/WebCore/css/FontLoader.h</a></li>
<li><a href="#trunkSourceWebCorecssFontLoaderidl">trunk/Source/WebCore/css/FontLoader.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (197015 => 197016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-02-24 07:05:58 UTC (rev 197015)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-02-24 07:07:11 UTC (rev 197016)
</span><span class="lines">@@ -332,7 +332,6 @@
</span><span class="cx"> css/DOMWindowCSS.idl
</span><span class="cx"> css/FontFace.idl
</span><span class="cx"> css/FontFaceSet.idl
</span><del>- css/FontLoader.idl
</del><span class="cx"> css/MediaList.idl
</span><span class="cx"> css/MediaQueryList.idl
</span><span class="cx"> css/MediaQueryListListener.idl
</span><span class="lines">@@ -1362,7 +1361,6 @@
</span><span class="cx"> css/DOMWindowCSS.cpp
</span><span class="cx"> css/DocumentRuleSets.cpp
</span><span class="cx"> css/ElementRuleCollector.cpp
</span><del>- css/FontLoader.cpp
</del><span class="cx"> css/FontVariantBuilder.cpp
</span><span class="cx"> css/InspectorCSSOMWrappers.cpp
</span><span class="cx"> css/LengthFunctions.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197015 => 197016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-24 07:05:58 UTC (rev 197015)
+++ trunk/Source/WebCore/ChangeLog 2016-02-24 07:07:11 UTC (rev 197016)
</span><span class="lines">@@ -1,3 +1,54 @@
</span><ins>+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:
+
</ins><span class="cx"> 2016-02-23 Per Arne Vollan <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo][MediaFoundation] Implement methods to set volume.
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.cpp (197015 => 197016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.cpp 2016-02-24 07:05:58 UTC (rev 197015)
+++ trunk/Source/WebCore/DerivedSources.cpp 2016-02-24 07:07:11 UTC (rev 197016)
</span><span class="lines">@@ -163,9 +163,6 @@
</span><span class="cx"> #include "JSFileReader.cpp"
</span><span class="cx"> #include "JSFileReaderSync.cpp"
</span><span class="cx"> #include "JSFocusEvent.cpp"
</span><del>-#if ENABLE(FONT_LOAD_EVENTS)
-#include "JSFontLoader.cpp"
-#endif
</del><span class="cx"> #include "JSFontFace.cpp"
</span><span class="cx"> #include "JSGeolocation.cpp"
</span><span class="cx"> #include "JSGeoposition.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (197015 => 197016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2016-02-24 07:05:58 UTC (rev 197015)
+++ trunk/Source/WebCore/DerivedSources.make 2016-02-24 07:07:11 UTC (rev 197016)
</span><span class="lines">@@ -243,7 +243,6 @@
</span><span class="cx"> $(WebCore)/css/DOMWindowCSS.idl \
</span><span class="cx"> $(WebCore)/css/FontFace.idl \
</span><span class="cx"> $(WebCore)/css/FontFaceSet.idl \
</span><del>- $(WebCore)/css/FontLoader.idl \
</del><span class="cx"> $(WebCore)/css/MediaList.idl \
</span><span class="cx"> $(WebCore)/css/MediaQueryList.idl \
</span><span class="cx"> $(WebCore)/css/MediaQueryListListener.idl \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (197015 => 197016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2016-02-24 07:05:58 UTC (rev 197015)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2016-02-24 07:07:11 UTC (rev 197016)
</span><span class="lines">@@ -1999,20 +1999,6 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <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>
</del><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSGamepad.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -10340,20 +10326,6 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <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>
</del><span class="cx"> <ClCompile Include="..\css\LengthFunctions.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -20056,7 +20028,6 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSFileList.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSFileReader.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSFileReaderSync.h" />
</span><del>- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSFontLoader.h" />
</del><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSFontFaceSet.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSFontFace.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSGamepad.h" />
</span><span class="lines">@@ -21832,7 +21803,6 @@
</span><span class="cx"> <ClInclude Include="..\css\CSSVariableDependentValue.h" />
</span><span class="cx"> <ClInclude Include="..\css\CSSVariableValue.h" />
</span><span class="cx"> <ClInclude Include="..\css\DashboardRegion.h" />
</span><del>- <ClInclude Include="..\css\FontLoader.h" />
</del><span class="cx"> <ClInclude Include="..\css\LengthFunctions.h" />
</span><span class="cx"> <ClInclude Include="..\css\LengthRepeat.h" />
</span><span class="cx"> <ClInclude Include="..\css\MediaFeatureNames.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (197015 => 197016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2016-02-24 07:05:58 UTC (rev 197015)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2016-02-24 07:07:11 UTC (rev 197016)
</span><span class="lines">@@ -2234,9 +2234,6 @@
</span><span class="cx"> <ClCompile Include="..\css\FontVariantBuilder.cpp">
</span><span class="cx"> <Filter>css</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\css\FontLoader.cpp">
- <Filter>css</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\css\LengthFunctions.cpp">
</span><span class="cx"> <Filter>css</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -5292,9 +5289,6 @@
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSFontFace.cpp">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSFontLoader.cpp">
- <Filter>DerivedSources</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSGeolocation.cpp">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -9247,9 +9241,6 @@
</span><span class="cx"> <ClInclude Include="..\css\DashboardRegion.h">
</span><span class="cx"> <Filter>css</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\css\FontLoader.h">
- <Filter>css</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\css\LengthFunctions.h">
</span><span class="cx"> <Filter>css</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -12729,9 +12720,6 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSFontFace.h">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSFontLoader.h">
- <Filter>DerivedSources</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSGeolocation.h">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (197015 => 197016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-02-24 07:05:58 UTC (rev 197015)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-02-24 07:07:11 UTC (rev 197016)
</span><span class="lines">@@ -1486,8 +1486,6 @@
</span><span class="cx"> 3FFFF9AE159D9B060020BBD5 /* ViewportStyleResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FFFF9AC159D9B060020BBD5 /* ViewportStyleResolver.h */; };
</span><span class="cx"> 409EBDB116B7EE7100CBA3FC /* CSSFontFaceLoadEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 409EBDAE16B7EE2800CBA3FC /* CSSFontFaceLoadEvent.h */; };
</span><span class="cx"> 409EBDB216B7EE7400CBA3FC /* CSSFontFaceLoadEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 409EBDAC16B7EE1C00CBA3FC /* CSSFontFaceLoadEvent.cpp */; };
</span><del>- 409EBDB616B7EEA300CBA3FC /* FontLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 409EBDB516B7EEA300CBA3FC /* FontLoader.h */; };
- 409EBDC016B7F38E00CBA3FC /* JSFontLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 409EBDBF16B7F38E00CBA3FC /* JSFontLoader.h */; };
</del><span class="cx"> 409EBDC316B7F3A600CBA3FC /* JSCSSFontFaceLoadEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 409EBDC216B7F3A600CBA3FC /* JSCSSFontFaceLoadEvent.h */; };
</span><span class="cx"> 409EBDC516B7F3CA00CBA3FC /* JSCSSFontFaceLoadEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 409EBDC416B7F3CA00CBA3FC /* JSCSSFontFaceLoadEvent.cpp */; };
</span><span class="cx"> 40ECAE7E16B8B67200C36103 /* JSDOMError.h in Headers */ = {isa = PBXBuildFile; fileRef = 40ECAE7D16B8B67200C36103 /* JSDOMError.h */; };
</span><span class="lines">@@ -6987,7 +6985,6 @@
</span><span class="cx"> FD45A959175D417100C21EC8 /* PolygonShape.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD08A87A175D3926002CD360 /* PolygonShape.cpp */; };
</span><span class="cx"> FD45A95A175D417100C21EC8 /* RectangleShape.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD08A87C175D3926002CD360 /* RectangleShape.cpp */; };
</span><span class="cx"> FD45A95B175D41EE00C21EC8 /* ShapeInterval.h in Headers */ = {isa = PBXBuildFile; fileRef = FD08A885175D3926002CD360 /* ShapeInterval.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- FD4E5D3B1983175500D93A77 /* JSFontLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD96C9A4198314A50086E156 /* JSFontLoader.cpp */; };
</del><span class="cx"> FD537352137B651800008DCE /* ZeroPole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD537350137B651800008DCE /* ZeroPole.cpp */; };
</span><span class="cx"> FD537353137B651800008DCE /* ZeroPole.h in Headers */ = {isa = PBXBuildFile; fileRef = FD537351137B651800008DCE /* ZeroPole.h */; };
</span><span class="cx"> FD537356137B653B00008DCE /* DynamicsCompressorKernel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD537354137B653B00008DCE /* DynamicsCompressorKernel.cpp */; };
</span><span class="lines">@@ -7028,7 +7025,6 @@
</span><span class="cx"> FD8AA63E169514A700D2EA68 /* JSPannerNodeCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD8AA63D169514A700D2EA68 /* JSPannerNodeCustom.cpp */; };
</span><span class="cx"> FD8C46EB154608E700A5910C /* AudioScheduledSourceNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD8C46E9154608E700A5910C /* AudioScheduledSourceNode.cpp */; };
</span><span class="cx"> FD8C46EC154608E700A5910C /* AudioScheduledSourceNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8C46EA154608E700A5910C /* AudioScheduledSourceNode.h */; };
</span><del>- FD96C9971982FBDF0086E156 /* FontLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD96C9961982FB4C0086E156 /* FontLoader.cpp */; };
</del><span class="cx"> FDA15E9D12B03EE1003A583A /* JSAudioBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15E8112B03EE1003A583A /* JSAudioBuffer.cpp */; };
</span><span class="cx"> FDA15E9E12B03EE1003A583A /* JSAudioBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15E8212B03EE1003A583A /* JSAudioBuffer.h */; };
</span><span class="cx"> FDA15E9F12B03EE1003A583A /* JSAudioBufferSourceNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15E8312B03EE1003A583A /* JSAudioBufferSourceNode.cpp */; };
</span><span class="lines">@@ -8952,9 +8948,6 @@
</span><span class="cx"> 409EBDAC16B7EE1C00CBA3FC /* CSSFontFaceLoadEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSFontFaceLoadEvent.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 409EBDAE16B7EE2800CBA3FC /* CSSFontFaceLoadEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSFontFaceLoadEvent.h; sourceTree = "<group>"; };
</span><span class="cx"> 409EBDAF16B7EE5700CBA3FC /* CSSFontFaceLoadEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CSSFontFaceLoadEvent.idl; sourceTree = "<group>"; };
</span><del>- 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>"; };
</del><span class="cx"> 409EBDC216B7F3A600CBA3FC /* JSCSSFontFaceLoadEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCSSFontFaceLoadEvent.h; sourceTree = "<group>"; };
</span><span class="cx"> 409EBDC416B7F3CA00CBA3FC /* JSCSSFontFaceLoadEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSFontFaceLoadEvent.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 40ECAE7D16B8B67200C36103 /* JSDOMError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMError.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -15115,8 +15108,6 @@
</span><span class="cx"> FD8AA63D169514A700D2EA68 /* JSPannerNodeCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPannerNodeCustom.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FD8C46E9154608E700A5910C /* AudioScheduledSourceNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioScheduledSourceNode.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FD8C46EA154608E700A5910C /* AudioScheduledSourceNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioScheduledSourceNode.h; sourceTree = "<group>"; };
</span><del>- 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>"; };
</del><span class="cx"> FDA15E8112B03EE1003A583A /* JSAudioBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAudioBuffer.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FDA15E8212B03EE1003A583A /* JSAudioBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAudioBuffer.h; sourceTree = "<group>"; };
</span><span class="cx"> FDA15E8312B03EE1003A583A /* JSAudioBufferSourceNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAudioBufferSourceNode.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -17624,8 +17615,6 @@
</span><span class="cx"> 409EBDC216B7F3A600CBA3FC /* JSCSSFontFaceLoadEvent.h */,
</span><span class="cx"> 40ECAE8016B8B68A00C36103 /* JSDOMError.cpp */,
</span><span class="cx"> 40ECAE7D16B8B67200C36103 /* JSDOMError.h */,
</span><del>- FD96C9A4198314A50086E156 /* JSFontLoader.cpp */,
- 409EBDBF16B7F38E00CBA3FC /* JSFontLoader.h */,
</del><span class="cx"> 938E65F609F0985D008A48EC /* JSHTMLElementWrapperFactory.cpp */,
</span><span class="cx"> 938E65F009F09840008A48EC /* JSHTMLElementWrapperFactory.h */,
</span><span class="cx"> 8574D1F10ADE6122004CBA11 /* JSSVGElementWrapperFactory.cpp */,
</span><span class="lines">@@ -23685,9 +23674,6 @@
</span><span class="cx"> FC9A0F73164094CF003D6B8D /* DOMWindowCSS.idl */,
</span><span class="cx"> FBDB619A16D6032A00BB3394 /* ElementRuleCollector.cpp */,
</span><span class="cx"> FBDB619E16D6036500BB3394 /* ElementRuleCollector.h */,
</span><del>- FD96C9961982FB4C0086E156 /* FontLoader.cpp */,
- 409EBDB516B7EEA300CBA3FC /* FontLoader.h */,
- 409EBDB716B7EEBA00CBA3FC /* FontLoader.idl */,
</del><span class="cx"> C2015C091BE6FE2C00822389 /* FontVariantBuilder.h */,
</span><span class="cx"> CD4E0AFA11F7BC27009D3811 /* fullscreen.css */,
</span><span class="cx"> 93CA4C9909DF93FA00DF8677 /* html.css */,
</span><span class="lines">@@ -25980,7 +25966,6 @@
</span><span class="cx"> B2AFFC7E0D00A5C10030074D /* FontCustomPlatformData.h in Headers */,
</span><span class="cx"> B2C3DA660D006CD600EF6F26 /* FontDescription.h in Headers */,
</span><span class="cx"> 4A6E9FC813C17D570046A7F8 /* FontFeatureSettings.h in Headers */,
</span><del>- 409EBDB616B7EEA300CBA3FC /* FontLoader.h in Headers */,
</del><span class="cx"> 0845680812B90DA600960A9F /* FontMetrics.h in Headers */,
</span><span class="cx"> B5320D6B122A24E9002D1440 /* FontPlatformData.h in Headers */,
</span><span class="cx"> 371F4FFC0D25E7F300ECE0D5 /* FontRanges.h in Headers */,
</span><span class="lines">@@ -26518,7 +26503,6 @@
</span><span class="cx"> 2E94F43C119207DA00B7F75D /* JSFileReader.h in Headers */,
</span><span class="cx"> 898785F5122E1EAC003AABDA /* JSFileReaderSync.h in Headers */,
</span><span class="cx"> B6D9D27B14EAC0860090D75E /* JSFocusEvent.h in Headers */,
</span><del>- 409EBDC016B7F38E00CBA3FC /* JSFontLoader.h in Headers */,
</del><span class="cx"> FDA15EAC12B03EE1003A583A /* JSGainNode.h in Headers */,
</span><span class="cx"> 518F5002194CAC3A0081BAAE /* JSGamepad.h in Headers */,
</span><span class="cx"> 518F5004194CAC3A0081BAAE /* JSGamepadButton.h in Headers */,
</span><span class="lines">@@ -29692,7 +29676,6 @@
</span><span class="cx"> 37ACCF690DA414E70089E602 /* FontDescription.cpp in Sources */,
</span><span class="cx"> 4A6E9FC713C17D570046A7F8 /* FontFeatureSettings.cpp in Sources */,
</span><span class="cx"> E44EE3A817577EBD00EEE8CF /* FontGenericFamilies.cpp in Sources */,
</span><del>- FD96C9971982FBDF0086E156 /* FontLoader.cpp in Sources */,
</del><span class="cx"> 84B62685133138F90095A489 /* FontPlatformData.cpp in Sources */,
</span><span class="cx"> B5320D6C122A24E9002D1440 /* FontPlatformDataCocoa.mm in Sources */,
</span><span class="cx"> 371F4FFD0D25E7F300ECE0D5 /* FontRanges.cpp in Sources */,
</span><span class="lines">@@ -30209,7 +30192,6 @@
</span><span class="cx"> 2E7582EE12764F260062628B /* JSFileReaderCustom.cpp in Sources */,
</span><span class="cx"> 898785F4122E1EAC003AABDA /* JSFileReaderSync.cpp in Sources */,
</span><span class="cx"> B6D9D27C14EAC0860090D75E /* JSFocusEvent.cpp in Sources */,
</span><del>- FD4E5D3B1983175500D93A77 /* JSFontLoader.cpp in Sources */,
</del><span class="cx"> FDA15EAB12B03EE1003A583A /* JSGainNode.cpp in Sources */,
</span><span class="cx"> 518F5001194CAC3A0081BAAE /* JSGamepad.cpp in Sources */,
</span><span class="cx"> 518F5003194CAC3A0081BAAE /* JSGamepadButton.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSAllInOne.cpp (197015 => 197016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSAllInOne.cpp 2016-02-24 07:05:58 UTC (rev 197015)
+++ trunk/Source/WebCore/css/CSSAllInOne.cpp 2016-02-24 07:07:11 UTC (rev 197016)
</span><span class="lines">@@ -95,7 +95,6 @@
</span><span class="cx"> #include "DocumentRuleSets.cpp"
</span><span class="cx"> #include "ElementRuleCollector.cpp"
</span><span class="cx"> #include "FontFace.cpp"
</span><del>-#include "FontLoader.cpp"
</del><span class="cx"> #include "FontVariantBuilder.cpp"
</span><span class="cx"> #include "InspectorCSSOMWrappers.cpp"
</span><span class="cx"> #include "LengthFunctions.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontLoadercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/FontLoader.cpp (197015 => 197016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontLoader.cpp 2016-02-24 07:05:58 UTC (rev 197015)
+++ trunk/Source/WebCore/css/FontLoader.cpp 2016-02-24 07:07:11 UTC (rev 197016)
</span><span class="lines">@@ -1,339 +0,0 @@
</span><del>-/*
- * 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)
</del></span></pre></div>
<a id="trunkSourceWebCorecssFontLoaderh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/FontLoader.h (197015 => 197016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontLoader.h 2016-02-24 07:05:58 UTC (rev 197015)
+++ trunk/Source/WebCore/css/FontLoader.h 2016-02-24 07:07:11 UTC (rev 197016)
</span><span class="lines">@@ -1,111 +0,0 @@
</span><del>-/*
- * 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)
</del></span></pre></div>
<a id="trunkSourceWebCorecssFontLoaderidl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/FontLoader.idl (197015 => 197016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontLoader.idl 2016-02-24 07:05:58 UTC (rev 197015)
+++ trunk/Source/WebCore/css/FontLoader.idl 2016-02-24 07:07:11 UTC (rev 197016)
</span><span class="lines">@@ -1,48 +0,0 @@
</span><del>-/*
- * 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;
-};
</del></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (197015 => 197016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2016-02-24 07:05:58 UTC (rev 197015)
+++ trunk/Source/WebCore/page/FrameView.cpp 2016-02-24 07:07:11 UTC (rev 197016)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> #include "EventHandler.h"
</span><span class="cx"> #include "FloatRect.h"
</span><span class="cx"> #include "FocusController.h"
</span><del>-#include "FontLoader.h"
</del><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><span class="cx"> #include "FrameSelection.h"
</span></span></pre>
</div>
</div>
</body>
</html>