Changeset 30421 in webkit

Timestamp:

Feb 19, 2008 6:17:25 PM (16 years ago)

Author:

Darin Adler

Message:

Reviewed by Sam.

• removed use of DeprecatedString for font family names

• css/CSSFontSelector.cpp: (WebCore::CSSFontSelector::addFontFaceRule): Update for name change.
• css/CSSParser.cpp: (WebCore::CSSParser::parseFontFamily): Update to use new appendSpaceSeparated function and String rather than DeprecatedString.
• css/CSSStyleSelector.cpp: (WebCore::CSSStyleSelector::applyProperty): Updated for name change.
• css/FontFamilyValue.cpp: (WebCore::FontFamilyValue::FontFamilyValue): Replaced code using a regular expression with code that does the same thing more efficiently. (WebCore::FontFamilyValue::appendSpaceSeparated): Added. (WebCore::FontFamilyValue::cssText): Updated for name change.
• css/FontFamilyValue.h: Changed DeprecatedString to String. Renamed fontName to familyName and parsedFontName to m_familyName. Removed unused genericFamilyType and m_genericFamilyType. Added appendSpaceSeparated so that m_familyName can be private instead of public.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSFontSelector.cpp (modified) (1 diff)
• css/CSSParser.cpp (modified) (2 diffs)
• css/CSSStyleSelector.cpp (modified) (2 diffs)
• css/FontFamilyValue.cpp (modified) (3 diffs)
• css/FontFamilyValue.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-02-19  Darin Adler  <darin@apple.com>
+
+        Reviewed by Sam.
+
+        - removed use of DeprecatedString for font family names
+
+        * css/CSSFontSelector.cpp:
+        (WebCore::CSSFontSelector::addFontFaceRule): Update for name change.
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseFontFamily): Update to use new appendSpaceSeparated
+        function and String rather than DeprecatedString.
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty): Updated for name change.
+        * css/FontFamilyValue.cpp:
+        (WebCore::FontFamilyValue::FontFamilyValue): Replaced code using a regular
+        expression with code that does the same thing more efficiently.
+        (WebCore::FontFamilyValue::appendSpaceSeparated): Added.
+        (WebCore::FontFamilyValue::cssText): Updated for name change.
+        * css/FontFamilyValue.h: Changed DeprecatedString to String. Renamed fontName
+        to familyName and parsedFontName to m_familyName. Removed unused genericFamilyType
+        and m_genericFamilyType. Added appendSpaceSeparated so that m_familyName can
+        be private instead of public.
+
 2008-02-19  Darin Adler  <darin@apple.com>
 

trunk/WebCore/css/CSSFontSelector.cpp

@@ -207 +207 @@
         String familyName;
         if (item->primitiveType() == CSSPrimitiveValue::CSS_STRING)
-            familyName = static_cast<FontFamilyValue*>(item)->fontName();
+            familyName = static_cast<FontFamilyValue*>(item)->familyName();
         else if (item->primitiveType() == CSSPrimitiveValue::CSS_IDENT) {
             // We need to use the raw text for all the generic family types, since @font-face is a way of actually

trunk/WebCore/css/CSSParser.cpp

@@ -2675 +2675 @@
 }
 
-static DeprecatedString deprecatedString(const ParseString& ps)
-{
-    return DeprecatedString(reinterpret_cast<const DeprecatedChar*>(ps.characters), ps.length);
-}
-
 PassRefPtr<CSSValueList> CSSParser::parseFontFamily()
 {
@@ -2694 +2689 @@
 
         if (value->id >= CSS_VAL_SERIF && value->id <= CSS_VAL__WEBKIT_BODY) {
-            if (currFamily) {
-                currFamily->parsedFontName += ' ';
-                currFamily->parsedFontName += deprecatedString(value->string);
-            }
+            if (currFamily)
+                currFamily->appendSpaceSeparated(value->string.characters, value->string.length);
             else if (nextValBreaksFont || !nextValIsFontName)
                 list->append(new CSSPrimitiveValue(value->id));
             else
-                list->append(currFamily = new FontFamilyValue(deprecatedString(value->string)));
+                list->append(currFamily = new FontFamilyValue(domString(value->string)));
         }
         else if (value->unit == CSSPrimitiveValue::CSS_STRING) {
             // Strings never share in a family name.
             currFamily = 0;
-            list->append(new FontFamilyValue(deprecatedString(value->string)));
+            list->append(new FontFamilyValue(domString(value->string)));
         }
         else if (value->unit == CSSPrimitiveValue::CSS_IDENT) {
-            if (currFamily) {
-                currFamily->parsedFontName += ' ';
-                currFamily->parsedFontName += deprecatedString(value->string);
-            }
+            if (currFamily)
+                currFamily->appendSpaceSeparated(value->string.characters, value->string.length);
             else if (nextValBreaksFont || !nextValIsFontName)
-                list->append(new FontFamilyValue(deprecatedString(value->string)));
+                list->append(new FontFamilyValue(domString(value->string)));
             else
-                list->append(currFamily = new FontFamilyValue(deprecatedString(value->string)));
+                list->append(currFamily = new FontFamilyValue(domString(value->string)));
         }
         else {

trunk/WebCore/css/CSSStyleSelector.cpp

@@ -46 +46 @@
 #include "Counter.h"
 #include "DashboardRegion.h"
+#include "DeprecatedString.h"
 #include "FontFamilyValue.h"
 #include "FontValue.h"
@@ -3583 +3584 @@
             Settings* settings = m_document->settings();
             if (val->primitiveType() == CSSPrimitiveValue::CSS_STRING)
-                face = static_cast<FontFamilyValue*>(val)->fontName();
+                face = static_cast<FontFamilyValue*>(val)->familyName();
             else if (val->primitiveType() == CSSPrimitiveValue::CSS_IDENT && settings) {
                 switch (val->getIdent()) {

trunk/WebCore/css/FontFamilyValue.cpp

@@ -1 @@
-/**
+/*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -18 +18 @@
  * Boston, MA 02110-1301, USA.
  */
+
 #include "config.h"
 #include "FontFamilyValue.h"
-
-#include "PlatformString.h"
-#include "RegularExpression.h"
 
 namespace WebCore {
@@ -62 +60 @@
 }
 
-FontFamilyValue::FontFamilyValue(const DeprecatedString& string)
+FontFamilyValue::FontFamilyValue(const String& familyName)
     : CSSPrimitiveValue(String(), CSS_STRING)
+    , m_familyName(familyName)
 {
-    static const RegularExpression parenReg(" \\(.*\\)$");
-    static const RegularExpression braceReg(" \\[.*\\]$");
+    // If there is anything in parentheses or square brackets at the end, delete it.
+    // FIXME: Do we really need this? The original code mentioned "a language tag in
+    // braces at the end" and "[Xft] qualifiers", but it's not clear either of those
+    // is in active use on the web.
+    unsigned length = m_familyName.length();
+    while (length >= 3) {
+        UChar startCharacter = 0;
+        switch (m_familyName[length - 1]) {
+            case ']':
+                startCharacter = '[';
+                break;
+            case ')':
+                startCharacter = '(';
+                break;
+        }
+        if (!startCharacter)
+            break;
+        unsigned first = 0;
+        for (unsigned i = length - 2; i > 0; --i) {
+            if (m_familyName[i - 1] == ' ' && m_familyName[i] == startCharacter)
+                first = i - 1;
+        }
+        if (!first)
+            break;
+        length = first;
+    }
+    m_familyName.truncate(length);
+}
 
-    parsedFontName = string;
-    // a language tag is often added in braces at the end. Remove it.
-    parsedFontName.replace(parenReg, "");
-    // remove [Xft] qualifiers
-    parsedFontName.replace(braceReg, "");
+void FontFamilyValue::appendSpaceSeparated(const UChar* characters, unsigned length)
+{
+    m_familyName.append(' ');
+    m_familyName.append(characters, length);
 }
 
 String FontFamilyValue::cssText() const
 {
-    return quoteStringIfNeeded(parsedFontName);
+    return quoteStringIfNeeded(m_familyName);
 }
 

trunk/WebCore/css/FontFamilyValue.h

@@ -1 +1 @@
 /*
- * This file is part of the DOM implementation for KDE.
- *
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
+ * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -25 +23 @@
 
 #include "CSSPrimitiveValue.h"
-#include "DeprecatedString.h"
+#include "PlatformString.h"
 
 namespace WebCore {
 
-class FontFamilyValue : public CSSPrimitiveValue
-{
+class FontFamilyValue : public CSSPrimitiveValue {
 public:
-    FontFamilyValue(const DeprecatedString& string);
-    const DeprecatedString& fontName() const { return parsedFontName; }
-    int genericFamilyType() const { return m_genericFamilyType; }
+    FontFamilyValue(const String& familyName);
+    void appendSpaceSeparated(const UChar* characters, unsigned length);
+
+    const String& familyName() const { return m_familyName; }
 
     virtual String cssText() const;
 
-    DeprecatedString parsedFontName;
 private:
-    int m_genericFamilyType;
+    String m_familyName;
 };