Changeset 130082 in webkit

Timestamp:

Oct 1, 2012, 3:18:28 PM (13 years ago)

Author:

schenney@chromium.org

Message:

Rename Font::m_fontList to avoid confusion
​https://bugs.webkit.org/show_bug.cgi?id=95867

Reviewed by Eric Seidel.

Renames Font::m_fontList to Font::m_fontFallbackList to avoid confusion
with FontFallbackList::m_fontList.

No new tests as behavior is absolutely not different.

• platform/graphics/Font.cpp:

(WebCore::Font::Font):
(WebCore::Font::operator=):
(WebCore::Font::operator==):
(WebCore::Font::update):

• platform/graphics/Font.h:

(WebCore::Font::fontList):
(WebCore::Font::loadingCustomFonts):
(Font):
(WebCore::Font::primaryFont):
(WebCore::Font::fontDataAt):
(WebCore::Font::isFixedPitch):
(WebCore::Font::fontSelector):

• platform/graphics/FontFastPath.cpp:

(WebCore::Font::glyphDataAndPageForCharacter):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/Font.cpp (modified) (5 diffs)
• platform/graphics/Font.h (modified) (3 diffs)
• platform/graphics/FontFastPath.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-01  Stephen Chenney  <schenney@chromium.org>
+
+        Rename Font::m_fontList to avoid confusion
+        https://bugs.webkit.org/show_bug.cgi?id=95867
+
+        Reviewed by Eric Seidel.
+
+       Renames Font::m_fontList to Font::m_fontFallbackList to avoid confusion
+       with FontFallbackList::m_fontList.
+
+        No new tests as behavior is absolutely not different.
+
+        * platform/graphics/Font.cpp:
+        (WebCore::Font::Font):
+        (WebCore::Font::operator=):
+        (WebCore::Font::operator==):
+        (WebCore::Font::update):
+        * platform/graphics/Font.h:
+        (WebCore::Font::fontList):
+        (WebCore::Font::loadingCustomFonts):
+        (Font):
+        (WebCore::Font::primaryFont):
+        (WebCore::Font::fontDataAt):
+        (WebCore::Font::isFixedPitch):
+        (WebCore::Font::fontSelector):
+        * platform/graphics/FontFastPath.cpp:
+        (WebCore::Font::glyphDataAndPageForCharacter):
+
 2012-10-01  Florin Malita  <fmalita@chromium.org>
 

trunk/Source/WebCore/platform/graphics/Font.cpp

@@ -87 +87 @@
 
 Font::Font(const FontPlatformData& fontData, bool isPrinterFont, FontSmoothingMode fontSmoothingMode)
-    : m_fontList(FontFallbackList::create())
+    : m_fontFallbackList(FontFallbackList::create())
     , m_letterSpacing(0)
     , m_wordSpacing(0)
@@ -95 +95 @@
     m_fontDescription.setFontSmoothing(fontSmoothingMode);
     m_needsTranscoding = fontTranscoder().needsTranscoding(fontDescription());
-    m_fontList->setPlatformFont(fontData);
+    m_fontFallbackList->setPlatformFont(fontData);
 }
 
 Font::Font(const Font& other)
     : m_fontDescription(other.m_fontDescription)
-    , m_fontList(other.m_fontList)
+    , m_fontFallbackList(other.m_fontFallbackList)
     , m_letterSpacing(other.m_letterSpacing)
     , m_wordSpacing(other.m_wordSpacing)
@@ -111 +111 @@
 {
     m_fontDescription = other.m_fontDescription;
-    m_fontList = other.m_fontList;
+    m_fontFallbackList = other.m_fontFallbackList;
     m_letterSpacing = other.m_letterSpacing;
     m_wordSpacing = other.m_wordSpacing;
@@ -126 +126 @@
         return false;
     
-    FontSelector* first = m_fontList ? m_fontList->fontSelector() : 0;
-    FontSelector* second = other.m_fontList ? other.m_fontList->fontSelector() : 0;
+    FontSelector* first = m_fontFallbackList ? m_fontFallbackList->fontSelector() : 0;
+    FontSelector* second = other.m_fontFallbackList ? other.m_fontFallbackList->fontSelector() : 0;
 
     return first == second
-           && m_fontDescription == other.m_fontDescription
-           && m_letterSpacing == other.m_letterSpacing
-           && m_wordSpacing == other.m_wordSpacing
-           && (m_fontList ? m_fontList->fontSelectorVersion() : 0) == (other.m_fontList ? other.m_fontList->fontSelectorVersion() : 0)
-           && (m_fontList ? m_fontList->generation() : 0) == (other.m_fontList ? other.m_fontList->generation() : 0);
+        && m_fontDescription == other.m_fontDescription
+        && m_letterSpacing == other.m_letterSpacing
+        && m_wordSpacing == other.m_wordSpacing
+        && (m_fontFallbackList ? m_fontFallbackList->fontSelectorVersion() : 0) == (other.m_fontFallbackList ? other.m_fontFallbackList->fontSelectorVersion() : 0)
+        && (m_fontFallbackList ? m_fontFallbackList->generation() : 0) == (other.m_fontFallbackList ? other.m_fontFallbackList->generation() : 0);
 }
 
@@ -144 +144 @@
     // won't stick around long enough to get you in trouble). Still, this is pretty disgusting,
     // and could eventually be rectified by using RefPtrs for Fonts themselves.
-    if (!m_fontList)
-        m_fontList = FontFallbackList::create();
-    m_fontList->invalidate(fontSelector);
+    if (!m_fontFallbackList)
+        m_fontFallbackList = FontFallbackList::create();
+    m_fontFallbackList->invalidate(fontSelector);
 }
 

trunk/Source/WebCore/platform/graphics/Font.h

@@ -262 +262 @@
 
     bool needsTranscoding() const { return m_needsTranscoding; }
-    FontFallbackList* fontList() const { return m_fontList.get(); }
+    FontFallbackList* fontList() const { return m_fontFallbackList.get(); }
 
 private:
     bool loadingCustomFonts() const
     {
-        return m_fontList && m_fontList->loadingCustomFonts();
+        return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts();
     }
 
@@ -275 +275 @@
 
     FontDescription m_fontDescription;
-    mutable RefPtr<FontFallbackList> m_fontList;
+    mutable RefPtr<FontFallbackList> m_fontFallbackList;
     short m_letterSpacing;
     short m_wordSpacing;
@@ -288 +288 @@
 inline const SimpleFontData* Font::primaryFont() const
 {
-    ASSERT(m_fontList);
-    return m_fontList->primarySimpleFontData(this);
+    ASSERT(m_fontFallbackList);
+    return m_fontFallbackList->primarySimpleFontData(this);
 }
 
 inline const FontData* Font::fontDataAt(unsigned index) const
 {
-    ASSERT(m_fontList);
-    return m_fontList->fontDataAt(this, index);
+    ASSERT(m_fontFallbackList);
+    return m_fontFallbackList->fontDataAt(this, index);
 }
 
 inline bool Font::isFixedPitch() const
 {
-    ASSERT(m_fontList);
-    return m_fontList->isFixedPitch(this);
+    ASSERT(m_fontFallbackList);
+    return m_fontFallbackList->isFixedPitch(this);
 }
 
 inline FontSelector* Font::fontSelector() const
 {
-    return m_fontList ? m_fontList->fontSelector() : 0;
+    return m_fontFallbackList ? m_fontFallbackList->fontSelector() : 0;
 }
 

trunk/Source/WebCore/platform/graphics/FontFastPath.cpp

@@ -69 +69 @@
     unsigned pageNumber = (c / GlyphPage::size);
 
-    GlyphPageTreeNode* node = pageNumber ? m_fontList->m_pages.get(pageNumber) : m_fontList->m_pageZero;
+    GlyphPageTreeNode* node = pageNumber ? m_fontFallbackList->m_pages.get(pageNumber) : m_fontFallbackList->m_pageZero;
     if (!node) {
         node = GlyphPageTreeNode::getRootChild(fontDataAt(0), pageNumber);
         if (pageNumber)
-            m_fontList->m_pages.set(pageNumber, node);
+            m_fontFallbackList->m_pages.set(pageNumber, node);
         else
-            m_fontList->m_pageZero = node;
+            m_fontFallbackList->m_pageZero = node;
     }
 
@@ -140 +140 @@
             node = node->getChild(fontDataAt(node->level()), pageNumber);
             if (pageNumber)
-                m_fontList->m_pages.set(pageNumber, node);
+                m_fontFallbackList->m_pages.set(pageNumber, node);
             else
-                m_fontList->m_pageZero = node;
+                m_fontFallbackList->m_pageZero = node;
         }
     }
@@ -177 +177 @@
             node = node->getChild(fontDataAt(node->level()), pageNumber);
             if (pageNumber)
-                m_fontList->m_pages.set(pageNumber, node);
+                m_fontFallbackList->m_pages.set(pageNumber, node);
             else
-                m_fontList->m_pageZero = node;
+                m_fontFallbackList->m_pageZero = node;
         }
     }