patches/webkit-15-static.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 3325 33ece2659d50
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3325
33ece2659d50 SFEwebkitgtk.spec: bump to 1.2.7
jurikm
parents: 2650
diff changeset
     1
--- webkit-1.2.7/WebCore/rendering/RenderListMarker.cpp	Fri Sep 10 15:20:33 2010
33ece2659d50 SFEwebkitgtk.spec: bump to 1.2.7
jurikm
parents: 2650
diff changeset
     2
+++ webkit-1.2.7-patch/WebCore/rendering/RenderListMarker.cpp	Sat Mar 19 23:10:38 2011
33ece2659d50 SFEwebkitgtk.spec: bump to 1.2.7
jurikm
parents: 2650
diff changeset
     3
@@ -116,7 +116,7 @@
2315
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
     4
     return String(&letters[lettersSize - length], length);
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
     5
 }
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
     6
 
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
     7
-static String toAlphabetic(int number, const UChar* alphabet, int alphabetSize)
2650
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents: 2315
diff changeset
     8
+static inline String toAlphabetic(int number, const UChar* alphabet, int alphabetSize)
2315
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
     9
 {
2650
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents: 2315
diff changeset
    10
     if (number < 1)
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents: 2315
diff changeset
    11
         return String::number(number);
3325
33ece2659d50 SFEwebkitgtk.spec: bump to 1.2.7
jurikm
parents: 2650
diff changeset
    12
@@ -124,7 +124,7 @@
2650
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents: 2315
diff changeset
    13
     return toAlphabeticOrNumeric(number, alphabet, alphabetSize, AlphabeticSequence);
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents: 2315
diff changeset
    14
 }
2315
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
    15
 
2650
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents: 2315
diff changeset
    16
-static String toNumeric(int number, const UChar* numerals, int numeralsSize)
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents: 2315
diff changeset
    17
+static inline String toNumeric(int number, const UChar* numerals, int numeralsSize)
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents: 2315
diff changeset
    18
 {
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents: 2315
diff changeset
    19
     return toAlphabeticOrNumeric(number, numerals, numeralsSize, NumericSequence);
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents: 2315
diff changeset
    20
 }