Changeset 46846 in webkit

Timestamp:

Aug 6, 2009 8:57:56 AM (15 years ago)

Author:

Simon Hausmann

Message:

2009-08-06 Laszlo Gombos <Laszlo Gombos>

Reviewed by Darin Adler.

cssgrammar.cpp fails to compile with RVCT compiler
​https://bugs.webkit.org/show_bug.cgi?id=27952

• css/CSSGrammar.y: Do not convert to String to get rid of the stray memory allocation

• platform/text/StringImpl.cpp: (WebCore::equalIgnoringCase):
• platform/text/StringImpl.h: (WebCore::equalIgnoringCase): Add charactersEqualIgnoringCase function that works with a character pointer and length

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSGrammar.y (modified) (1 diff)
• platform/text/StringImpl.cpp (modified) (1 diff)
• platform/text/StringImpl.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-08-06  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+
+        Reviewed by Darin Adler.
+
+        cssgrammar.cpp fails to compile with RVCT compiler
+        https://bugs.webkit.org/show_bug.cgi?id=27952
+
+        * css/CSSGrammar.y: Do not convert to String to get rid of the stray
+        memory allocation 
+
+        * platform/text/StringImpl.cpp:
+        (WebCore::equalIgnoringCase):
+        * platform/text/StringImpl.h: 
+        (WebCore::equalIgnoringCase): Add charactersEqualIgnoringCase
+          function that works with a character pointer and length
+
 2009-08-06  Drew Wilson  <atwilson@google.com>
 

trunk/WebCore/css/CSSGrammar.y

@@ -741 +741 @@
         $$.id = 0; $$.isInt = false; $$.unit = CSSPrimitiveValue::CSS_NUMBER;
         CSSParserString& str = $1;
-        if (equalIgnoringCase(static_cast<const String&>(str), "from"))
+        if (equalIgnoringCase("from", str.characters, str.length))
             $$.fValue = 0;
-        else if (equalIgnoringCase(static_cast<const String&>(str), "to"))
+        else if (equalIgnoringCase("to", str.characters, str.length))
             $$.fValue = 100;
         else

trunk/WebCore/platform/text/StringImpl.cpp

@@ -540 +540 @@
 }
 
-static bool equalIgnoringCase(const UChar* a, const char* b, int length)
+bool equalIgnoringCase(const UChar* a, const char* b, unsigned length)
 {
     ASSERT(length >= 0);

trunk/WebCore/platform/text/StringImpl.h

@@ -221 +221 @@
 bool equalIgnoringCase(StringImpl*, const char*);
 inline bool equalIgnoringCase(const char* a, StringImpl* b) { return equalIgnoringCase(b, a); }
+bool equalIgnoringCase(const UChar* a, const char* b, unsigned length);
+inline bool equalIgnoringCase(const char* a, const UChar* b, unsigned length) { return equalIgnoringCase(b, a, length); }
 
 // Golden ratio - arbitrary start value to avoid mapping all 0's to all 0's