Changeset 195164 in webkit

Timestamp:

Jan 16, 2016 12:25:27 AM (8 years ago)

Author:

mmaxfield@apple.com

Message:

Tiny cleanup in FontFaceComparator
​https://bugs.webkit.org/show_bug.cgi?id=153044

Reviewed by Zalan Bujtas.

This is a follow-up patch to r194923.

No new tests because there is no behavior change.

• css/CSSFontSelector.cpp:

(WebCore::FontFaceComparator::FontFaceComparator):
(WebCore::FontFaceComparator::operator()):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSFontSelector.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-16  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Tiny cleanup in FontFaceComparator
+        https://bugs.webkit.org/show_bug.cgi?id=153044
+
+        Reviewed by Zalan Bujtas.
+
+        This is a follow-up patch to r194923.
+
+        No new tests because there is no behavior change.
+
+        * css/CSSFontSelector.cpp:
+        (WebCore::FontFaceComparator::FontFaceComparator):
+        (WebCore::FontFaceComparator::operator()):
+
 2016-01-15  Jiewen Tan  <jiewen_tan@apple.com>
 

trunk/Source/WebCore/css/CSSFontSelector.cpp

@@ -397 +397 @@
         : m_desiredTraitsMaskForComparison(desiredTraitsMaskForComparison)
     {
+        ASSERT_WITH_SECURITY_IMPLICATION(m_desiredTraitsMaskForComparison & FontWeightMask);
     }
 
@@ -445 +446 @@
 
         unsigned ruleSetIndex = 0;
-        unsigned w = FontWeight100Bit;
-        while (!(m_desiredTraitsMaskForComparison & (1 << w))) {
-            w++;
-            ruleSetIndex++;
-        }
-
-        ASSERT_WITH_SECURITY_IMPLICATION(ruleSetIndex < fallbackRuleSets);
+        for (; !(m_desiredTraitsMaskForComparison & (1 << (FontWeight100Bit + ruleSetIndex))); ruleSetIndex++) { }
+
         const FontTraitsMask* weightFallbackRule = weightFallbackRuleSets[ruleSetIndex];
         for (unsigned i = 0; i < rulesPerSet; ++i) {