nephele
/
haikuwebkit
1
0
Fork 0
Code Issues Releases Activity
haikuwebkit/LayoutTests/fast/text/font-face-set-document-expe...

24 lines
789 B
Plaintext
Raw Permalink Normal View History

[Font Loading] Split CSSFontSelector into a FontFaceSet implementation and the rest of the class https://bugs.webkit.org/show_bug.cgi?id=153347 Reviewed by Antti Koivisto. Source/WebCore: This patch implements the document.fonts Javascript object. It does so by briding the already-existing FontFaceSet Javascript object with the CSSFontSelector WebCore object. CSSFontSelector used to hold internal objects for each @font-face object in the Document. These objects have been moved into CSSFontFaceSet, so CSSFontSelector simply just owns an instance of a CSSFontFaceSet. The lifetime of the FontFace and FontFaceSet objects is a little interesting: because all the ownership references are inside the WebCore CSSFontFace{,Set} objects, the higher-level Javascript FontFace{,Set} objects are held through a WeakPtr. This means that if all the references to these higher-level objects go away, and you re-query the document for its FontFace objects, you may get a new object (albeit with the same state as a previous object). However, this won't occur if there are any references to the old object, which means it is almost not observable. This patch doesn't implement the relationship between the CSSOM and the FontFace objects. Changing one should result in a change in the other, but that will be implemented in a forthcoming patch. This patch also doesn't alter the lifetime of the CSSFontSelector, which means that all the Document's fonts may be destroyed and recreated from CSS. There are a few things which can trigger this. A subsequent patch will make the CSSFontSelector outlive the Document. This patch does implement (and test) the ability to add a new FontFace to the Document to cause a relayout, as well as changing properties of existing FontFace objects already in the Document to cause a relayout. Test: fast/text/font-face-set-document.html * Modules/fetch/FetchHeaders.cpp: (WebCore::FetchHeaders::Iterator::next): Pass an extra argument. * Modules/fetch/FetchHeaders.h: * bindings/js/JSKeyValueIterator.h: The ExecState is necessary to build an external wrapper from an existing CSSFontFace object. (WebCore::JSKeyValueIterator<JSWrapper>::next): * css/CSSFontFace.cpp: (WebCore::CSSFontFace::appendSources): Moved from CSSFontSelector. (WebCore::CSSFontFace::CSSFontFace): (WebCore::CSSFontFace::notifyClientsOfFontPropertyChange): (WebCore::CSSFontFace::setFamilies): (WebCore::CSSFontFace::calculateStyle): Shared code between CSSFontFaceSet and CSSFontFace. (WebCore::CSSFontFace::setStyle): Update to use calculateStyle(). (WebCore::CSSFontFace::calculateWeight): Ditto. (WebCore::CSSFontFace::setWeight): Update to use caculateWeight(). (WebCore::CSSFontFace::setUnicodeRange): Notify clients. (WebCore::CSSFontFace::setVariantLigatures): Ditto. (WebCore::CSSFontFace::setVariantPosition): Ditto. (WebCore::CSSFontFace::setVariantCaps): Ditto. (WebCore::CSSFontFace::setVariantNumeric): Ditto. (WebCore::CSSFontFace::setVariantAlternates): Ditto. (WebCore::CSSFontFace::setVariantEastAsian): Ditto. (WebCore::CSSFontFace::setFeatureSettings): Ditto. (WebCore::CSSFontFace::removeClient): (WebCore::CSSFontFace::wrapper): Build a new wrapper if one doesn't already exist. Note that this requires an ExecState to create a promise. (WebCore::CSSFontFace::setStatus): (WebCore::CSSFontFace::fontLoaded): (WebCore::CSSFontFace::pump): (WebCore::CSSFontFace::font): * css/CSSFontFace.h: * css/CSSFontFaceSet.cpp: (WebCore::CSSFontFaceSet::CSSFontFaceSet): Moved code from CSSFontSelector. (WebCore::CSSFontFaceSet::~CSSFontFaceSet): (WebCore::CSSFontFaceSet::addClient): This object can now have multiple clients. (WebCore::CSSFontFaceSet::removeClient): (WebCore::CSSFontFaceSet::incrementActiveCount): Update for multiple clients. (WebCore::CSSFontFaceSet::decrementActiveCount): Ditto. (WebCore::CSSFontFaceSet::hasFace): (WebCore::CSSFontFaceSet::registerLocalFontFacesForFamily): Moved from CSSFontSelector. (WebCore::CSSFontFaceSet::familyNameFromPrimitive): Ditto. (WebCore::CSSFontFaceSet::addToFacesLookupTable): This helper function can be used when a property of a FontFace is changed. (WebCore::CSSFontFaceSet::add): Update to use addToFacesLookupTable(). (WebCore::CSSFontFaceSet::removeFromFacesLookupTable): Same as addToFacesLookupTable(). (WebCore::CSSFontFaceSet::remove): Update to use removeFromFacesLookupTable(). (WebCore::CSSFontFaceSet::clear): (WebCore::CSSFontFaceSet::operator[]): (WebCore::computeFontTraitsMask): Moved from CSSFontSelector. (WebCore::CSSFontFaceSet::matchingFaces): Update to use new data structures. (WebCore::FontFaceComparator::FontFaceComparator): Moved from CSSFontSelector. (WebCore::FontFaceComparator::operator()): (WebCore::CSSFontFaceSet::getFontFace): Update to use new data structures. (WebCore::CSSFontFaceSet::fontStateChanged): Update to use multiple clients. (WebCore::CSSFontFaceSet::fontPropertyChanged): We must update our internal data structure if the family name changed. (WebCore::extractFamilies): Deleted. (WebCore::familiesIntersect): Deleted. (WebCore::CSSFontFaceSet::load): Deleted. (WebCore::CSSFontFaceSet::stateChanged): Deleted. * css/CSSFontFaceSet.h: Now needs to be RefCounted. New data structures are taken from CSSFontSelector. (WebCore::CSSFontFaceSetClient::faceFinished): (WebCore::CSSFontFaceSetClient::fontModified): (WebCore::CSSFontFaceSetClient::startedLoading): (WebCore::CSSFontFaceSetClient::completedLoading): * css/CSSFontFaceSource.h: * css/CSSFontSelector.cpp: Move code into CSSFontFaceSet. (WebCore::CSSFontSelector::CSSFontSelector): (WebCore::CSSFontSelector::~CSSFontSelector): (WebCore::CSSFontSelector::fontFaceSet): (WebCore::CSSFontSelector::isEmpty): (WebCore::CSSFontSelector::addFontFaceRule): (WebCore::CSSFontSelector::fontModified): (WebCore::CSSFontSelector::fontRangesForFamily): (WebCore::CSSFontSelector::clearDocument): (WebCore::CSSFontSelector::appendSources): Deleted. (WebCore::CSSFontSelector::familyNameFromPrimitive): Deleted. (WebCore::CSSFontSelector::registerLocalFontFacesForFamily): Deleted. (WebCore::FontFaceComparator::FontFaceComparator): Deleted. (WebCore::FontFaceComparator::operator()): Deleted. (WebCore::CSSFontSelector::getFontFace): Deleted. * css/CSSFontSelector.h: * css/CSSSegmentedFontFace.cpp: (WebCore::CSSSegmentedFontFace::CSSSegmentedFontFace): * css/CSSSegmentedFontFace.h: * css/FontFace.cpp: (WebCore::FontFace::create): (WebCore::FontFace::FontFace): (WebCore::FontFace::createWeakPtr): (WebCore::FontFace::fontStateChanged): (WebCore::FontFace::stateChanged): Deleted. * css/FontFace.h: * css/FontFaceSet.cpp: (WebCore::FontFaceSet::create): (WebCore::FontFaceSet::FontFaceSet): (WebCore::FontFaceSet::~FontFaceSet): (WebCore::FontFaceSet::Iterator::next): (WebCore::FontFaceSet::has): (WebCore::FontFaceSet::size): (WebCore::FontFaceSet::add): (WebCore::FontFaceSet::remove): (WebCore::FontFaceSet::clear): (WebCore::FontFaceSet::load): (WebCore::FontFaceSet::check): (WebCore::FontFaceSet::status): (WebCore::FontFaceSet::canSuspendForDocumentSuspension): (WebCore::FontFaceSet::faceFinished): * css/FontFaceSet.h: * css/FontFaceSet.idl: * dom/Document.cpp: (WebCore::Document::fonts): * dom/Document.h: * dom/Document.idl: * svg/SVGFontFaceElement.h: LayoutTests: * fast/text/font-face-javascript.html: * fast/text/font-face-set-document-expected.txt: Added. * fast/text/font-face-set-document.html: Added. Canonical link: https://commits.webkit.org/172660@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@196954 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2016-02-22 21:40:02 +00:00
PASS document.fonts.size is 2
PASS object.done is false
PASS object.value.family is "MyFont1"
PASS object.done is false
PASS object.value.family is "MyFont2"
PASS object.done is true
PASS fontFaceSet.size is 2
PASS object.done is false
PASS object.value.family is "MyFont1"
PASS object.done is false
PASS object.value.family is "MyFont2"
PASS object.done is true
PASS document.getElementById("testElement").offsetWidth is not originalWidth
PASS document.getElementById("testElement").offsetWidth is originalWidth
Honor the second argument to FontFaceSet.load and FontFaceSet.check https://bugs.webkit.org/show_bug.cgi?id=159607 <rdar://problem/27284902> Reviewed by Zalan Bujtas. Source/WebCore: This second argument is used in conjunction with the unicode-range CSS property, so that loading from a FontFaceSet only loads the fonts which actually match the characters given. Previously, we hadn't implemented proper support for this unicode-range property, but now that we have implemented it, we should honor this second argument. Test: fast/text/unicode-range-javascript.html * css/CSSFontFace.cpp: (WebCore::CSSFontFace::rangesMatchCodePoint): * css/CSSFontFace.h: * css/CSSFontFaceSet.cpp: (WebCore::codePointsFromString): (WebCore::CSSFontFaceSet::matchingFaces): LayoutTests: * fast/text/font-face-set-document-expected.txt: * fast/text/font-face-set-document.html: * fast/text/font-face-set-javascript-expected.txt: * fast/text/font-face-set-javascript.html: * fast/text/unicode-range-javascript-expected.txt: Added. * fast/text/unicode-range-javascript.html: Added. Canonical link: https://commits.webkit.org/177798@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@203092 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2016-07-11 23:23:56 +00:00
PASS object.length is 1
[Font Loading] Split CSSFontSelector into a FontFaceSet implementation and the rest of the class https://bugs.webkit.org/show_bug.cgi?id=153347 Reviewed by Antti Koivisto. Source/WebCore: This patch implements the document.fonts Javascript object. It does so by briding the already-existing FontFaceSet Javascript object with the CSSFontSelector WebCore object. CSSFontSelector used to hold internal objects for each @font-face object in the Document. These objects have been moved into CSSFontFaceSet, so CSSFontSelector simply just owns an instance of a CSSFontFaceSet. The lifetime of the FontFace and FontFaceSet objects is a little interesting: because all the ownership references are inside the WebCore CSSFontFace{,Set} objects, the higher-level Javascript FontFace{,Set} objects are held through a WeakPtr. This means that if all the references to these higher-level objects go away, and you re-query the document for its FontFace objects, you may get a new object (albeit with the same state as a previous object). However, this won't occur if there are any references to the old object, which means it is almost not observable. This patch doesn't implement the relationship between the CSSOM and the FontFace objects. Changing one should result in a change in the other, but that will be implemented in a forthcoming patch. This patch also doesn't alter the lifetime of the CSSFontSelector, which means that all the Document's fonts may be destroyed and recreated from CSS. There are a few things which can trigger this. A subsequent patch will make the CSSFontSelector outlive the Document. This patch does implement (and test) the ability to add a new FontFace to the Document to cause a relayout, as well as changing properties of existing FontFace objects already in the Document to cause a relayout. Test: fast/text/font-face-set-document.html * Modules/fetch/FetchHeaders.cpp: (WebCore::FetchHeaders::Iterator::next): Pass an extra argument. * Modules/fetch/FetchHeaders.h: * bindings/js/JSKeyValueIterator.h: The ExecState is necessary to build an external wrapper from an existing CSSFontFace object. (WebCore::JSKeyValueIterator<JSWrapper>::next): * css/CSSFontFace.cpp: (WebCore::CSSFontFace::appendSources): Moved from CSSFontSelector. (WebCore::CSSFontFace::CSSFontFace): (WebCore::CSSFontFace::notifyClientsOfFontPropertyChange): (WebCore::CSSFontFace::setFamilies): (WebCore::CSSFontFace::calculateStyle): Shared code between CSSFontFaceSet and CSSFontFace. (WebCore::CSSFontFace::setStyle): Update to use calculateStyle(). (WebCore::CSSFontFace::calculateWeight): Ditto. (WebCore::CSSFontFace::setWeight): Update to use caculateWeight(). (WebCore::CSSFontFace::setUnicodeRange): Notify clients. (WebCore::CSSFontFace::setVariantLigatures): Ditto. (WebCore::CSSFontFace::setVariantPosition): Ditto. (WebCore::CSSFontFace::setVariantCaps): Ditto. (WebCore::CSSFontFace::setVariantNumeric): Ditto. (WebCore::CSSFontFace::setVariantAlternates): Ditto. (WebCore::CSSFontFace::setVariantEastAsian): Ditto. (WebCore::CSSFontFace::setFeatureSettings): Ditto. (WebCore::CSSFontFace::removeClient): (WebCore::CSSFontFace::wrapper): Build a new wrapper if one doesn't already exist. Note that this requires an ExecState to create a promise. (WebCore::CSSFontFace::setStatus): (WebCore::CSSFontFace::fontLoaded): (WebCore::CSSFontFace::pump): (WebCore::CSSFontFace::font): * css/CSSFontFace.h: * css/CSSFontFaceSet.cpp: (WebCore::CSSFontFaceSet::CSSFontFaceSet): Moved code from CSSFontSelector. (WebCore::CSSFontFaceSet::~CSSFontFaceSet): (WebCore::CSSFontFaceSet::addClient): This object can now have multiple clients. (WebCore::CSSFontFaceSet::removeClient): (WebCore::CSSFontFaceSet::incrementActiveCount): Update for multiple clients. (WebCore::CSSFontFaceSet::decrementActiveCount): Ditto. (WebCore::CSSFontFaceSet::hasFace): (WebCore::CSSFontFaceSet::registerLocalFontFacesForFamily): Moved from CSSFontSelector. (WebCore::CSSFontFaceSet::familyNameFromPrimitive): Ditto. (WebCore::CSSFontFaceSet::addToFacesLookupTable): This helper function can be used when a property of a FontFace is changed. (WebCore::CSSFontFaceSet::add): Update to use addToFacesLookupTable(). (WebCore::CSSFontFaceSet::removeFromFacesLookupTable): Same as addToFacesLookupTable(). (WebCore::CSSFontFaceSet::remove): Update to use removeFromFacesLookupTable(). (WebCore::CSSFontFaceSet::clear): (WebCore::CSSFontFaceSet::operator[]): (WebCore::computeFontTraitsMask): Moved from CSSFontSelector. (WebCore::CSSFontFaceSet::matchingFaces): Update to use new data structures. (WebCore::FontFaceComparator::FontFaceComparator): Moved from CSSFontSelector. (WebCore::FontFaceComparator::operator()): (WebCore::CSSFontFaceSet::getFontFace): Update to use new data structures. (WebCore::CSSFontFaceSet::fontStateChanged): Update to use multiple clients. (WebCore::CSSFontFaceSet::fontPropertyChanged): We must update our internal data structure if the family name changed. (WebCore::extractFamilies): Deleted. (WebCore::familiesIntersect): Deleted. (WebCore::CSSFontFaceSet::load): Deleted. (WebCore::CSSFontFaceSet::stateChanged): Deleted. * css/CSSFontFaceSet.h: Now needs to be RefCounted. New data structures are taken from CSSFontSelector. (WebCore::CSSFontFaceSetClient::faceFinished): (WebCore::CSSFontFaceSetClient::fontModified): (WebCore::CSSFontFaceSetClient::startedLoading): (WebCore::CSSFontFaceSetClient::completedLoading): * css/CSSFontFaceSource.h: * css/CSSFontSelector.cpp: Move code into CSSFontFaceSet. (WebCore::CSSFontSelector::CSSFontSelector): (WebCore::CSSFontSelector::~CSSFontSelector): (WebCore::CSSFontSelector::fontFaceSet): (WebCore::CSSFontSelector::isEmpty): (WebCore::CSSFontSelector::addFontFaceRule): (WebCore::CSSFontSelector::fontModified): (WebCore::CSSFontSelector::fontRangesForFamily): (WebCore::CSSFontSelector::clearDocument): (WebCore::CSSFontSelector::appendSources): Deleted. (WebCore::CSSFontSelector::familyNameFromPrimitive): Deleted. (WebCore::CSSFontSelector::registerLocalFontFacesForFamily): Deleted. (WebCore::FontFaceComparator::FontFaceComparator): Deleted. (WebCore::FontFaceComparator::operator()): Deleted. (WebCore::CSSFontSelector::getFontFace): Deleted. * css/CSSFontSelector.h: * css/CSSSegmentedFontFace.cpp: (WebCore::CSSSegmentedFontFace::CSSSegmentedFontFace): * css/CSSSegmentedFontFace.h: * css/FontFace.cpp: (WebCore::FontFace::create): (WebCore::FontFace::FontFace): (WebCore::FontFace::createWeakPtr): (WebCore::FontFace::fontStateChanged): (WebCore::FontFace::stateChanged): Deleted. * css/FontFace.h: * css/FontFaceSet.cpp: (WebCore::FontFaceSet::create): (WebCore::FontFaceSet::FontFaceSet): (WebCore::FontFaceSet::~FontFaceSet): (WebCore::FontFaceSet::Iterator::next): (WebCore::FontFaceSet::has): (WebCore::FontFaceSet::size): (WebCore::FontFaceSet::add): (WebCore::FontFaceSet::remove): (WebCore::FontFaceSet::clear): (WebCore::FontFaceSet::load): (WebCore::FontFaceSet::check): (WebCore::FontFaceSet::status): (WebCore::FontFaceSet::canSuspendForDocumentSuspension): (WebCore::FontFaceSet::faceFinished): * css/FontFaceSet.h: * css/FontFaceSet.idl: * dom/Document.cpp: (WebCore::Document::fonts): * dom/Document.h: * dom/Document.idl: * svg/SVGFontFaceElement.h: LayoutTests: * fast/text/font-face-javascript.html: * fast/text/font-face-set-document-expected.txt: Added. * fast/text/font-face-set-document.html: Added. Canonical link: https://commits.webkit.org/172660@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@196954 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2016-02-22 21:40:02 +00:00
PASS object[0].family is "MyFont3"
PASS document.getElementById("testElement").offsetWidth is not originalWidth
PASS document.getElementById("testElement").offsetWidth is originalWidth
PASS successfullyParsed is true
TEST COMPLETE
On Load Executed.
l