Diff
Modified: trunk/Source/WebCore/ChangeLog (236913 => 236914)
--- trunk/Source/WebCore/ChangeLog 2018-10-08 13:55:14 UTC (rev 236913)
+++ trunk/Source/WebCore/ChangeLog 2018-10-08 16:09:28 UTC (rev 236914)
@@ -1,3 +1,142 @@
+2018-10-08 Antti Koivisto <an...@apple.com>
+
+ Move FontCascadeDescription to a file of its own
+ https://bugs.webkit.org/show_bug.cgi?id=190348
+
+ Reviewed by Chris Dumez.
+
+ * Sources.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/graphics/FontCascade.h:
+ * platform/graphics/FontCascadeDescription.cpp: Copied from Source/WebCore/platform/graphics/FontDescription.cpp.
+ (WebCore::FontDescription::FontDescription): Deleted.
+ (WebCore::m_shouldAllowUserInstalledFonts): Deleted.
+ (WebCore::FontDescription::setLocale): Deleted.
+ (WebCore::FontDescription::invalidateCaches): Deleted.
+ * platform/graphics/FontCascadeDescription.h: Copied from Source/WebCore/platform/graphics/FontDescription.h.
+ (WebCore::FontDescription::operator!= const): Deleted.
+ (WebCore::FontDescription::computedSize const): Deleted.
+ (WebCore::FontDescription::computedPixelSize const): Deleted.
+ (WebCore::FontDescription::italic const): Deleted.
+ (WebCore::FontDescription::stretch const): Deleted.
+ (WebCore::FontDescription::weight const): Deleted.
+ (WebCore::FontDescription::fontSelectionRequest const): Deleted.
+ (WebCore::FontDescription::renderingMode const): Deleted.
+ (WebCore::FontDescription::textRenderingMode const): Deleted.
+ (WebCore::FontDescription::script const): Deleted.
+ (WebCore::FontDescription::locale const): Deleted.
+ (WebCore::FontDescription::orientation const): Deleted.
+ (WebCore::FontDescription::nonCJKGlyphOrientation const): Deleted.
+ (WebCore::FontDescription::widthVariant const): Deleted.
+ (WebCore::FontDescription::featureSettings const): Deleted.
+ (WebCore::FontDescription::variationSettings const): Deleted.
+ (WebCore::FontDescription::fontSynthesis const): Deleted.
+ (WebCore::FontDescription::variantCommonLigatures const): Deleted.
+ (WebCore::FontDescription::variantDiscretionaryLigatures const): Deleted.
+ (WebCore::FontDescription::variantHistoricalLigatures const): Deleted.
+ (WebCore::FontDescription::variantContextualAlternates const): Deleted.
+ (WebCore::FontDescription::variantPosition const): Deleted.
+ (WebCore::FontDescription::variantCaps const): Deleted.
+ (WebCore::FontDescription::variantNumericFigure const): Deleted.
+ (WebCore::FontDescription::variantNumericSpacing const): Deleted.
+ (WebCore::FontDescription::variantNumericFraction const): Deleted.
+ (WebCore::FontDescription::variantNumericOrdinal const): Deleted.
+ (WebCore::FontDescription::variantNumericSlashedZero const): Deleted.
+ (WebCore::FontDescription::variantAlternates const): Deleted.
+ (WebCore::FontDescription::variantEastAsianVariant const): Deleted.
+ (WebCore::FontDescription::variantEastAsianWidth const): Deleted.
+ (WebCore::FontDescription::variantEastAsianRuby const): Deleted.
+ (WebCore::FontDescription::variantSettings const): Deleted.
+ (WebCore::FontDescription::opticalSizing const): Deleted.
+ (WebCore::FontDescription::fontStyleAxis const): Deleted.
+ (WebCore::FontDescription::shouldAllowUserInstalledFonts const): Deleted.
+ (WebCore::FontDescription::setComputedSize): Deleted.
+ (WebCore::FontDescription::setItalic): Deleted.
+ (WebCore::FontDescription::setStretch): Deleted.
+ (WebCore::FontDescription::setIsItalic): Deleted.
+ (WebCore::FontDescription::setWeight): Deleted.
+ (WebCore::FontDescription::setRenderingMode): Deleted.
+ (WebCore::FontDescription::setTextRenderingMode): Deleted.
+ (WebCore::FontDescription::setOrientation): Deleted.
+ (WebCore::FontDescription::setNonCJKGlyphOrientation): Deleted.
+ (WebCore::FontDescription::setWidthVariant): Deleted.
+ (WebCore::FontDescription::setFeatureSettings): Deleted.
+ (WebCore::FontDescription::setVariationSettings): Deleted.
+ (WebCore::FontDescription::setFontSynthesis): Deleted.
+ (WebCore::FontDescription::setVariantCommonLigatures): Deleted.
+ (WebCore::FontDescription::setVariantDiscretionaryLigatures): Deleted.
+ (WebCore::FontDescription::setVariantHistoricalLigatures): Deleted.
+ (WebCore::FontDescription::setVariantContextualAlternates): Deleted.
+ (WebCore::FontDescription::setVariantPosition): Deleted.
+ (WebCore::FontDescription::setVariantCaps): Deleted.
+ (WebCore::FontDescription::setVariantNumericFigure): Deleted.
+ (WebCore::FontDescription::setVariantNumericSpacing): Deleted.
+ (WebCore::FontDescription::setVariantNumericFraction): Deleted.
+ (WebCore::FontDescription::setVariantNumericOrdinal): Deleted.
+ (WebCore::FontDescription::setVariantNumericSlashedZero): Deleted.
+ (WebCore::FontDescription::setVariantAlternates): Deleted.
+ (WebCore::FontDescription::setVariantEastAsianVariant): Deleted.
+ (WebCore::FontDescription::setVariantEastAsianWidth): Deleted.
+ (WebCore::FontDescription::setVariantEastAsianRuby): Deleted.
+ (WebCore::FontDescription::setOpticalSizing): Deleted.
+ (WebCore::FontDescription::setFontStyleAxis): Deleted.
+ (WebCore::FontDescription::setShouldAllowUserInstalledFonts): Deleted.
+ (WebCore::FontDescription::operator== const): Deleted.
+ * platform/graphics/FontDescription.cpp:
+ (WebCore::FontDescription::invalidateCaches):
+ (WebCore::FontCascadeDescription::FontCascadeDescription): Deleted.
+ (WebCore::FontCascadeDescription::effectiveFamilyCount const): Deleted.
+ (WebCore::FontCascadeDescription::effectiveFamilyAt const): Deleted.
+ (WebCore::FontCascadeDescription::lighterWeight): Deleted.
+ (WebCore::FontCascadeDescription::bolderWeight): Deleted.
+ (WebCore::FontCascadeDescription::familiesEqualForTextAutoSizing const): Deleted.
+ (WebCore::FontCascadeDescription::familyNamesAreEqual): Deleted.
+ (WebCore::FontCascadeDescription::familyNameHash): Deleted.
+ (WebCore::FontCascadeDescription::foldedFamilyName): Deleted.
+ * platform/graphics/FontDescription.h:
+ (WebCore::FontCascadeDescription::operator!= const): Deleted.
+ (WebCore::FontCascadeDescription::familyCount const): Deleted.
+ (WebCore::FontCascadeDescription::firstFamily const): Deleted.
+ (WebCore::FontCascadeDescription::familyAt const): Deleted.
+ (WebCore::FontCascadeDescription::families const): Deleted.
+ (WebCore::FontCascadeDescription::specifiedSize const): Deleted.
+ (WebCore::FontCascadeDescription::isAbsoluteSize const): Deleted.
+ (WebCore::FontCascadeDescription::lighterWeight const): Deleted.
+ (WebCore::FontCascadeDescription::bolderWeight const): Deleted.
+ (WebCore::FontCascadeDescription::useFixedDefaultSize const): Deleted.
+ (WebCore::FontCascadeDescription::kerning const): Deleted.
+ (WebCore::FontCascadeDescription::keywordSize const): Deleted.
+ (WebCore::FontCascadeDescription::keywordSizeAsIdentifier const): Deleted.
+ (WebCore::FontCascadeDescription::fontSmoothing const): Deleted.
+ (WebCore::FontCascadeDescription::isSpecifiedFont const): Deleted.
+ (WebCore::FontCascadeDescription::setOneFamily): Deleted.
+ (WebCore::FontCascadeDescription::setFamilies): Deleted.
+ (WebCore::FontCascadeDescription::setSpecifiedSize): Deleted.
+ (WebCore::FontCascadeDescription::setIsAbsoluteSize): Deleted.
+ (WebCore::FontCascadeDescription::setKerning): Deleted.
+ (WebCore::FontCascadeDescription::setKeywordSize): Deleted.
+ (WebCore::FontCascadeDescription::setKeywordSizeFromIdentifier): Deleted.
+ (WebCore::FontCascadeDescription::setFontSmoothing): Deleted.
+ (WebCore::FontCascadeDescription::setIsSpecifiedFont): Deleted.
+ (WebCore::FontCascadeDescription::equalForTextAutoSizing const): Deleted.
+ (WebCore::FontCascadeDescription::initialItalic): Deleted.
+ (WebCore::FontCascadeDescription::initialFontStyleAxis): Deleted.
+ (WebCore::FontCascadeDescription::initialWeight): Deleted.
+ (WebCore::FontCascadeDescription::initialStretch): Deleted.
+ (WebCore::FontCascadeDescription::initialSmallCaps): Deleted.
+ (WebCore::FontCascadeDescription::initialKerning): Deleted.
+ (WebCore::FontCascadeDescription::initialFontSmoothing): Deleted.
+ (WebCore::FontCascadeDescription::initialTextRenderingMode): Deleted.
+ (WebCore::FontCascadeDescription::initialFontSynthesis): Deleted.
+ (WebCore::FontCascadeDescription::initialVariantPosition): Deleted.
+ (WebCore::FontCascadeDescription::initialVariantCaps): Deleted.
+ (WebCore::FontCascadeDescription::initialVariantAlternates): Deleted.
+ (WebCore::FontCascadeDescription::initialOpticalSizing): Deleted.
+ (WebCore::FontCascadeDescription::initialLocale): Deleted.
+ (WebCore::FontCascadeDescription::operator== const): Deleted.
+ * platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp:
+ * rendering/style/RenderStyle.h:
+
2018-10-08 Yacine Bandou <yacine.bandou_...@softathome.com>
[EME][GStreamer] Add support for WebM encrypted caps "application/x-webm-enc"
Modified: trunk/Source/WebCore/Sources.txt (236913 => 236914)
--- trunk/Source/WebCore/Sources.txt 2018-10-08 13:55:14 UTC (rev 236913)
+++ trunk/Source/WebCore/Sources.txt 2018-10-08 16:09:28 UTC (rev 236914)
@@ -1610,6 +1610,7 @@
platform/graphics/Font.cpp
platform/graphics/FontCache.cpp
platform/graphics/FontCascade.cpp
+platform/graphics/FontCascadeDescription.cpp
platform/graphics/FontCascadeFonts.cpp
platform/graphics/FontDescription.cpp
platform/graphics/FontFamilySpecificationNull.cpp
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (236913 => 236914)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2018-10-08 13:55:14 UTC (rev 236913)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2018-10-08 16:09:28 UTC (rev 236914)
@@ -4811,6 +4811,7 @@
E4DEAA1817A93DC3000E0430 /* StyleTreeResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = E4DEAA1617A93DC3000E0430 /* StyleTreeResolver.h */; settings = {ATTRIBUTES = (Private, ); }; };
E4E243831DAB953E00C26E4B /* meterElementShadow.css in Resources */ = {isa = PBXBuildFile; fileRef = E4E243821DAB953E00C26E4B /* meterElementShadow.css */; };
E4E39AFB1330EFA8003AB274 /* LegacyTileLayerPool.h in Headers */ = {isa = PBXBuildFile; fileRef = E4E39AFA1330EFA8003AB274 /* LegacyTileLayerPool.h */; };
+ E4E8B4F5216B956500B8834D /* FontCascadeDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = E4E8B4F2216B8B6000B8834D /* FontCascadeDescription.h */; settings = {ATTRIBUTES = (Private, ); }; };
E4E9B1191810916F003ACCDF /* SimpleLineLayoutResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = E4E9B1181810916F003ACCDF /* SimpleLineLayoutResolver.h */; };
E4E9B11D1814569C003ACCDF /* SimpleLineLayoutFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = E4E9B11C1814569C003ACCDF /* SimpleLineLayoutFunctions.h */; };
E4F9EEF3156DA00700D23E7E /* StyleSheetContents.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F9EEF1156D84C400D23E7E /* StyleSheetContents.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -14547,6 +14548,8 @@
E4E243821DAB953E00C26E4B /* meterElementShadow.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = meterElementShadow.css; sourceTree = "<group>"; };
E4E39AFA1330EFA8003AB274 /* LegacyTileLayerPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LegacyTileLayerPool.h; sourceTree = "<group>"; };
E4E39AFC1330EFC5003AB274 /* LegacyTileLayerPool.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LegacyTileLayerPool.mm; sourceTree = "<group>"; };
+ E4E8B4F0216B8B5F00B8834D /* FontCascadeDescription.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontCascadeDescription.cpp; sourceTree = "<group>"; };
+ E4E8B4F2216B8B6000B8834D /* FontCascadeDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontCascadeDescription.h; sourceTree = "<group>"; };
E4E9B1181810916F003ACCDF /* SimpleLineLayoutResolver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimpleLineLayoutResolver.h; sourceTree = "<group>"; };
E4E9B11A18145692003ACCDF /* SimpleLineLayoutFunctions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SimpleLineLayoutFunctions.cpp; sourceTree = "<group>"; };
E4E9B11C1814569C003ACCDF /* SimpleLineLayoutFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimpleLineLayoutFunctions.h; sourceTree = "<group>"; };
@@ -23745,6 +23748,8 @@
B2C3DA520D006CD600EF6F26 /* FontCache.h */,
B2C3DA4F0D006CD600EF6F26 /* FontCascade.cpp */,
B2C3DA500D006CD600EF6F26 /* FontCascade.h */,
+ E4E8B4F0216B8B5F00B8834D /* FontCascadeDescription.cpp */,
+ E4E8B4F2216B8B6000B8834D /* FontCascadeDescription.h */,
B2C3DA560D006CD600EF6F26 /* FontCascadeFonts.cpp */,
B2C3DA570D006CD600EF6F26 /* FontCascadeFonts.h */,
37ACCE620DA2AA960089E602 /* FontDescription.cpp */,
@@ -27395,6 +27400,7 @@
A15D75161E68F7C800A35FBC /* BlobCallback.h in Headers */,
2EDEF1F4121B0EFC00726DB2 /* BlobData.h in Headers */,
E1D31CDD19196020001005A3 /* BlobDataFileReference.h in Headers */,
+ E4E8B4F5216B956500B8834D /* FontCascadeDescription.h in Headers */,
4D3B00AF215D6A690076B983 /* BlobEvent.h in Headers */,
7C77C3D71DEF850A00A50BFA /* BlobLineEndings.h in Headers */,
E1C94AF9191303F000D5A893 /* BlobPart.h in Headers */,
Modified: trunk/Source/WebCore/platform/graphics/FontCascade.h (236913 => 236914)
--- trunk/Source/WebCore/platform/graphics/FontCascade.h 2018-10-08 13:55:14 UTC (rev 236913)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.h 2018-10-08 16:09:28 UTC (rev 236914)
@@ -26,8 +26,8 @@
#include "DashArray.h"
#include "Font.h"
+#include "FontCascadeDescription.h"
#include "FontCascadeFonts.h"
-#include "FontDescription.h"
#include "Path.h"
#include <wtf/HashSet.h>
#include <wtf/Optional.h>
Copied: trunk/Source/WebCore/platform/graphics/FontCascadeDescription.cpp (from rev 236913, trunk/Source/WebCore/platform/graphics/FontDescription.cpp) (0 => 236914)
--- trunk/Source/WebCore/platform/graphics/FontCascadeDescription.cpp (rev 0)
+++ trunk/Source/WebCore/platform/graphics/FontCascadeDescription.cpp 2018-10-08 16:09:28 UTC (rev 236914)
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2007 Nicholas Shanks <cont...@nickshanks.com>
+ * Copyright (C) 2008, 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Inc. ("Apple") 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 APPLE 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 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 "FontCascadeDescription.h"
+
+#include <wtf/text/StringHash.h>
+
+namespace WebCore {
+
+struct SameSizeAsFontCascadeDescription {
+ Vector<void*> vector;
+#if ENABLE(VARIATION_FONTS)
+ Vector<void*> vector2;
+#else
+ char c;
+#endif
+ AtomicString string;
+ int16_t fontSelectionRequest[3];
+ float size;
+ unsigned bitfields1;
+ unsigned bitfields2 : 22;
+ void* array;
+ float size2;
+ unsigned bitfields3 : 10;
+};
+
+COMPILE_ASSERT(sizeof(FontCascadeDescription) == sizeof(SameSizeAsFontCascadeDescription), FontCascadeDescription_should_stay_small);
+
+FontCascadeDescription::FontCascadeDescription()
+ : m_isAbsoluteSize(false)
+ , m_kerning(static_cast<unsigned>(Kerning::Auto))
+ , m_keywordSize(0)
+ , m_fontSmoothing(static_cast<unsigned>(FontSmoothingMode::AutoSmoothing))
+ , m_isSpecifiedFont(false)
+{
+}
+
+#if !USE_PLATFORM_SYSTEM_FALLBACK_LIST
+unsigned FontCascadeDescription::effectiveFamilyCount() const
+{
+ return familyCount();
+}
+
+FontFamilySpecification FontCascadeDescription::effectiveFamilyAt(unsigned i) const
+{
+ return familyAt(i);
+}
+#endif
+
+FontSelectionValue FontCascadeDescription::lighterWeight(FontSelectionValue weight)
+{
+ if (weight < FontSelectionValue(100))
+ return weight;
+ if (weight < FontSelectionValue(550))
+ return FontSelectionValue(100);
+ if (weight < FontSelectionValue(750))
+ return FontSelectionValue(400);
+ return FontSelectionValue(700);
+}
+
+FontSelectionValue FontCascadeDescription::bolderWeight(FontSelectionValue weight)
+{
+ if (weight < FontSelectionValue(350))
+ return FontSelectionValue(400);
+ if (weight < FontSelectionValue(550))
+ return FontSelectionValue(700);
+ if (weight < FontSelectionValue(900))
+ return FontSelectionValue(900);
+ return weight;
+}
+
+#if ENABLE(TEXT_AUTOSIZING)
+
+bool FontCascadeDescription::familiesEqualForTextAutoSizing(const FontCascadeDescription& other) const
+{
+ unsigned thisFamilyCount = familyCount();
+ unsigned otherFamilyCount = other.familyCount();
+
+ if (thisFamilyCount != otherFamilyCount)
+ return false;
+
+ for (unsigned i = 0; i < thisFamilyCount; ++i) {
+ if (!equalIgnoringASCIICase(familyAt(i), other.familyAt(i)))
+ return false;
+ }
+
+ return true;
+}
+
+#endif // ENABLE(TEXT_AUTOSIZING)
+
+bool FontCascadeDescription::familyNamesAreEqual(const AtomicString& family1, const AtomicString& family2)
+{
+ // FIXME: <rdar://problem/33594253> CoreText matches dot-prefixed font names case sensitively. We should
+ // always take the case insensitive patch once this radar is fixed.
+ if (family1.startsWith('.'))
+ return StringHash::equal(family1.string(), family2.string());
+ return ASCIICaseInsensitiveHash::equal(family1, family2);
+}
+
+unsigned FontCascadeDescription::familyNameHash(const AtomicString& family)
+{
+ // FIXME: <rdar://problem/33594253> CoreText matches dot-prefixed font names case sensitively. We should
+ // always take the case insensitive patch once this radar is fixed.
+ if (family.startsWith('.'))
+ return StringHash::hash(family.string());
+ return ASCIICaseInsensitiveHash::hash(family);
+}
+
+String FontCascadeDescription::foldedFamilyName(const AtomicString& family)
+{
+ // FIXME: <rdar://problem/33594253> CoreText matches dot-prefixed font names case sensitively. We should
+ // always take the case insensitive patch once this radar is fixed.
+ if (family.startsWith('.'))
+ return family.string();
+ return family.string().foldCase();
+}
+
+} // namespace WebCore
Added: trunk/Source/WebCore/platform/graphics/FontCascadeDescription.h (0 => 236914)
--- trunk/Source/WebCore/platform/graphics/FontCascadeDescription.h (rev 0)
+++ trunk/Source/WebCore/platform/graphics/FontCascadeDescription.h 2018-10-08 16:09:28 UTC (rev 236914)
@@ -0,0 +1,166 @@
+/*
+ * Copyright (C) 2000 Lars Knoll (kn...@kde.org)
+ * (C) 2000 Antti Koivisto (koivi...@kde.org)
+ * (C) 2000 Dirk Mueller (muel...@kde.org)
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2007 Nicholas Shanks <web...@nickshanks.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIother.m_ If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USm_
+ *
+ */
+
+#pragma once
+
+#include "CSSValueKeywords.h"
+#include "FontDescription.h"
+#include <wtf/RefCountedArray.h>
+#include <wtf/Variant.h>
+
+#if PLATFORM(COCOA)
+#include "FontFamilySpecificationCoreText.h"
+#else
+#include "FontFamilySpecificationNull.h"
+#endif
+
+namespace WebCore {
+
+#if PLATFORM(COCOA)
+typedef FontFamilySpecificationCoreText FontFamilyPlatformSpecification;
+#else
+typedef FontFamilySpecificationNull FontFamilyPlatformSpecification;
+#endif
+
+typedef Variant<AtomicString, FontFamilyPlatformSpecification> FontFamilySpecification;
+
+class FontCascadeDescription : public FontDescription {
+public:
+ WEBCORE_EXPORT FontCascadeDescription();
+
+ bool operator==(const FontCascadeDescription&) const;
+ bool operator!=(const FontCascadeDescription& other) const { return !(*this == other); }
+
+ unsigned familyCount() const { return m_families.size(); }
+ const AtomicString& firstFamily() const { return familyAt(0); }
+ const AtomicString& familyAt(unsigned i) const { return m_families[i]; }
+ const RefCountedArray<AtomicString>& families() const { return m_families; }
+
+ static bool familyNamesAreEqual(const AtomicString&, const AtomicString&);
+ static unsigned familyNameHash(const AtomicString&);
+ static String foldedFamilyName(const AtomicString&);
+
+ unsigned effectiveFamilyCount() const;
+ FontFamilySpecification effectiveFamilyAt(unsigned) const;
+
+ float specifiedSize() const { return m_specifiedSize; }
+ bool isAbsoluteSize() const { return m_isAbsoluteSize; }
+ FontSelectionValue lighterWeight() const { return lighterWeight(weight()); }
+ FontSelectionValue bolderWeight() const { return bolderWeight(weight()); }
+ static FontSelectionValue lighterWeight(FontSelectionValue);
+ static FontSelectionValue bolderWeight(FontSelectionValue);
+
+ // only use fixed default size when there is only one font family, and that family is "monospace"
+ bool useFixedDefaultSize() const { return familyCount() == 1 && firstFamily() == monospaceFamily; }
+
+ Kerning kerning() const { return static_cast<Kerning>(m_kerning); }
+ unsigned keywordSize() const { return m_keywordSize; }
+ CSSValueID keywordSizeAsIdentifier() const
+ {
+ CSSValueID identifier = m_keywordSize ? static_cast<CSSValueID>(CSSValueXxSmall + m_keywordSize - 1) : CSSValueInvalid;
+ ASSERT(identifier == CSSValueInvalid || (identifier >= CSSValueXxSmall && identifier <= CSSValueWebkitXxxLarge));
+ return identifier;
+ }
+ FontSmoothingMode fontSmoothing() const { return static_cast<FontSmoothingMode>(m_fontSmoothing); }
+ bool isSpecifiedFont() const { return m_isSpecifiedFont; }
+
+ void setOneFamily(const AtomicString& family) { ASSERT(m_families.size() == 1); m_families[0] = family; }
+ void setFamilies(const Vector<AtomicString>& families) { m_families = RefCountedArray<AtomicString>(families); }
+ void setFamilies(const RefCountedArray<AtomicString>& families) { m_families = families; }
+ void setSpecifiedSize(float s) { m_specifiedSize = clampToFloat(s); }
+ void setIsAbsoluteSize(bool s) { m_isAbsoluteSize = s; }
+ void setKerning(Kerning kerning) { m_kerning = static_cast<unsigned>(kerning); }
+ void setKeywordSize(unsigned size)
+ {
+ ASSERT(size <= 8);
+ m_keywordSize = size;
+ ASSERT(m_keywordSize == size); // Make sure it fits in the bitfield.
+ }
+ void setKeywordSizeFromIdentifier(CSSValueID identifier)
+ {
+ ASSERT(!identifier || (identifier >= CSSValueXxSmall && identifier <= CSSValueWebkitXxxLarge));
+ static_assert(CSSValueWebkitXxxLarge - CSSValueXxSmall + 1 == 8, "Maximum keyword size should be 8.");
+ setKeywordSize(identifier ? identifier - CSSValueXxSmall + 1 : 0);
+ }
+ void setFontSmoothing(FontSmoothingMode smoothing) { m_fontSmoothing = static_cast<unsigned>(smoothing); }
+ void setIsSpecifiedFont(bool isSpecifiedFont) { m_isSpecifiedFont = isSpecifiedFont; }
+
+#if ENABLE(TEXT_AUTOSIZING)
+ bool familiesEqualForTextAutoSizing(const FontCascadeDescription& other) const;
+
+ bool equalForTextAutoSizing(const FontCascadeDescription& other) const
+ {
+ return familiesEqualForTextAutoSizing(other)
+ && m_specifiedSize == other.m_specifiedSize
+ && variantSettings() == other.variantSettings()
+ && m_isAbsoluteSize == other.m_isAbsoluteSize;
+ }
+#endif
+
+ // Initial values for font properties.
+ static std::optional<FontSelectionValue> initialItalic() { return std::nullopt; }
+ static FontStyleAxis initialFontStyleAxis() { return FontStyleAxis::slnt; }
+ static FontSelectionValue initialWeight() { return normalWeightValue(); }
+ static FontSelectionValue initialStretch() { return normalStretchValue(); }
+ static FontSmallCaps initialSmallCaps() { return FontSmallCaps::Off; }
+ static Kerning initialKerning() { return Kerning::Auto; }
+ static FontSmoothingMode initialFontSmoothing() { return FontSmoothingMode::AutoSmoothing; }
+ static TextRenderingMode initialTextRenderingMode() { return TextRenderingMode::AutoTextRendering; }
+ static FontSynthesis initialFontSynthesis() { return FontSynthesisWeight | FontSynthesisStyle | FontSynthesisSmallCaps; }
+ static FontVariantPosition initialVariantPosition() { return FontVariantPosition::Normal; }
+ static FontVariantCaps initialVariantCaps() { return FontVariantCaps::Normal; }
+ static FontVariantAlternates initialVariantAlternates() { return FontVariantAlternates::Normal; }
+ static FontOpticalSizing initialOpticalSizing() { return FontOpticalSizing::Enabled; }
+ static const AtomicString& initialLocale() { return nullAtom(); }
+
+private:
+ RefCountedArray<AtomicString> m_families { 1 };
+
+ // Specified CSS value. Independent of rendering issues such as integer rounding, minimum font sizes, and zooming.
+ float m_specifiedSize { 0 };
+ // Whether or not CSS specified an explicit size (logical sizes like "medium" don't count).
+ unsigned m_isAbsoluteSize : 1;
+ unsigned m_kerning : 2; // Kerning
+ // We cache whether or not a font is currently represented by a CSS keyword (e.g., medium). If so,
+ // then we can accurately translate across different generic families to adjust for different preference settings
+ // (e.g., 13px monospace vs. 16px everything else). Sizes are 1-8 (like the HTML size values for <font>).
+ unsigned m_keywordSize : 4;
+ unsigned m_fontSmoothing : 2; // FontSmoothingMode
+ // True if a web page specifies a non-generic font family as the first font family.
+ unsigned m_isSpecifiedFont : 1;
+};
+
+inline bool FontCascadeDescription::operator==(const FontCascadeDescription& other) const
+{
+ return FontDescription::operator==(other)
+ && m_families == other.m_families
+ && m_specifiedSize == other.m_specifiedSize
+ && m_isAbsoluteSize == other.m_isAbsoluteSize
+ && m_kerning == other.m_kerning
+ && m_keywordSize == other.m_keywordSize
+ && m_fontSmoothing == other.m_fontSmoothing
+ && m_isSpecifiedFont == other.m_isSpecifiedFont;
+}
+
+}
Modified: trunk/Source/WebCore/platform/graphics/FontDescription.cpp (236913 => 236914)
--- trunk/Source/WebCore/platform/graphics/FontDescription.cpp 2018-10-08 13:55:14 UTC (rev 236913)
+++ trunk/Source/WebCore/platform/graphics/FontDescription.cpp 2018-10-08 16:09:28 UTC (rev 236914)
@@ -30,30 +30,11 @@
#include "config.h"
#include "FontDescription.h"
+#include "FontCascadeDescription.h"
#include "LocaleToScriptMapping.h"
-#include <wtf/text/StringHash.h>
namespace WebCore {
-struct SameSizeAsFontCascadeDescription {
- Vector<void*> vector;
-#if ENABLE(VARIATION_FONTS)
- Vector<void*> vector2;
-#else
- char c;
-#endif
- AtomicString string;
- int16_t fontSelectionRequest[3];
- float size;
- unsigned bitfields1;
- unsigned bitfields2 : 22;
- void* array;
- float size2;
- unsigned bitfields3 : 10;
-};
-
-COMPILE_ASSERT(sizeof(FontCascadeDescription) == sizeof(SameSizeAsFontCascadeDescription), FontCascadeDescription_should_stay_small);
-
FontDescription::FontDescription()
: m_fontSelectionRequest { FontCascadeDescription::initialWeight(), FontCascadeDescription::initialStretch(), FontCascadeDescription::initialItalic() }
, m_orientation(static_cast<unsigned>(FontOrientation::Horizontal))
@@ -90,98 +71,10 @@
m_script = localeToScriptCodeForFontSelection(m_locale);
}
-FontCascadeDescription::FontCascadeDescription()
- : m_isAbsoluteSize(false)
- , m_kerning(static_cast<unsigned>(Kerning::Auto))
- , m_keywordSize(0)
- , m_fontSmoothing(static_cast<unsigned>(FontSmoothingMode::AutoSmoothing))
- , m_isSpecifiedFont(false)
-{
-}
-
#if !USE_PLATFORM_SYSTEM_FALLBACK_LIST
void FontDescription::invalidateCaches()
{
}
-
-unsigned FontCascadeDescription::effectiveFamilyCount() const
-{
- return familyCount();
-}
-
-FontFamilySpecification FontCascadeDescription::effectiveFamilyAt(unsigned i) const
-{
- return familyAt(i);
-}
#endif
-FontSelectionValue FontCascadeDescription::lighterWeight(FontSelectionValue weight)
-{
- if (weight < FontSelectionValue(100))
- return weight;
- if (weight < FontSelectionValue(550))
- return FontSelectionValue(100);
- if (weight < FontSelectionValue(750))
- return FontSelectionValue(400);
- return FontSelectionValue(700);
-}
-
-FontSelectionValue FontCascadeDescription::bolderWeight(FontSelectionValue weight)
-{
- if (weight < FontSelectionValue(350))
- return FontSelectionValue(400);
- if (weight < FontSelectionValue(550))
- return FontSelectionValue(700);
- if (weight < FontSelectionValue(900))
- return FontSelectionValue(900);
- return weight;
-}
-
-#if ENABLE(TEXT_AUTOSIZING)
-
-bool FontCascadeDescription::familiesEqualForTextAutoSizing(const FontCascadeDescription& other) const
-{
- unsigned thisFamilyCount = familyCount();
- unsigned otherFamilyCount = other.familyCount();
-
- if (thisFamilyCount != otherFamilyCount)
- return false;
-
- for (unsigned i = 0; i < thisFamilyCount; ++i) {
- if (!equalIgnoringASCIICase(familyAt(i), other.familyAt(i)))
- return false;
- }
-
- return true;
-}
-
-#endif // ENABLE(TEXT_AUTOSIZING)
-
-bool FontCascadeDescription::familyNamesAreEqual(const AtomicString& family1, const AtomicString& family2)
-{
- // FIXME: <rdar://problem/33594253> CoreText matches dot-prefixed font names case sensitively. We should
- // always take the case insensitive patch once this radar is fixed.
- if (family1.startsWith('.'))
- return StringHash::equal(family1.string(), family2.string());
- return ASCIICaseInsensitiveHash::equal(family1, family2);
-}
-
-unsigned FontCascadeDescription::familyNameHash(const AtomicString& family)
-{
- // FIXME: <rdar://problem/33594253> CoreText matches dot-prefixed font names case sensitively. We should
- // always take the case insensitive patch once this radar is fixed.
- if (family.startsWith('.'))
- return StringHash::hash(family.string());
- return ASCIICaseInsensitiveHash::hash(family);
-}
-
-String FontCascadeDescription::foldedFamilyName(const AtomicString& family)
-{
- // FIXME: <rdar://problem/33594253> CoreText matches dot-prefixed font names case sensitively. We should
- // always take the case insensitive patch once this radar is fixed.
- if (family.startsWith('.'))
- return family.string();
- return family.string().foldCase();
-}
-
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/FontDescription.h (236913 => 236914)
--- trunk/Source/WebCore/platform/graphics/FontDescription.h 2018-10-08 13:55:14 UTC (rev 236913)
+++ trunk/Source/WebCore/platform/graphics/FontDescription.h 2018-10-08 16:09:28 UTC (rev 236914)
@@ -22,10 +22,8 @@
*
*/
-#ifndef FontDescription_h
-#define FontDescription_h
+#pragma once
-#include "CSSValueKeywords.h"
#include "FontSelectionAlgorithm.h"
#include "FontTaggedSettings.h"
#include "TextFlags.h"
@@ -32,27 +30,11 @@
#include "WebKitFontFamilyNames.h"
#include <unicode/uscript.h>
#include <wtf/MathExtras.h>
-#include <wtf/RefCountedArray.h>
-#include <wtf/Variant.h>
-#if PLATFORM(COCOA)
-#include "FontFamilySpecificationCoreText.h"
-#else
-#include "FontFamilySpecificationNull.h"
-#endif
+#define USE_PLATFORM_SYSTEM_FALLBACK_LIST ((PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300))
namespace WebCore {
-#if PLATFORM(COCOA)
-typedef FontFamilySpecificationCoreText FontFamilyPlatformSpecification;
-#else
-typedef FontFamilySpecificationNull FontFamilyPlatformSpecification;
-#endif
-
-#define USE_PLATFORM_SYSTEM_FALLBACK_LIST ((PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300))
-
-typedef Variant<AtomicString, FontFamilyPlatformSpecification> FontFamilySpecification;
-
using namespace WebKitFontFamilyNames;
class FontDescription {
@@ -223,125 +205,4 @@
&& m_shouldAllowUserInstalledFonts == other.m_shouldAllowUserInstalledFonts;
}
-// FIXME: Move to a file of its own.
-class FontCascadeDescription : public FontDescription {
-public:
- WEBCORE_EXPORT FontCascadeDescription();
-
- bool operator==(const FontCascadeDescription&) const;
- bool operator!=(const FontCascadeDescription& other) const { return !(*this == other); }
-
- unsigned familyCount() const { return m_families.size(); }
- const AtomicString& firstFamily() const { return familyAt(0); }
- const AtomicString& familyAt(unsigned i) const { return m_families[i]; }
- const RefCountedArray<AtomicString>& families() const { return m_families; }
-
- static bool familyNamesAreEqual(const AtomicString&, const AtomicString&);
- static unsigned familyNameHash(const AtomicString&);
- static String foldedFamilyName(const AtomicString&);
-
- unsigned effectiveFamilyCount() const;
- FontFamilySpecification effectiveFamilyAt(unsigned) const;
-
- float specifiedSize() const { return m_specifiedSize; }
- bool isAbsoluteSize() const { return m_isAbsoluteSize; }
- FontSelectionValue lighterWeight() const { return lighterWeight(weight()); }
- FontSelectionValue bolderWeight() const { return bolderWeight(weight()); }
- static FontSelectionValue lighterWeight(FontSelectionValue);
- static FontSelectionValue bolderWeight(FontSelectionValue);
-
- // only use fixed default size when there is only one font family, and that family is "monospace"
- bool useFixedDefaultSize() const { return familyCount() == 1 && firstFamily() == monospaceFamily; }
-
- Kerning kerning() const { return static_cast<Kerning>(m_kerning); }
- unsigned keywordSize() const { return m_keywordSize; }
- CSSValueID keywordSizeAsIdentifier() const
- {
- CSSValueID identifier = m_keywordSize ? static_cast<CSSValueID>(CSSValueXxSmall + m_keywordSize - 1) : CSSValueInvalid;
- ASSERT(identifier == CSSValueInvalid || (identifier >= CSSValueXxSmall && identifier <= CSSValueWebkitXxxLarge));
- return identifier;
- }
- FontSmoothingMode fontSmoothing() const { return static_cast<FontSmoothingMode>(m_fontSmoothing); }
- bool isSpecifiedFont() const { return m_isSpecifiedFont; }
-
- void setOneFamily(const AtomicString& family) { ASSERT(m_families.size() == 1); m_families[0] = family; }
- void setFamilies(const Vector<AtomicString>& families) { m_families = RefCountedArray<AtomicString>(families); }
- void setFamilies(const RefCountedArray<AtomicString>& families) { m_families = families; }
- void setSpecifiedSize(float s) { m_specifiedSize = clampToFloat(s); }
- void setIsAbsoluteSize(bool s) { m_isAbsoluteSize = s; }
- void setKerning(Kerning kerning) { m_kerning = static_cast<unsigned>(kerning); }
- void setKeywordSize(unsigned size)
- {
- ASSERT(size <= 8);
- m_keywordSize = size;
- ASSERT(m_keywordSize == size); // Make sure it fits in the bitfield.
- }
- void setKeywordSizeFromIdentifier(CSSValueID identifier)
- {
- ASSERT(!identifier || (identifier >= CSSValueXxSmall && identifier <= CSSValueWebkitXxxLarge));
- static_assert(CSSValueWebkitXxxLarge - CSSValueXxSmall + 1 == 8, "Maximum keyword size should be 8.");
- setKeywordSize(identifier ? identifier - CSSValueXxSmall + 1 : 0);
- }
- void setFontSmoothing(FontSmoothingMode smoothing) { m_fontSmoothing = static_cast<unsigned>(smoothing); }
- void setIsSpecifiedFont(bool isSpecifiedFont) { m_isSpecifiedFont = isSpecifiedFont; }
-
-#if ENABLE(TEXT_AUTOSIZING)
- bool familiesEqualForTextAutoSizing(const FontCascadeDescription& other) const;
-
- bool equalForTextAutoSizing(const FontCascadeDescription& other) const
- {
- return familiesEqualForTextAutoSizing(other)
- && m_specifiedSize == other.m_specifiedSize
- && variantSettings() == other.variantSettings()
- && m_isAbsoluteSize == other.m_isAbsoluteSize;
- }
-#endif
-
- // Initial values for font properties.
- static std::optional<FontSelectionValue> initialItalic() { return std::nullopt; }
- static FontStyleAxis initialFontStyleAxis() { return FontStyleAxis::slnt; }
- static FontSelectionValue initialWeight() { return normalWeightValue(); }
- static FontSelectionValue initialStretch() { return normalStretchValue(); }
- static FontSmallCaps initialSmallCaps() { return FontSmallCaps::Off; }
- static Kerning initialKerning() { return Kerning::Auto; }
- static FontSmoothingMode initialFontSmoothing() { return FontSmoothingMode::AutoSmoothing; }
- static TextRenderingMode initialTextRenderingMode() { return TextRenderingMode::AutoTextRendering; }
- static FontSynthesis initialFontSynthesis() { return FontSynthesisWeight | FontSynthesisStyle | FontSynthesisSmallCaps; }
- static FontVariantPosition initialVariantPosition() { return FontVariantPosition::Normal; }
- static FontVariantCaps initialVariantCaps() { return FontVariantCaps::Normal; }
- static FontVariantAlternates initialVariantAlternates() { return FontVariantAlternates::Normal; }
- static FontOpticalSizing initialOpticalSizing() { return FontOpticalSizing::Enabled; }
- static const AtomicString& initialLocale() { return nullAtom(); }
-
-private:
- RefCountedArray<AtomicString> m_families { 1 };
-
- float m_specifiedSize { 0 }; // Specified CSS value. Independent of rendering issues such as integer
- // rounding, minimum font sizes, and zooming.
- unsigned m_isAbsoluteSize : 1; // Whether or not CSS specified an explicit size
- // (logical sizes like "medium" don't count).
- unsigned m_kerning : 2; // Kerning
-
- unsigned m_keywordSize : 4; // We cache whether or not a font is currently represented by a CSS keyword (e.g., medium). If so,
- // then we can accurately translate across different generic families to adjust for different preference settings
- // (e.g., 13px monospace vs. 16px everything else). Sizes are 1-8 (like the HTML size values for <font>).
-
- unsigned m_fontSmoothing : 2; // FontSmoothingMode
- unsigned m_isSpecifiedFont : 1; // True if a web page specifies a non-generic font family as the first font family.
-};
-
-inline bool FontCascadeDescription::operator==(const FontCascadeDescription& other) const
-{
- return FontDescription::operator==(other)
- && m_families == other.m_families
- && m_specifiedSize == other.m_specifiedSize
- && m_isAbsoluteSize == other.m_isAbsoluteSize
- && m_kerning == other.m_kerning
- && m_keywordSize == other.m_keywordSize
- && m_fontSmoothing == other.m_fontSmoothing
- && m_isSpecifiedFont == other.m_isSpecifiedFont;
}
-
-}
-
-#endif
Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp (236913 => 236914)
--- trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp 2018-10-08 13:55:14 UTC (rev 236913)
+++ trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp 2018-10-08 16:09:28 UTC (rev 236914)
@@ -42,6 +42,7 @@
#include "Logging.h"
#include "MediaStreamPrivate.h"
#include "ScreenDisplayCaptureSourceMac.h"
+#include "WindowDisplayCaptureSourceMac.h"
#include <wtf/MainThread.h>
namespace WebCore {
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (236913 => 236914)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2018-10-08 13:55:14 UTC (rev 236913)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2018-10-08 16:09:28 UTC (rev 236914)
@@ -33,7 +33,7 @@
#include "CounterDirectives.h"
#include "DataRef.h"
#include "FilterOperations.h"
-#include "FontDescription.h"
+#include "FontCascadeDescription.h"
#include "GapLength.h"
#include "GraphicsTypes.h"
#include "Length.h"
Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/FontCache.cpp (236913 => 236914)
--- trunk/Tools/TestWebKitAPI/Tests/WebCore/FontCache.cpp 2018-10-08 13:55:14 UTC (rev 236913)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/FontCache.cpp 2018-10-08 16:09:28 UTC (rev 236914)
@@ -28,6 +28,7 @@
#include <CoreText/CoreText.h>
#include <_javascript_Core/InitializeThreading.h>
#include <WebCore/FontCache.h>
+#include <WebCore/FontCascadeDescription.h>
#include <WebCore/FontPlatformData.h>
#include <wtf/MainThread.h>
#include <wtf/RunLoop.h>
