Changeset 72116 in webkit


Ignore:
Timestamp:
Nov 16, 2010 10:25:46 AM (13 years ago)
Author:
ap@apple.com
Message:

Reviewed by Dave Hyatt.

https://bugs.webkit.org/show_bug.cgi?id=49483
Remove CSS Variable support

Location:
trunk
Files:
13 deleted
45 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r72108 r72116  
     12010-11-16  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Reviewed by Dave Hyatt.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=49483
     6        Remove CSS Variable support
     7
     8        * fast/css/variables: Removed.
     9        * fast/css/variables/block-cycle-test.html: Removed.
     10        * fast/css/variables/color-hex-test-expected.txt: Removed.
     11        * fast/css/variables/color-hex-test.html: Removed.
     12        * fast/css/variables/colors-test.html: Removed.
     13        * fast/css/variables/declaration-block-test.html: Removed.
     14        * fast/css/variables/font-test.html: Removed.
     15        * fast/css/variables/image-test.html: Removed.
     16        * fast/css/variables/import-test.html: Removed.
     17        * fast/css/variables/inline-style-test.html: Removed.
     18        * fast/css/variables/invalid-identifier-expected.txt: Removed.
     19        * fast/css/variables/invalid-identifier.html: Removed.
     20        * fast/css/variables/invalid-variable-test.html: Removed.
     21        * fast/css/variables/margin-test.html: Removed.
     22        * fast/css/variables/misplaced-import-test.html: Removed.
     23        * fast/css/variables/misplaced-variables-test.html: Removed.
     24        * fast/css/variables/multiple-blocks-test.html: Removed.
     25        * fast/css/variables/multiple-term-test.html: Removed.
     26        * fast/css/variables/override-test.html: Removed.
     27        * fast/css/variables/print-test.html: Removed.
     28        * fast/css/variables/remove-variable-test.html: Removed.
     29        * fast/css/variables/resources: Removed.
     30        * fast/css/variables/resources/bad.css: Removed.
     31        * fast/css/variables/resources/good.css: Removed.
     32        * fast/css/variables/resources/listmark.gif: Removed.
     33        * fast/css/variables/set-variable-test.html: Removed.
     34        * fast/css/variables/shorthand-test.html: Removed.
     35        * fast/css/variables/variable-iteration-test.html: Removed.
     36        * fast/dom/Window/window-properties-expected.txt:
     37        * fast/dom/Window/window-property-descriptors-expected.txt:
     38        * fast/dom/prototype-inheritance-2-expected.txt:
     39        * fast/dom/prototype-inheritance-expected.txt:
     40        * fast/js/global-constructors-expected.txt:
     41        * platform/chromium-mac/fast/css/variables: Removed.
     42        * platform/chromium-mac/fast/css/variables/color-hex-test-expected.txt: Removed.
     43        * platform/chromium-mac/fast/css/variables/remove-variable-test-expected.txt: Removed.
     44        * platform/chromium-mac/fast/css/variables/set-variable-test-expected.txt: Removed.
     45        * platform/chromium-mac/fast/css/variables/variable-iteration-test-expected.txt: Removed.
     46        * platform/chromium-win/fast/css/variables: Removed.
     47        * platform/chromium-win/fast/css/variables/alternate-syntax: Removed.
     48        * platform/chromium-win/fast/css/variables/alternate-syntax/block-cycle-test-expected.checksum: Removed.
     49        * platform/chromium-win/fast/css/variables/alternate-syntax/block-cycle-test-expected.png: Removed.
     50        * platform/chromium-win/fast/css/variables/alternate-syntax/block-cycle-test-expected.txt: Removed.
     51        * platform/chromium-win/fast/css/variables/alternate-syntax/colors-test-expected.checksum: Removed.
     52        * platform/chromium-win/fast/css/variables/alternate-syntax/colors-test-expected.png: Removed.
     53        * platform/chromium-win/fast/css/variables/alternate-syntax/colors-test-expected.txt: Removed.
     54        * platform/chromium-win/fast/css/variables/alternate-syntax/declaration-block-test-expected.checksum: Removed.
     55        * platform/chromium-win/fast/css/variables/alternate-syntax/declaration-block-test-expected.png: Removed.
     56        * platform/chromium-win/fast/css/variables/alternate-syntax/declaration-block-test-expected.txt: Removed.
     57        * platform/chromium-win/fast/css/variables/alternate-syntax/font-test-expected.checksum: Removed.
     58        * platform/chromium-win/fast/css/variables/alternate-syntax/font-test-expected.png: Removed.
     59        * platform/chromium-win/fast/css/variables/alternate-syntax/font-test-expected.txt: Removed.
     60        * platform/chromium-win/fast/css/variables/alternate-syntax/image-test-expected.checksum: Removed.
     61        * platform/chromium-win/fast/css/variables/alternate-syntax/image-test-expected.png: Removed.
     62        * platform/chromium-win/fast/css/variables/alternate-syntax/image-test-expected.txt: Removed.
     63        * platform/chromium-win/fast/css/variables/alternate-syntax/import-test-expected.checksum: Removed.
     64        * platform/chromium-win/fast/css/variables/alternate-syntax/import-test-expected.png: Removed.
     65        * platform/chromium-win/fast/css/variables/alternate-syntax/import-test-expected.txt: Removed.
     66        * platform/chromium-win/fast/css/variables/alternate-syntax/inline-style-test-expected.checksum: Removed.
     67        * platform/chromium-win/fast/css/variables/alternate-syntax/inline-style-test-expected.png: Removed.
     68        * platform/chromium-win/fast/css/variables/alternate-syntax/inline-style-test-expected.txt: Removed.
     69        * platform/chromium-win/fast/css/variables/alternate-syntax/invalid-variable-test-expected.checksum: Removed.
     70        * platform/chromium-win/fast/css/variables/alternate-syntax/invalid-variable-test-expected.png: Removed.
     71        * platform/chromium-win/fast/css/variables/alternate-syntax/invalid-variable-test-expected.txt: Removed.
     72        * platform/chromium-win/fast/css/variables/alternate-syntax/margin-test-expected.checksum: Removed.
     73        * platform/chromium-win/fast/css/variables/alternate-syntax/margin-test-expected.png: Removed.
     74        * platform/chromium-win/fast/css/variables/alternate-syntax/margin-test-expected.txt: Removed.
     75        * platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-import-test-expected.checksum: Removed.
     76        * platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-import-test-expected.png: Removed.
     77        * platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-import-test-expected.txt: Removed.
     78        * platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.checksum: Removed.
     79        * platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.png: Removed.
     80        * platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.txt: Removed.
     81        * platform/chromium-win/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.checksum: Removed.
     82        * platform/chromium-win/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.png: Removed.
     83        * platform/chromium-win/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.txt: Removed.
     84        * platform/chromium-win/fast/css/variables/alternate-syntax/multiple-term-test-expected.checksum: Removed.
     85        * platform/chromium-win/fast/css/variables/alternate-syntax/multiple-term-test-expected.png: Removed.
     86        * platform/chromium-win/fast/css/variables/alternate-syntax/multiple-term-test-expected.txt: Removed.
     87        * platform/chromium-win/fast/css/variables/alternate-syntax/override-test-expected.checksum: Removed.
     88        * platform/chromium-win/fast/css/variables/alternate-syntax/override-test-expected.png: Removed.
     89        * platform/chromium-win/fast/css/variables/alternate-syntax/override-test-expected.txt: Removed.
     90        * platform/chromium-win/fast/css/variables/alternate-syntax/print-test-expected.checksum: Removed.
     91        * platform/chromium-win/fast/css/variables/alternate-syntax/print-test-expected.png: Removed.
     92        * platform/chromium-win/fast/css/variables/alternate-syntax/print-test-expected.txt: Removed.
     93        * platform/chromium-win/fast/css/variables/alternate-syntax/remove-variable-test-expected.checksum: Removed.
     94        * platform/chromium-win/fast/css/variables/alternate-syntax/remove-variable-test-expected.png: Removed.
     95        * platform/chromium-win/fast/css/variables/alternate-syntax/remove-variable-test-expected.txt: Removed.
     96        * platform/chromium-win/fast/css/variables/alternate-syntax/set-variable-test-expected.checksum: Removed.
     97        * platform/chromium-win/fast/css/variables/alternate-syntax/set-variable-test-expected.png: Removed.
     98        * platform/chromium-win/fast/css/variables/alternate-syntax/set-variable-test-expected.txt: Removed.
     99        * platform/chromium-win/fast/css/variables/alternate-syntax/shorthand-test-expected.checksum: Removed.
     100        * platform/chromium-win/fast/css/variables/alternate-syntax/shorthand-test-expected.png: Removed.
     101        * platform/chromium-win/fast/css/variables/alternate-syntax/shorthand-test-expected.txt: Removed.
     102        * platform/chromium-win/fast/css/variables/alternate-syntax/variable-iteration-test-expected.checksum: Removed.
     103        * platform/chromium-win/fast/css/variables/alternate-syntax/variable-iteration-test-expected.png: Removed.
     104        * platform/chromium-win/fast/css/variables/alternate-syntax/variable-iteration-test-expected.txt: Removed.
     105        * platform/chromium-win/fast/css/variables/block-cycle-test-expected.checksum: Removed.
     106        * platform/chromium-win/fast/css/variables/block-cycle-test-expected.png: Removed.
     107        * platform/chromium-win/fast/css/variables/block-cycle-test-expected.txt: Removed.
     108        * platform/chromium-win/fast/css/variables/color-hex-test-expected.txt: Removed.
     109        * platform/chromium-win/fast/css/variables/colors-test-expected.checksum: Removed.
     110        * platform/chromium-win/fast/css/variables/colors-test-expected.png: Removed.
     111        * platform/chromium-win/fast/css/variables/colors-test-expected.txt: Removed.
     112        * platform/chromium-win/fast/css/variables/declaration-block-test-expected.checksum: Removed.
     113        * platform/chromium-win/fast/css/variables/declaration-block-test-expected.png: Removed.
     114        * platform/chromium-win/fast/css/variables/declaration-block-test-expected.txt: Removed.
     115        * platform/chromium-win/fast/css/variables/font-test-expected.checksum: Removed.
     116        * platform/chromium-win/fast/css/variables/font-test-expected.png: Removed.
     117        * platform/chromium-win/fast/css/variables/font-test-expected.txt: Removed.
     118        * platform/chromium-win/fast/css/variables/image-test-expected.checksum: Removed.
     119        * platform/chromium-win/fast/css/variables/image-test-expected.png: Removed.
     120        * platform/chromium-win/fast/css/variables/image-test-expected.txt: Removed.
     121        * platform/chromium-win/fast/css/variables/import-test-expected.checksum: Removed.
     122        * platform/chromium-win/fast/css/variables/import-test-expected.png: Removed.
     123        * platform/chromium-win/fast/css/variables/import-test-expected.txt: Removed.
     124        * platform/chromium-win/fast/css/variables/inline-style-test-expected.checksum: Removed.
     125        * platform/chromium-win/fast/css/variables/inline-style-test-expected.png: Removed.
     126        * platform/chromium-win/fast/css/variables/inline-style-test-expected.txt: Removed.
     127        * platform/chromium-win/fast/css/variables/invalid-variable-test-expected.checksum: Removed.
     128        * platform/chromium-win/fast/css/variables/invalid-variable-test-expected.png: Removed.
     129        * platform/chromium-win/fast/css/variables/invalid-variable-test-expected.txt: Removed.
     130        * platform/chromium-win/fast/css/variables/margin-test-expected.checksum: Removed.
     131        * platform/chromium-win/fast/css/variables/margin-test-expected.png: Removed.
     132        * platform/chromium-win/fast/css/variables/margin-test-expected.txt: Removed.
     133        * platform/chromium-win/fast/css/variables/misplaced-import-test-expected.checksum: Removed.
     134        * platform/chromium-win/fast/css/variables/misplaced-import-test-expected.png: Removed.
     135        * platform/chromium-win/fast/css/variables/misplaced-import-test-expected.txt: Removed.
     136        * platform/chromium-win/fast/css/variables/misplaced-variables-test-expected.checksum: Removed.
     137        * platform/chromium-win/fast/css/variables/misplaced-variables-test-expected.png: Removed.
     138        * platform/chromium-win/fast/css/variables/misplaced-variables-test-expected.txt: Removed.
     139        * platform/chromium-win/fast/css/variables/multiple-blocks-test-expected.checksum: Removed.
     140        * platform/chromium-win/fast/css/variables/multiple-blocks-test-expected.png: Removed.
     141        * platform/chromium-win/fast/css/variables/multiple-blocks-test-expected.txt: Removed.
     142        * platform/chromium-win/fast/css/variables/multiple-term-test-expected.checksum: Removed.
     143        * platform/chromium-win/fast/css/variables/multiple-term-test-expected.png: Removed.
     144        * platform/chromium-win/fast/css/variables/multiple-term-test-expected.txt: Removed.
     145        * platform/chromium-win/fast/css/variables/override-test-expected.checksum: Removed.
     146        * platform/chromium-win/fast/css/variables/override-test-expected.png: Removed.
     147        * platform/chromium-win/fast/css/variables/override-test-expected.txt: Removed.
     148        * platform/chromium-win/fast/css/variables/print-test-expected.checksum: Removed.
     149        * platform/chromium-win/fast/css/variables/print-test-expected.png: Removed.
     150        * platform/chromium-win/fast/css/variables/print-test-expected.txt: Removed.
     151        * platform/chromium-win/fast/css/variables/remove-variable-test-expected.checksum: Removed.
     152        * platform/chromium-win/fast/css/variables/remove-variable-test-expected.png: Removed.
     153        * platform/chromium-win/fast/css/variables/remove-variable-test-expected.txt: Removed.
     154        * platform/chromium-win/fast/css/variables/set-variable-test-expected.checksum: Removed.
     155        * platform/chromium-win/fast/css/variables/set-variable-test-expected.png: Removed.
     156        * platform/chromium-win/fast/css/variables/set-variable-test-expected.txt: Removed.
     157        * platform/chromium-win/fast/css/variables/shorthand-test-expected.checksum: Removed.
     158        * platform/chromium-win/fast/css/variables/shorthand-test-expected.png: Removed.
     159        * platform/chromium-win/fast/css/variables/shorthand-test-expected.txt: Removed.
     160        * platform/chromium-win/fast/css/variables/variable-iteration-test-expected.checksum: Removed.
     161        * platform/chromium-win/fast/css/variables/variable-iteration-test-expected.png: Removed.
     162        * platform/chromium-win/fast/css/variables/variable-iteration-test-expected.txt: Removed.
     163        * platform/gtk/Skipped:
     164        * platform/mac-leopard/fast/css/variables: Removed.
     165        * platform/mac-leopard/fast/css/variables/block-cycle-test-expected.checksum: Removed.
     166        * platform/mac-leopard/fast/css/variables/block-cycle-test-expected.png: Removed.
     167        * platform/mac-leopard/fast/css/variables/colors-test-expected.checksum: Removed.
     168        * platform/mac-leopard/fast/css/variables/colors-test-expected.png: Removed.
     169        * platform/mac-leopard/fast/css/variables/declaration-block-test-expected.checksum: Removed.
     170        * platform/mac-leopard/fast/css/variables/declaration-block-test-expected.png: Removed.
     171        * platform/mac-leopard/fast/css/variables/font-test-expected.checksum: Removed.
     172        * platform/mac-leopard/fast/css/variables/font-test-expected.png: Removed.
     173        * platform/mac-leopard/fast/css/variables/image-test-expected.checksum: Removed.
     174        * platform/mac-leopard/fast/css/variables/image-test-expected.png: Removed.
     175        * platform/mac-leopard/fast/css/variables/import-test-expected.checksum: Removed.
     176        * platform/mac-leopard/fast/css/variables/import-test-expected.png: Removed.
     177        * platform/mac-leopard/fast/css/variables/inline-style-test-expected.checksum: Removed.
     178        * platform/mac-leopard/fast/css/variables/inline-style-test-expected.png: Removed.
     179        * platform/mac-leopard/fast/css/variables/invalid-variable-test-expected.checksum: Removed.
     180        * platform/mac-leopard/fast/css/variables/invalid-variable-test-expected.png: Removed.
     181        * platform/mac-leopard/fast/css/variables/margin-test-expected.checksum: Removed.
     182        * platform/mac-leopard/fast/css/variables/margin-test-expected.png: Removed.
     183        * platform/mac-leopard/fast/css/variables/misplaced-import-test-expected.checksum: Removed.
     184        * platform/mac-leopard/fast/css/variables/misplaced-import-test-expected.png: Removed.
     185        * platform/mac-leopard/fast/css/variables/misplaced-variables-test-expected.checksum: Removed.
     186        * platform/mac-leopard/fast/css/variables/misplaced-variables-test-expected.png: Removed.
     187        * platform/mac-leopard/fast/css/variables/multiple-blocks-test-expected.checksum: Removed.
     188        * platform/mac-leopard/fast/css/variables/multiple-blocks-test-expected.png: Removed.
     189        * platform/mac-leopard/fast/css/variables/multiple-term-test-expected.checksum: Removed.
     190        * platform/mac-leopard/fast/css/variables/multiple-term-test-expected.png: Removed.
     191        * platform/mac-leopard/fast/css/variables/override-test-expected.checksum: Removed.
     192        * platform/mac-leopard/fast/css/variables/override-test-expected.png: Removed.
     193        * platform/mac-leopard/fast/css/variables/print-test-expected.checksum: Removed.
     194        * platform/mac-leopard/fast/css/variables/print-test-expected.png: Removed.
     195        * platform/mac-leopard/fast/css/variables/remove-variable-test-expected.checksum: Removed.
     196        * platform/mac-leopard/fast/css/variables/remove-variable-test-expected.png: Removed.
     197        * platform/mac-leopard/fast/css/variables/set-variable-test-expected.checksum: Removed.
     198        * platform/mac-leopard/fast/css/variables/set-variable-test-expected.png: Removed.
     199        * platform/mac-leopard/fast/css/variables/shorthand-test-expected.checksum: Removed.
     200        * platform/mac-leopard/fast/css/variables/shorthand-test-expected.png: Removed.
     201        * platform/mac/fast/css/variables: Removed.
     202        * platform/mac/fast/css/variables/alternate-syntax: Removed.
     203        * platform/mac/fast/css/variables/alternate-syntax/block-cycle-test-expected.checksum: Removed.
     204        * platform/mac/fast/css/variables/alternate-syntax/block-cycle-test-expected.png: Removed.
     205        * platform/mac/fast/css/variables/alternate-syntax/block-cycle-test-expected.txt: Removed.
     206        * platform/mac/fast/css/variables/alternate-syntax/colors-test-expected.checksum: Removed.
     207        * platform/mac/fast/css/variables/alternate-syntax/colors-test-expected.png: Removed.
     208        * platform/mac/fast/css/variables/alternate-syntax/colors-test-expected.txt: Removed.
     209        * platform/mac/fast/css/variables/alternate-syntax/declaration-block-test-expected.checksum: Removed.
     210        * platform/mac/fast/css/variables/alternate-syntax/declaration-block-test-expected.png: Removed.
     211        * platform/mac/fast/css/variables/alternate-syntax/declaration-block-test-expected.txt: Removed.
     212        * platform/mac/fast/css/variables/alternate-syntax/font-test-expected.checksum: Removed.
     213        * platform/mac/fast/css/variables/alternate-syntax/font-test-expected.png: Removed.
     214        * platform/mac/fast/css/variables/alternate-syntax/font-test-expected.txt: Removed.
     215        * platform/mac/fast/css/variables/alternate-syntax/image-test-expected.checksum: Removed.
     216        * platform/mac/fast/css/variables/alternate-syntax/image-test-expected.png: Removed.
     217        * platform/mac/fast/css/variables/alternate-syntax/image-test-expected.txt: Removed.
     218        * platform/mac/fast/css/variables/alternate-syntax/import-test-expected.checksum: Removed.
     219        * platform/mac/fast/css/variables/alternate-syntax/import-test-expected.png: Removed.
     220        * platform/mac/fast/css/variables/alternate-syntax/import-test-expected.txt: Removed.
     221        * platform/mac/fast/css/variables/alternate-syntax/inline-style-test-expected.checksum: Removed.
     222        * platform/mac/fast/css/variables/alternate-syntax/inline-style-test-expected.png: Removed.
     223        * platform/mac/fast/css/variables/alternate-syntax/inline-style-test-expected.txt: Removed.
     224        * platform/mac/fast/css/variables/alternate-syntax/invalid-variable-test-expected.checksum: Removed.
     225        * platform/mac/fast/css/variables/alternate-syntax/invalid-variable-test-expected.png: Removed.
     226        * platform/mac/fast/css/variables/alternate-syntax/invalid-variable-test-expected.txt: Removed.
     227        * platform/mac/fast/css/variables/alternate-syntax/margin-test-expected.checksum: Removed.
     228        * platform/mac/fast/css/variables/alternate-syntax/margin-test-expected.png: Removed.
     229        * platform/mac/fast/css/variables/alternate-syntax/margin-test-expected.txt: Removed.
     230        * platform/mac/fast/css/variables/alternate-syntax/misplaced-import-test-expected.checksum: Removed.
     231        * platform/mac/fast/css/variables/alternate-syntax/misplaced-import-test-expected.png: Removed.
     232        * platform/mac/fast/css/variables/alternate-syntax/misplaced-import-test-expected.txt: Removed.
     233        * platform/mac/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.checksum: Removed.
     234        * platform/mac/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.png: Removed.
     235        * platform/mac/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.txt: Removed.
     236        * platform/mac/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.checksum: Removed.
     237        * platform/mac/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.png: Removed.
     238        * platform/mac/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.txt: Removed.
     239        * platform/mac/fast/css/variables/alternate-syntax/multiple-term-test-expected.checksum: Removed.
     240        * platform/mac/fast/css/variables/alternate-syntax/multiple-term-test-expected.png: Removed.
     241        * platform/mac/fast/css/variables/alternate-syntax/multiple-term-test-expected.txt: Removed.
     242        * platform/mac/fast/css/variables/alternate-syntax/override-test-expected.checksum: Removed.
     243        * platform/mac/fast/css/variables/alternate-syntax/override-test-expected.png: Removed.
     244        * platform/mac/fast/css/variables/alternate-syntax/override-test-expected.txt: Removed.
     245        * platform/mac/fast/css/variables/alternate-syntax/print-test-expected.checksum: Removed.
     246        * platform/mac/fast/css/variables/alternate-syntax/print-test-expected.png: Removed.
     247        * platform/mac/fast/css/variables/alternate-syntax/print-test-expected.txt: Removed.
     248        * platform/mac/fast/css/variables/alternate-syntax/remove-variable-test-expected.checksum: Removed.
     249        * platform/mac/fast/css/variables/alternate-syntax/remove-variable-test-expected.png: Removed.
     250        * platform/mac/fast/css/variables/alternate-syntax/remove-variable-test-expected.txt: Removed.
     251        * platform/mac/fast/css/variables/alternate-syntax/set-variable-test-expected.checksum: Removed.
     252        * platform/mac/fast/css/variables/alternate-syntax/set-variable-test-expected.png: Removed.
     253        * platform/mac/fast/css/variables/alternate-syntax/set-variable-test-expected.txt: Removed.
     254        * platform/mac/fast/css/variables/alternate-syntax/shorthand-test-expected.checksum: Removed.
     255        * platform/mac/fast/css/variables/alternate-syntax/shorthand-test-expected.png: Removed.
     256        * platform/mac/fast/css/variables/alternate-syntax/shorthand-test-expected.txt: Removed.
     257        * platform/mac/fast/css/variables/alternate-syntax/variable-iteration-test-expected.checksum: Removed.
     258        * platform/mac/fast/css/variables/alternate-syntax/variable-iteration-test-expected.png: Removed.
     259        * platform/mac/fast/css/variables/alternate-syntax/variable-iteration-test-expected.txt: Removed.
     260        * platform/mac/fast/css/variables/block-cycle-test-expected.checksum: Removed.
     261        * platform/mac/fast/css/variables/block-cycle-test-expected.png: Removed.
     262        * platform/mac/fast/css/variables/block-cycle-test-expected.txt: Removed.
     263        * platform/mac/fast/css/variables/colors-test-expected.checksum: Removed.
     264        * platform/mac/fast/css/variables/colors-test-expected.png: Removed.
     265        * platform/mac/fast/css/variables/colors-test-expected.txt: Removed.
     266        * platform/mac/fast/css/variables/declaration-block-test-expected.checksum: Removed.
     267        * platform/mac/fast/css/variables/declaration-block-test-expected.png: Removed.
     268        * platform/mac/fast/css/variables/declaration-block-test-expected.txt: Removed.
     269        * platform/mac/fast/css/variables/font-test-expected.checksum: Removed.
     270        * platform/mac/fast/css/variables/font-test-expected.png: Removed.
     271        * platform/mac/fast/css/variables/font-test-expected.txt: Removed.
     272        * platform/mac/fast/css/variables/image-test-expected.checksum: Removed.
     273        * platform/mac/fast/css/variables/image-test-expected.png: Removed.
     274        * platform/mac/fast/css/variables/image-test-expected.txt: Removed.
     275        * platform/mac/fast/css/variables/import-test-expected.checksum: Removed.
     276        * platform/mac/fast/css/variables/import-test-expected.png: Removed.
     277        * platform/mac/fast/css/variables/import-test-expected.txt: Removed.
     278        * platform/mac/fast/css/variables/inline-style-test-expected.checksum: Removed.
     279        * platform/mac/fast/css/variables/inline-style-test-expected.png: Removed.
     280        * platform/mac/fast/css/variables/inline-style-test-expected.txt: Removed.
     281        * platform/mac/fast/css/variables/invalid-variable-test-expected.checksum: Removed.
     282        * platform/mac/fast/css/variables/invalid-variable-test-expected.png: Removed.
     283        * platform/mac/fast/css/variables/invalid-variable-test-expected.txt: Removed.
     284        * platform/mac/fast/css/variables/margin-test-expected.checksum: Removed.
     285        * platform/mac/fast/css/variables/margin-test-expected.png: Removed.
     286        * platform/mac/fast/css/variables/margin-test-expected.txt: Removed.
     287        * platform/mac/fast/css/variables/misplaced-import-test-expected.checksum: Removed.
     288        * platform/mac/fast/css/variables/misplaced-import-test-expected.png: Removed.
     289        * platform/mac/fast/css/variables/misplaced-import-test-expected.txt: Removed.
     290        * platform/mac/fast/css/variables/misplaced-variables-test-expected.checksum: Removed.
     291        * platform/mac/fast/css/variables/misplaced-variables-test-expected.png: Removed.
     292        * platform/mac/fast/css/variables/misplaced-variables-test-expected.txt: Removed.
     293        * platform/mac/fast/css/variables/multiple-blocks-test-expected.checksum: Removed.
     294        * platform/mac/fast/css/variables/multiple-blocks-test-expected.png: Removed.
     295        * platform/mac/fast/css/variables/multiple-blocks-test-expected.txt: Removed.
     296        * platform/mac/fast/css/variables/multiple-term-test-expected.checksum: Removed.
     297        * platform/mac/fast/css/variables/multiple-term-test-expected.png: Removed.
     298        * platform/mac/fast/css/variables/multiple-term-test-expected.txt: Removed.
     299        * platform/mac/fast/css/variables/override-test-expected.checksum: Removed.
     300        * platform/mac/fast/css/variables/override-test-expected.png: Removed.
     301        * platform/mac/fast/css/variables/override-test-expected.txt: Removed.
     302        * platform/mac/fast/css/variables/print-test-expected.checksum: Removed.
     303        * platform/mac/fast/css/variables/print-test-expected.png: Removed.
     304        * platform/mac/fast/css/variables/print-test-expected.txt: Removed.
     305        * platform/mac/fast/css/variables/remove-variable-test-expected.checksum: Removed.
     306        * platform/mac/fast/css/variables/remove-variable-test-expected.png: Removed.
     307        * platform/mac/fast/css/variables/remove-variable-test-expected.txt: Removed.
     308        * platform/mac/fast/css/variables/set-variable-test-expected.checksum: Removed.
     309        * platform/mac/fast/css/variables/set-variable-test-expected.png: Removed.
     310        * platform/mac/fast/css/variables/set-variable-test-expected.txt: Removed.
     311        * platform/mac/fast/css/variables/shorthand-test-expected.checksum: Removed.
     312        * platform/mac/fast/css/variables/shorthand-test-expected.png: Removed.
     313        * platform/mac/fast/css/variables/shorthand-test-expected.txt: Removed.
     314        * platform/mac/fast/css/variables/variable-iteration-test-expected.checksum: Removed.
     315        * platform/mac/fast/css/variables/variable-iteration-test-expected.png: Removed.
     316        * platform/mac/fast/css/variables/variable-iteration-test-expected.txt: Removed.
     317        * platform/qt/Skipped:
     318
    13192010-11-16  Mihai Parparita  <mihaip@chromium.org>
    2320
  • trunk/LayoutTests/fast/dom/Window/window-properties-expected.txt

    r71373 r72116  
    209209window.CSSCharsetRule.prototype.STYLE_RULE [number]
    210210window.CSSCharsetRule.prototype.UNKNOWN_RULE [number]
    211 window.CSSCharsetRule.prototype.VARIABLES_RULE [number]
    212211window.CSSCharsetRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    213212window.CSSCharsetRule.prototype.WEBKIT_KEYFRAME_RULE [number]
     
    221220window.CSSFontFaceRule.prototype.STYLE_RULE [number]
    222221window.CSSFontFaceRule.prototype.UNKNOWN_RULE [number]
    223 window.CSSFontFaceRule.prototype.VARIABLES_RULE [number]
    224222window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    225223window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAME_RULE [number]
     
    233231window.CSSImportRule.prototype.STYLE_RULE [number]
    234232window.CSSImportRule.prototype.UNKNOWN_RULE [number]
    235 window.CSSImportRule.prototype.VARIABLES_RULE [number]
    236233window.CSSImportRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    237234window.CSSImportRule.prototype.WEBKIT_KEYFRAME_RULE [number]
     
    245242window.CSSMediaRule.prototype.STYLE_RULE [number]
    246243window.CSSMediaRule.prototype.UNKNOWN_RULE [number]
    247 window.CSSMediaRule.prototype.VARIABLES_RULE [number]
    248244window.CSSMediaRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    249245window.CSSMediaRule.prototype.WEBKIT_KEYFRAME_RULE [number]
     
    259255window.CSSPageRule.prototype.STYLE_RULE [number]
    260256window.CSSPageRule.prototype.UNKNOWN_RULE [number]
    261 window.CSSPageRule.prototype.VARIABLES_RULE [number]
    262257window.CSSPageRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    263258window.CSSPageRule.prototype.WEBKIT_KEYFRAME_RULE [number]
     
    335330window.CSSRule.STYLE_RULE [number]
    336331window.CSSRule.UNKNOWN_RULE [number]
    337 window.CSSRule.VARIABLES_RULE [number]
    338332window.CSSRule.WEBKIT_KEYFRAMES_RULE [number]
    339333window.CSSRule.WEBKIT_KEYFRAME_RULE [number]
     
    346340window.CSSRule.prototype.STYLE_RULE [number]
    347341window.CSSRule.prototype.UNKNOWN_RULE [number]
    348 window.CSSRule.prototype.VARIABLES_RULE [number]
    349342window.CSSRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    350343window.CSSRule.prototype.WEBKIT_KEYFRAME_RULE [number]
     
    382375window.CSSValueList [object CSSValueListConstructor]
    383376window.CSSValueList.prototype [printed above as window.CSSValue.prototype]
    384 window.CSSVariablesDeclaration [object CSSVariablesDeclarationConstructor]
    385 window.CSSVariablesDeclaration.prototype [object CSSVariablesDeclarationPrototype]
    386 window.CSSVariablesDeclaration.prototype.getVariableValue [function]
    387 window.CSSVariablesDeclaration.prototype.item [function]
    388 window.CSSVariablesDeclaration.prototype.removeVariable [function]
    389 window.CSSVariablesDeclaration.prototype.setVariable [function]
    390 window.CSSVariablesRule [object CSSVariablesRuleConstructor]
    391 window.CSSVariablesRule.prototype [printed above as window.CSSRule.prototype]
    392377window.CanvasGradient [object CanvasGradientConstructor]
    393378window.CanvasGradient.prototype [object CanvasGradientPrototype]
  • trunk/LayoutTests/fast/dom/Window/window-property-descriptors-expected.txt

    r71373 r72116  
    2525PASS typeof Object.getOwnPropertyDescriptor(window, 'CSSValue') is 'object'
    2626PASS typeof Object.getOwnPropertyDescriptor(window, 'CSSValueList') is 'object'
    27 PASS typeof Object.getOwnPropertyDescriptor(window, 'CSSVariablesDeclaration') is 'object'
    28 PASS typeof Object.getOwnPropertyDescriptor(window, 'CSSVariablesRule') is 'object'
    2927PASS typeof Object.getOwnPropertyDescriptor(window, 'CanvasGradient') is 'object'
    3028PASS typeof Object.getOwnPropertyDescriptor(window, 'CanvasPattern') is 'object'
  • trunk/LayoutTests/fast/dom/prototype-inheritance-2-expected.txt

    r71373 r72116  
    221221Never found CDATASection
    222222Never found CSSRule
    223 Never found CSSVariablesDeclaration
    224 Never found CSSVariablesRule
    225223Never found CanvasGradient
    226224Never found CharacterData
  • trunk/LayoutTests/fast/dom/prototype-inheritance-expected.txt

    r71373 r72116  
    4646PASS inner.CSSValueList.isInner is true
    4747PASS inner.CSSValueList.constructor.isInner is true
    48 PASS inner.CSSVariablesDeclaration.isInner is true
    49 PASS inner.CSSVariablesDeclaration.constructor.isInner is true
    50 PASS inner.CSSVariablesRule.isInner is true
    51 PASS inner.CSSVariablesRule.constructor.isInner is true
    5248PASS inner.CanvasGradient.isInner is true
    5349PASS inner.CanvasGradient.constructor.isInner is true
  • trunk/LayoutTests/fast/js/global-constructors-expected.txt

    r71373 r72116  
    2323PASS CSSValue.toString() is '[object CSSValueConstructor]'
    2424PASS CSSValueList.toString() is '[object CSSValueListConstructor]'
    25 PASS CSSVariablesDeclaration.toString() is '[object CSSVariablesDeclarationConstructor]'
    26 PASS CSSVariablesRule.toString() is '[object CSSVariablesRuleConstructor]'
    2725PASS CanvasGradient.toString() is '[object CanvasGradientConstructor]'
    2826PASS CanvasPattern.toString() is '[object CanvasPatternConstructor]'
  • trunk/LayoutTests/platform/gtk/Skipped

    r72068 r72116  
    16951695fast/css/namespaces/namespaces-escapes.xml
    16961696fast/css/namespaces/namespaces-invalid-at.xml
    1697 fast/css/variables/block-cycle-test.html
    1698 fast/css/variables/colors-test.html
    1699 fast/css/variables/declaration-block-test.html
    1700 fast/css/variables/font-test.html
    1701 fast/css/variables/image-test.html
    1702 fast/css/variables/import-test.html
    1703 fast/css/variables/inline-style-test.html
    1704 fast/css/variables/invalid-variable-test.html
    1705 fast/css/variables/margin-test.html
    1706 fast/css/variables/misplaced-import-test.html
    1707 fast/css/variables/misplaced-variables-test.html
    1708 fast/css/variables/multiple-blocks-test.html
    1709 fast/css/variables/multiple-term-test.html
    1710 fast/css/variables/override-test.html
    1711 fast/css/variables/print-test.html
    1712 fast/css/variables/remove-variable-test.html
    1713 fast/css/variables/set-variable-test.html
    1714 fast/css/variables/shorthand-test.html
    1715 fast/css/variables/variable-iteration-test.html
    17161697fast/doctypes/001.html
    17171698fast/doctypes/002.html
  • trunk/LayoutTests/platform/qt/Skipped

    r72098 r72116  
    30113011fast/css/universal-hover-quirk.html
    30123012fast/css/value-list-out-of-bounds-crash.html
    3013 fast/css/variables/block-cycle-test.html
    3014 fast/css/variables/colors-test.html
    3015 fast/css/variables/declaration-block-test.html
    3016 fast/css/variables/font-test.html
    3017 fast/css/variables/image-test.html
    3018 fast/css/variables/import-test.html
    3019 fast/css/variables/inline-style-test.html
    3020 fast/css/variables/invalid-variable-test.html
    3021 fast/css/variables/margin-test.html
    3022 fast/css/variables/misplaced-import-test.html
    3023 fast/css/variables/misplaced-variables-test.html
    3024 fast/css/variables/multiple-blocks-test.html
    3025 fast/css/variables/multiple-term-test.html
    3026 fast/css/variables/override-test.html
    3027 fast/css/variables/print-test.html
    3028 fast/css/variables/remove-variable-test.html
    3029 fast/css/variables/set-variable-test.html
    3030 fast/css/variables/shorthand-test.html
    3031 fast/css/variables/variable-iteration-test.html
    30323013fast/css/vertical-align-lengths.html
    30333014fast/css/visibility-hit-test.html
  • trunk/WebCore/Android.derived.jscbindings.mk

    r71373 r72116  
    6969    $(intermediates)/css/JSCSSValue.h \
    7070    $(intermediates)/css/JSCSSValueList.h \
    71     $(intermediates)/css/JSCSSVariablesDeclaration.h \
    72     $(intermediates)/css/JSCSSVariablesRule.h \
    7371    $(intermediates)/css/JSCounter.h \
    7472    $(intermediates)/css/JSMediaList.h \
  • trunk/WebCore/Android.derived.v8bindings.mk

    r71512 r72116  
    5050    $(intermediates)/bindings/V8CSSValue.h \
    5151    $(intermediates)/bindings/V8CSSValueList.h \
    52     $(intermediates)/bindings/V8CSSVariablesDeclaration.h \
    53     $(intermediates)/bindings/V8CSSVariablesRule.h \
    5452    $(intermediates)/bindings/V8Counter.h \
    5553    $(intermediates)/bindings/V8MediaList.h \
  • trunk/WebCore/Android.mk

    r71951 r72116  
    6666        css/CSSUnicodeRangeValue.cpp \
    6767        css/CSSValueList.cpp \
    68         css/CSSVariableDependentValue.cpp \
    69         css/CSSVariablesDeclaration.cpp \
    70         css/CSSVariablesRule.cpp \
    7168        css/FontFamilyValue.cpp \
    7269        css/FontValue.cpp \
  • trunk/WebCore/CMakeLists.txt

    r71982 r72116  
    129129    css/CSSValue.idl
    130130    css/CSSValueList.idl
    131     css/CSSVariablesDeclaration.idl
    132     css/CSSVariablesRule.idl
    133131    css/MediaList.idl
    134132    css/Rect.idl
     
    759757    css/CSSUnicodeRangeValue.cpp
    760758    css/CSSValueList.cpp
    761     css/CSSVariableDependentValue.cpp
    762     css/CSSVariablesDeclaration.cpp
    763     css/CSSVariablesRule.cpp
    764759    css/FontFamilyValue.cpp
    765760    css/FontValue.cpp
  • trunk/WebCore/ChangeLog

    r72115 r72116  
     12010-11-16  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Reviewed by Dave Hyatt.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=49483
     6        Remove CSS Variable support
     7
     8        * Android.derived.jscbindings.mk:
     9        * Android.derived.v8bindings.mk:
     10        * Android.mk:
     11        * CMakeLists.txt:
     12        * DerivedSources.make:
     13        * GNUmakefile.am:
     14        * WebCore.gypi:
     15        * WebCore.pri:
     16        * WebCore.pro:
     17        * WebCore.vcproj/WebCore.vcproj:
     18        * WebCore.xcodeproj/project.pbxproj:
     19        * bindings/js/JSCSSRuleCustom.cpp:
     20        (WebCore::toJS):
     21        * bindings/v8/custom/V8DOMWindowCustom.cpp
     22        * bindings/objc/DOMCSS.mm:
     23        (kitClass):
     24        * bindings/scripts/CodeGeneratorJS.pm:
     25        * css/CSSComputedStyleDeclaration.cpp:
     26        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
     27        * css/CSSGrammar.y:
     28        * css/CSSMutableStyleDeclaration.cpp:
     29        (WebCore::CSSMutableStyleDeclaration::CSSMutableStyleDeclaration):
     30        (WebCore::CSSMutableStyleDeclaration::removeProperty):
     31        (WebCore::CSSMutableStyleDeclaration::addParsedProperties):
     32        (WebCore::CSSMutableStyleDeclaration::copy):
     33        * css/CSSMutableStyleDeclaration.h:
     34        (WebCore::CSSMutableStyleDeclaration::create):
     35        * css/CSSParser.cpp:
     36        (WebCore::CSSParser::CSSParser):
     37        (WebCore::CSSParser::~CSSParser):
     38        (WebCore::CSSParser::parseValue):
     39        (WebCore::CSSParser::lex):
     40        (WebCore::CSSParser::recheckAtKeyword):
     41        (WebCore::CSSParser::text):
     42        (WebCore::CSSParser::createMediaRule):
     43        (WebCore::CSSParser::createKeyframesRule):
     44        (WebCore::CSSParser::createStyleRule):
     45        (WebCore::CSSParser::createFontFaceRule):
     46        (WebCore::CSSParser::addNamespace):
     47        (WebCore::CSSParser::createPageRule):
     48        * css/CSSParser.h:
     49        * css/CSSParserValues.cpp:
     50        (WebCore::CSSParserValueList::addValue):
     51        (WebCore::CSSParserValueList::deleteValueAt):
     52        (WebCore::CSSParserValue::createCSSValue):
     53        * css/CSSParserValues.h:
     54        (WebCore::CSSParserValueList::CSSParserValueList):
     55        * css/CSSPrimitiveValue.cpp:
     56        (WebCore::CSSPrimitiveValue::cleanup):
     57        (WebCore::CSSPrimitiveValue::getStringValue):
     58        (WebCore::CSSPrimitiveValue::cssText):
     59        (WebCore::CSSPrimitiveValue::parserValue):
     60        * css/CSSPrimitiveValue.h:
     61        * css/CSSProperty.cpp:
     62        (WebCore::CSSProperty::cssText):
     63        * css/CSSPropertyNames.in:
     64        * css/CSSRule.h:
     65        * css/CSSRule.idl:
     66        * css/CSSStyleDeclaration.cpp:
     67        (WebCore::CSSStyleDeclaration::copyPropertiesInSet):
     68        * css/CSSStyleSelector.cpp:
     69        (WebCore::CSSStyleSelector::addMatchedDeclaration):
     70        (WebCore::CSSRuleSet::addRulesFromSheet):
     71        (WebCore::CSSStyleSelector::applyProperty):
     72        * css/CSSStyleSelector.h:
     73        * css/CSSValue.h:
     74        * css/CSSVariableDependentValue.cpp: Removed.
     75        * css/CSSVariableDependentValue.h: Removed.
     76        * css/CSSVariablesDeclaration.cpp: Removed.
     77        * css/CSSVariablesDeclaration.h: Removed.
     78        * css/CSSVariablesDeclaration.idl: Removed.
     79        * css/CSSVariablesRule.cpp: Removed.
     80        * css/CSSVariablesRule.h: Removed.
     81        * css/CSSVariablesRule.idl: Removed.
     82        * css/StyleBase.h:
     83        (WebCore::StyleBase::isMediaRule):
     84        * css/tokenizer.flex:
     85        * page/DOMWindow.idl:
     86
    1872010-11-16  Darin Adler  <darin@apple.com>
    288
     
    15331619
    15341620        https://bugs.webkit.org/show_bug.cgi?id=49473
     1621        WebKitCSSMatrix shouldn't inherit from StyleBase
    15351622
    15361623        No change in behavior, so no tests.
  • trunk/WebCore/DerivedSources.make

    r71951 r72116  
    7474    CSSValue \
    7575    CSSValueList \
    76     CSSVariablesRule \
    77     CSSVariablesDeclaration \
    7876    WebGLActiveInfo \
    7977    ArrayBufferView \
  • trunk/WebCore/GNUmakefile.am

    r72033 r72116  
    183183        DerivedSources/WebCore/JSCSSValueList.cpp \
    184184        DerivedSources/WebCore/JSCSSValueList.h \
    185         DerivedSources/WebCore/JSCSSVariablesDeclaration.cpp \
    186         DerivedSources/WebCore/JSCSSVariablesDeclaration.h \
    187         DerivedSources/WebCore/JSCSSVariablesRule.cpp \
    188         DerivedSources/WebCore/JSCSSVariablesRule.h \
    189185        DerivedSources/WebCore/JSCustomEvent.cpp \
    190186        DerivedSources/WebCore/JSCustomEvent.h \
     
    988984        WebCore/css/CSSValueList.cpp \
    989985        WebCore/css/CSSValueList.h \
    990         WebCore/css/CSSVariableDependentValue.cpp \
    991         WebCore/css/CSSVariableDependentValue.h \
    992         WebCore/css/CSSVariablesDeclaration.cpp \
    993         WebCore/css/CSSVariablesDeclaration.h \
    994         WebCore/css/CSSVariablesRule.cpp \
    995         WebCore/css/CSSVariablesRule.h \
    996986        WebCore/css/DashboardRegion.h \
    997987        WebCore/css/FontFamilyValue.cpp \
  • trunk/WebCore/WebCore.gypi

    r72090 r72116  
    1616            'css/CSSValue.idl',
    1717            'css/CSSValueList.idl',
    18             'css/CSSVariablesDeclaration.idl',
    19             'css/CSSVariablesRule.idl',
    2018            'css/Counter.idl',
    2119            'css/MediaList.idl',
     
    10531051            'css/CSSValueList.cpp',
    10541052            'css/CSSValueList.h',
    1055             'css/CSSVariableDependentValue.cpp',
    1056             'css/CSSVariableDependentValue.h',
    1057             'css/CSSVariablesDeclaration.cpp',
    1058             'css/CSSVariablesDeclaration.h',
    1059             'css/CSSVariablesRule.cpp',
    1060             'css/CSSVariablesRule.h',
    10611053            'css/Counter.h',
    10621054            'css/DashboardRegion.h',
  • trunk/WebCore/WebCore.pri

    r71951 r72116  
    8484    css/CSSValue.idl \
    8585    css/CSSValueList.idl \
    86     css/CSSVariablesDeclaration.idl \
    87     css/CSSVariablesRule.idl \
    8886    css/MediaList.idl \
    8987    css/Rect.idl \
  • trunk/WebCore/WebCore.pro

    r72034 r72116  
    645645    css/CSSUnicodeRangeValue.cpp \
    646646    css/CSSValueList.cpp \
    647     css/CSSVariableDependentValue.cpp \
    648     css/CSSVariablesDeclaration.cpp \
    649     css/CSSVariablesRule.cpp \
    650647    css/FontFamilyValue.cpp \
    651648    css/FontValue.cpp \
     
    15641561    css/CSSUnicodeRangeValue.h \
    15651562    css/CSSValueList.h \
    1566     css/CSSVariableDependentValue.h \
    1567     css/CSSVariablesDeclaration.h \
    1568     css/CSSVariablesRule.h \
    15691563    css/FontFamilyValue.h \
    15701564    css/FontValue.h \
  • trunk/WebCore/WebCore.vcproj/WebCore.vcproj

    r72090 r72116  
    24812481                        </File>
    24822482                        <File
    2483                                 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSCSSVariablesDeclaration.cpp"
    2484                                 >
    2485                                 <FileConfiguration
    2486                                         Name="Debug|Win32"
    2487                                         ExcludedFromBuild="true"
    2488                                         >
    2489                                         <Tool
    2490                                                 Name="VCCLCompilerTool"
    2491                                         />
    2492                                 </FileConfiguration>
    2493                                 <FileConfiguration
    2494                                         Name="Release|Win32"
    2495                                         ExcludedFromBuild="true"
    2496                                         >
    2497                                         <Tool
    2498                                                 Name="VCCLCompilerTool"
    2499                                         />
    2500                                 </FileConfiguration>
    2501                                 <FileConfiguration
    2502                                         Name="Debug_Internal|Win32"
    2503                                         ExcludedFromBuild="true"
    2504                                         >
    2505                                         <Tool
    2506                                                 Name="VCCLCompilerTool"
    2507                                         />
    2508                                 </FileConfiguration>
    2509                                 <FileConfiguration
    2510                                         Name="Debug_Cairo|Win32"
    2511                                         ExcludedFromBuild="true"
    2512                                         >
    2513                                         <Tool
    2514                                                 Name="VCCLCompilerTool"
    2515                                         />
    2516                                 </FileConfiguration>
    2517                                 <FileConfiguration
    2518                                         Name="Release_Cairo|Win32"
    2519                                         ExcludedFromBuild="true"
    2520                                         >
    2521                                         <Tool
    2522                                                 Name="VCCLCompilerTool"
    2523                                         />
    2524                                 </FileConfiguration>
    2525                                 <FileConfiguration
    2526                                         Name="Debug_All|Win32"
    2527                                         ExcludedFromBuild="true"
    2528                                         >
    2529                                         <Tool
    2530                                                 Name="VCCLCompilerTool"
    2531                                         />
    2532                                 </FileConfiguration>
    2533                         </File>
    2534                         <File
    2535                                 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSCSSVariablesDeclaration.h"
    2536                                 >
    2537                         </File>
    2538                         <File
    2539                                 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSCSSVariablesRule.cpp"
    2540                                 >
    2541                                 <FileConfiguration
    2542                                         Name="Debug|Win32"
    2543                                         ExcludedFromBuild="true"
    2544                                         >
    2545                                         <Tool
    2546                                                 Name="VCCLCompilerTool"
    2547                                         />
    2548                                 </FileConfiguration>
    2549                                 <FileConfiguration
    2550                                         Name="Release|Win32"
    2551                                         ExcludedFromBuild="true"
    2552                                         >
    2553                                         <Tool
    2554                                                 Name="VCCLCompilerTool"
    2555                                         />
    2556                                 </FileConfiguration>
    2557                                 <FileConfiguration
    2558                                         Name="Debug_Internal|Win32"
    2559                                         ExcludedFromBuild="true"
    2560                                         >
    2561                                         <Tool
    2562                                                 Name="VCCLCompilerTool"
    2563                                         />
    2564                                 </FileConfiguration>
    2565                                 <FileConfiguration
    2566                                         Name="Debug_Cairo|Win32"
    2567                                         ExcludedFromBuild="true"
    2568                                         >
    2569                                         <Tool
    2570                                                 Name="VCCLCompilerTool"
    2571                                         />
    2572                                 </FileConfiguration>
    2573                                 <FileConfiguration
    2574                                         Name="Release_Cairo|Win32"
    2575                                         ExcludedFromBuild="true"
    2576                                         >
    2577                                         <Tool
    2578                                                 Name="VCCLCompilerTool"
    2579                                         />
    2580                                 </FileConfiguration>
    2581                                 <FileConfiguration
    2582                                         Name="Debug_All|Win32"
    2583                                         ExcludedFromBuild="true"
    2584                                         >
    2585                                         <Tool
    2586                                                 Name="VCCLCompilerTool"
    2587                                         />
    2588                                 </FileConfiguration>
    2589                         </File>
    2590                         <File
    2591                                 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSCSSVariablesRule.h"
    2592                                 >
    2593                         </File>
    2594                         <File
    25952483                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSCustomEvent.cpp"
    25962484                                >
     
    3059730485                        </File>
    3059830486                        <File
    30599                                 RelativePath="..\css\CSSVariableDependentValue.cpp"
    30600                                 >
    30601                         </File>
    30602                         <File
    30603                                 RelativePath="..\css\CSSVariableDependentValue.h"
    30604                                 >
    30605                         </File>
    30606                         <File
    30607                                 RelativePath="..\css\CSSVariablesDeclaration.cpp"
    30608                                 >
    30609                         </File>
    30610                         <File
    30611                                 RelativePath="..\css\CSSVariablesDeclaration.h"
    30612                                 >
    30613                         </File>
    30614                         <File
    30615                                 RelativePath="..\css\CSSVariablesRule.cpp"
    30616                                 >
    30617                         </File>
    30618                         <File
    30619                                 RelativePath="..\css\CSSVariablesRule.h"
    30620                                 >
    30621                         </File>
    30622                         <File
    3062330487                                RelativePath="..\css\DashboardRegion.h"
    3062430488                                >
  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r71951 r72116  
    49164916                BC64B4DB0CB4298A005F2B62 /* CSSFontSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC64B4D30CB4298A005F2B62 /* CSSFontSelector.cpp */; };
    49174917                BC64B4DC0CB4298A005F2B62 /* CSSFontSelector.h in Headers */ = {isa = PBXBuildFile; fileRef = BC64B4D40CB4298A005F2B62 /* CSSFontSelector.h */; };
    4918                 BC686C7C0E0C330100DE8A08 /* JSCSSVariablesDeclaration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC686C780E0C330100DE8A08 /* JSCSSVariablesDeclaration.cpp */; };
    4919                 BC686C7D0E0C330100DE8A08 /* JSCSSVariablesDeclaration.h in Headers */ = {isa = PBXBuildFile; fileRef = BC686C790E0C330100DE8A08 /* JSCSSVariablesDeclaration.h */; };
    4920                 BC686C7E0E0C330100DE8A08 /* JSCSSVariablesRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC686C7A0E0C330100DE8A08 /* JSCSSVariablesRule.cpp */; };
    4921                 BC686C7F0E0C330100DE8A08 /* JSCSSVariablesRule.h in Headers */ = {isa = PBXBuildFile; fileRef = BC686C7B0E0C330100DE8A08 /* JSCSSVariablesRule.h */; };
    4922                 BC686CB20E0C343900DE8A08 /* DOMCSSVariablesDeclaration.h in Headers */ = {isa = PBXBuildFile; fileRef = BC686CAC0E0C343900DE8A08 /* DOMCSSVariablesDeclaration.h */; };
    4923                 BC686CB30E0C343900DE8A08 /* DOMCSSVariablesDeclaration.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC686CAD0E0C343900DE8A08 /* DOMCSSVariablesDeclaration.mm */; };
    4924                 BC686CB50E0C343900DE8A08 /* DOMCSSVariablesRule.h in Headers */ = {isa = PBXBuildFile; fileRef = BC686CAF0E0C343900DE8A08 /* DOMCSSVariablesRule.h */; };
    4925                 BC686CB60E0C343900DE8A08 /* DOMCSSVariablesRule.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC686CB00E0C343900DE8A08 /* DOMCSSVariablesRule.mm */; };
    4926                 BC686CBB0E0C349D00DE8A08 /* DOMCSSVariablesDeclarationInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BC686CB90E0C349D00DE8A08 /* DOMCSSVariablesDeclarationInternal.h */; };
    4927                 BC686CBC0E0C349D00DE8A08 /* DOMCSSVariablesRuleInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BC686CBA0E0C349D00DE8A08 /* DOMCSSVariablesRuleInternal.h */; };
    49284918                BC6932730D7E293900AE44D1 /* JSDOMWindowBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC6932710D7E293900AE44D1 /* JSDOMWindowBase.cpp */; };
    49294919                BC6932740D7E293900AE44D1 /* JSDOMWindowBase.h in Headers */ = {isa = PBXBuildFile; fileRef = BC6932720D7E293900AE44D1 /* JSDOMWindowBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    50935083                BCCBAD400C18C14200CE890F /* JSHTMLCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCCBAD3E0C18C14200CE890F /* JSHTMLCollection.cpp */; };
    50945084                BCCBAD410C18C14200CE890F /* JSHTMLCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = BCCBAD3F0C18C14200CE890F /* JSHTMLCollection.h */; };
    5095                 BCCBE68A0E06E60D00EAFA8E /* CSSVariablesDeclaration.h in Headers */ = {isa = PBXBuildFile; fileRef = BCCBE6870E06E60D00EAFA8E /* CSSVariablesDeclaration.h */; };
    5096                 BCCBE68B0E06E60D00EAFA8E /* CSSVariablesRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCCBE6880E06E60D00EAFA8E /* CSSVariablesRule.cpp */; };
    5097                 BCCBE68C0E06E60D00EAFA8E /* CSSVariablesRule.h in Headers */ = {isa = PBXBuildFile; fileRef = BCCBE6890E06E60D00EAFA8E /* CSSVariablesRule.h */; };
    5098                 BCCBE69B0E06F51000EAFA8E /* CSSVariablesDeclaration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCCBE69A0E06F51000EAFA8E /* CSSVariablesDeclaration.cpp */; };
    5099                 BCCBE7B20E07159A00EAFA8E /* CSSVariableDependentValue.h in Headers */ = {isa = PBXBuildFile; fileRef = BCCBE7B10E07159A00EAFA8E /* CSSVariableDependentValue.h */; };
    5100                 BCCBE7B50E07166900EAFA8E /* CSSVariableDependentValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCCBE7B40E07166900EAFA8E /* CSSVariableDependentValue.cpp */; };
    51015085                BCCD74DC0A4C8D35005FDA6D /* HTMLViewSourceDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = BCCD74DB0A4C8D35005FDA6D /* HTMLViewSourceDocument.h */; };
    51025086                BCCD74E50A4C8DDF005FDA6D /* HTMLViewSourceDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCCD74E40A4C8DDF005FDA6D /* HTMLViewSourceDocument.cpp */; };
     
    1095410938                BC64B4D30CB4298A005F2B62 /* CSSFontSelector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSFontSelector.cpp; sourceTree = "<group>"; };
    1095510939                BC64B4D40CB4298A005F2B62 /* CSSFontSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSFontSelector.h; sourceTree = "<group>"; };
    10956                 BC686C780E0C330100DE8A08 /* JSCSSVariablesDeclaration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSVariablesDeclaration.cpp; sourceTree = "<group>"; };
    10957                 BC686C790E0C330100DE8A08 /* JSCSSVariablesDeclaration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCSSVariablesDeclaration.h; sourceTree = "<group>"; };
    10958                 BC686C7A0E0C330100DE8A08 /* JSCSSVariablesRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSVariablesRule.cpp; sourceTree = "<group>"; };
    10959                 BC686C7B0E0C330100DE8A08 /* JSCSSVariablesRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCSSVariablesRule.h; sourceTree = "<group>"; };
    10960                 BC686CAC0E0C343900DE8A08 /* DOMCSSVariablesDeclaration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMCSSVariablesDeclaration.h; sourceTree = "<group>"; };
    10961                 BC686CAD0E0C343900DE8A08 /* DOMCSSVariablesDeclaration.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMCSSVariablesDeclaration.mm; sourceTree = "<group>"; };
    10962                 BC686CAF0E0C343900DE8A08 /* DOMCSSVariablesRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMCSSVariablesRule.h; sourceTree = "<group>"; };
    10963                 BC686CB00E0C343900DE8A08 /* DOMCSSVariablesRule.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMCSSVariablesRule.mm; sourceTree = "<group>"; };
    10964                 BC686CB90E0C349D00DE8A08 /* DOMCSSVariablesDeclarationInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMCSSVariablesDeclarationInternal.h; sourceTree = "<group>"; };
    10965                 BC686CBA0E0C349D00DE8A08 /* DOMCSSVariablesRuleInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMCSSVariablesRuleInternal.h; sourceTree = "<group>"; };
    1096610940                BC6932710D7E293900AE44D1 /* JSDOMWindowBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMWindowBase.cpp; sourceTree = "<group>"; };
    1096710941                BC6932720D7E293900AE44D1 /* JSDOMWindowBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMWindowBase.h; sourceTree = "<group>"; };
     
    1114511119                BCCBAD3E0C18C14200CE890F /* JSHTMLCollection.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLCollection.cpp; sourceTree = "<group>"; };
    1114611120                BCCBAD3F0C18C14200CE890F /* JSHTMLCollection.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSHTMLCollection.h; sourceTree = "<group>"; };
    11147                 BCCBE6870E06E60D00EAFA8E /* CSSVariablesDeclaration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSVariablesDeclaration.h; sourceTree = "<group>"; };
    11148                 BCCBE6880E06E60D00EAFA8E /* CSSVariablesRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSVariablesRule.cpp; sourceTree = "<group>"; };
    11149                 BCCBE6890E06E60D00EAFA8E /* CSSVariablesRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSVariablesRule.h; sourceTree = "<group>"; };
    11150                 BCCBE69A0E06F51000EAFA8E /* CSSVariablesDeclaration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSVariablesDeclaration.cpp; sourceTree = "<group>"; };
    11151                 BCCBE7B10E07159A00EAFA8E /* CSSVariableDependentValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSVariableDependentValue.h; sourceTree = "<group>"; };
    11152                 BCCBE7B40E07166900EAFA8E /* CSSVariableDependentValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSVariableDependentValue.cpp; sourceTree = "<group>"; };
    1115311121                BCCD74DB0A4C8D35005FDA6D /* HTMLViewSourceDocument.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HTMLViewSourceDocument.h; sourceTree = "<group>"; };
    1115411122                BCCD74E40A4C8DDF005FDA6D /* HTMLViewSourceDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLViewSourceDocument.cpp; sourceTree = "<group>"; };
     
    1352913497                                858C383A0AA8ED8200B187A4 /* DOMCSSValueList.h */,
    1353013498                                858C383B0AA8ED8200B187A4 /* DOMCSSValueList.mm */,
    13531                                 BC686CAC0E0C343900DE8A08 /* DOMCSSVariablesDeclaration.h */,
    13532                                 BC686CAD0E0C343900DE8A08 /* DOMCSSVariablesDeclaration.mm */,
    13533                                 BC686CAF0E0C343900DE8A08 /* DOMCSSVariablesRule.h */,
    13534                                 BC686CB00E0C343900DE8A08 /* DOMCSSVariablesRule.mm */,
    1353513499                                858C38A30AA8F20400B187A4 /* DOMRect.h */,
    1353613500                                858C38A40AA8F20400B187A4 /* DOMRect.mm */,
     
    1423914203                                85B498F20ADB336A00925CBB /* DOMCSSValueInternal.h */,
    1424014204                                85909D280ACC7D5500DF01F1 /* DOMCSSValueListInternal.h */,
    14241                                 BC686CB90E0C349D00DE8A08 /* DOMCSSVariablesDeclarationInternal.h */,
    14242                                 BC686CBA0E0C349D00DE8A08 /* DOMCSSVariablesRuleInternal.h */,
    1424314205                                85E711450AC5D5340053270F /* DOMDocumentFragmentInternal.h */,
    1424414206                                85E711460AC5D5340053270F /* DOMDocumentInternal.h */,
     
    1583215794                                A8D05FA90A23B30F005E7203 /* JSCSSValueList.cpp */,
    1583315795                                A8D05FAA0A23B30F005E7203 /* JSCSSValueList.h */,
    15834                                 BC686C780E0C330100DE8A08 /* JSCSSVariablesDeclaration.cpp */,
    15835                                 BC686C790E0C330100DE8A08 /* JSCSSVariablesDeclaration.h */,
    15836                                 BC686C7A0E0C330100DE8A08 /* JSCSSVariablesRule.cpp */,
    15837                                 BC686C7B0E0C330100DE8A08 /* JSCSSVariablesRule.h */,
    1583815796                                BC3C39B40C0D3D8D005F4D7A /* JSMediaList.cpp */,
    1583915797                                BC3C39B50C0D3D8D005F4D7A /* JSMediaList.h */,
     
    1781617774                                A80E6CBF0A1989CA007FB8C5 /* CSSValueList.h */,
    1781717775                                A8D0651C0A23C1FE005E7203 /* CSSValueList.idl */,
    17818                                 BCCBE7B40E07166900EAFA8E /* CSSVariableDependentValue.cpp */,
    17819                                 BCCBE7B10E07159A00EAFA8E /* CSSVariableDependentValue.h */,
    17820                                 BCCBE69A0E06F51000EAFA8E /* CSSVariablesDeclaration.cpp */,
    17821                                 BCCBE6870E06E60D00EAFA8E /* CSSVariablesDeclaration.h */,
    17822                                 BCCBE6880E06E60D00EAFA8E /* CSSVariablesRule.cpp */,
    17823                                 BCCBE6890E06E60D00EAFA8E /* CSSVariablesRule.h */,
    1782417776                                A80E6CE10A1989CA007FB8C5 /* DashboardRegion.h */,
    1782517777                                FE49EF970DC51462004266E1 /* DashboardSupportCSSPropertyNames.in */,
     
    1874718699                                6565815109D13043000E61D7 /* CSSValueKeywords.h in Headers */,
    1874818700                                A80E6CE90A1989CA007FB8C5 /* CSSValueList.h in Headers */,
    18749                                 BCCBE7B20E07159A00EAFA8E /* CSSVariableDependentValue.h in Headers */,
    18750                                 BCCBE68A0E06E60D00EAFA8E /* CSSVariablesDeclaration.h in Headers */,
    18751                                 BCCBE68C0E06E60D00EAFA8E /* CSSVariablesRule.h in Headers */,
    1875218701                                93F1992F08245E59001E9ABC /* Cursor.h in Headers */,
    1875318702                                BC2272A20E82E87C00E7F975 /* CursorData.h in Headers */,
     
    1886318812                                858C383C0AA8ED8200B187A4 /* DOMCSSValueList.h in Headers */,
    1886418813                                85909D2B0ACC7D5500DF01F1 /* DOMCSSValueListInternal.h in Headers */,
    18865                                 BC686CB20E0C343900DE8A08 /* DOMCSSVariablesDeclaration.h in Headers */,
    18866                                 BC686CBB0E0C349D00DE8A08 /* DOMCSSVariablesDeclarationInternal.h in Headers */,
    18867                                 BC686CB50E0C343900DE8A08 /* DOMCSSVariablesRule.h in Headers */,
    18868                                 BC686CBC0E0C349D00DE8A08 /* DOMCSSVariablesRuleInternal.h in Headers */,
    1886918814                                E10B9CCC0B747A44003ED890 /* DOMCustomXPathNSResolver.h in Headers */,
    1887018815                                BC7DAAEF0FF9615D00CE0138 /* DOMDataGridDataSource.h in Headers */,
     
    2000719952                                14CF78A609F58CD800EB3665 /* JSCSSValue.h in Headers */,
    2000819953                                A8D05FAC0A23B30F005E7203 /* JSCSSValueList.h in Headers */,
    20009                                 BC686C7D0E0C330100DE8A08 /* JSCSSVariablesDeclaration.h in Headers */,
    20010                                 BC686C7F0E0C330100DE8A08 /* JSCSSVariablesRule.h in Headers */,
    2001119954                                E4778B80115A581A00B5D372 /* JSCustomEvent.h in Headers */,
    2001219955                                FE80D7A80E9C1ED2000D6F75 /* JSCustomPositionCallback.h in Headers */,
     
    2188621829                                1ABA76CB11D20E57004C201C /* CSSValueKeywords.cpp in Sources */,
    2188721830                                A80E6CE40A1989CA007FB8C5 /* CSSValueList.cpp in Sources */,
    21888                                 BCCBE7B50E07166900EAFA8E /* CSSVariableDependentValue.cpp in Sources */,
    21889                                 BCCBE69B0E06F51000EAFA8E /* CSSVariablesDeclaration.cpp in Sources */,
    21890                                 BCCBE68B0E06E60D00EAFA8E /* CSSVariablesRule.cpp in Sources */,
    2189121831                                E11AF15111B9A1A300805103 /* Cursor.cpp in Sources */,
    2189221832                                93F19A2608245E59001E9ABC /* CursorMac.mm in Sources */,
     
    2196121901                                858C381D0AA8E29600B187A4 /* DOMCSSValue.mm in Sources */,
    2196221902                                858C383D0AA8ED8200B187A4 /* DOMCSSValueList.mm in Sources */,
    21963                                 BC686CB30E0C343900DE8A08 /* DOMCSSVariablesDeclaration.mm in Sources */,
    21964                                 BC686CB60E0C343900DE8A08 /* DOMCSSVariablesRule.mm in Sources */,
    2196521903                                E10B9CCD0B747A44003ED890 /* DOMCustomXPathNSResolver.mm in Sources */,
    2196621904                                BC7DAAEE0FF9615D00CE0138 /* DOMDataGridDataSource.cpp in Sources */,
     
    2263722575                                BC20FB7F0C0E8E6C00D1447F /* JSCSSValueCustom.cpp in Sources */,
    2263822576                                A8D05FAB0A23B30F005E7203 /* JSCSSValueList.cpp in Sources */,
    22639                                 BC686C7C0E0C330100DE8A08 /* JSCSSVariablesDeclaration.cpp in Sources */,
    22640                                 BC686C7E0E0C330100DE8A08 /* JSCSSVariablesRule.cpp in Sources */,
    2264122577                                E4778B7F115A581A00B5D372 /* JSCustomEvent.cpp in Sources */,
    2264222578                                FE80D7A70E9C1ED2000D6F75 /* JSCustomPositionCallback.cpp in Sources */,
  • trunk/WebCore/bindings/js/JSCSSRuleCustom.cpp

    r51363 r72116  
    3333#include "CSSPageRule.h"
    3434#include "CSSStyleRule.h"
    35 #include "CSSVariablesRule.h"
    3635#include "JSCSSCharsetRule.h"
    3736#include "JSCSSFontFaceRule.h"
     
    4039#include "JSCSSPageRule.h"
    4140#include "JSCSSStyleRule.h"
    42 #include "JSCSSVariablesRule.h"
    4341#include "JSWebKitCSSKeyframeRule.h"
    4442#include "JSWebKitCSSKeyframesRule.h"
     
    7876            wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, CSSCharsetRule, rule);
    7977            break;
    80         case CSSRule::VARIABLES_RULE:
    81             wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, CSSVariablesRule, rule);
    82             break;
    8378        case CSSRule::WEBKIT_KEYFRAME_RULE:
    8479            wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, WebKitCSSKeyframeRule, rule);
  • trunk/WebCore/bindings/objc/DOMCSS.mm

    r47877 r72116  
    4343#import "DOMCSSValueInternal.h"
    4444#import "DOMCSSValueList.h"
    45 #import "DOMCSSVariablesRule.h"
    4645#import "DOMInternal.h"
    4746#import "DOMStyleSheetInternal.h"
     
    8483        case DOM_PAGE_RULE:
    8584            return [DOMCSSPageRule class];
    86         case DOM_VARIABLES_RULE:
    87             return [DOMCSSVariablesRule class];
    8885        case DOM_WEBKIT_KEYFRAMES_RULE:
    8986            return [DOMWebKitCSSKeyframesRule class];
  • trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm

    r71802 r72116  
    232232    my $type = shift;
    233233
    234     return 1 if $type eq "CSSStyleDeclaration" or $type eq "MediaList" or $type eq "CSSVariablesDeclaration" or $type eq "DOMStringList" or $type eq "DOMTokenList" or $type eq "DOMSettableTokenList";
     234    return 1 if $type eq "CSSStyleDeclaration" or $type eq "MediaList" or $type eq "DOMStringList" or $type eq "DOMTokenList" or $type eq "DOMSettableTokenList";
    235235    return 0;
    236236}
  • trunk/WebCore/bindings/v8/custom/V8CSSRuleCustom.cpp

    r54153 r72116  
    3838#include "V8CSSPageRule.h"
    3939#include "V8CSSStyleRule.h"
    40 #include "V8CSSVariablesRule.h"
    4140#include "V8WebKitCSSKeyframeRule.h"
    4241#include "V8WebKitCSSKeyframesRule.h"
     
    6160    case CSSRule::PAGE_RULE:
    6261        return toV8(static_cast<CSSPageRule*>(impl));
    63     case CSSRule::VARIABLES_RULE:
    64         return toV8(static_cast<CSSVariablesRule*>(impl));
    6562    case CSSRule::WEBKIT_KEYFRAME_RULE:
    6663        return toV8(static_cast<WebKitCSSKeyframeRule*>(impl));
  • trunk/WebCore/css/CSSComputedStyleDeclaration.cpp

    r71348 r72116  
    16441644        case CSSPropertyWebkitTransformOriginZ:
    16451645        case CSSPropertyWebkitTransition:
    1646         case CSSPropertyWebkitVariableDeclarationBlock:
    16471646            break;
    16481647#if ENABLE(SVG)
  • trunk/WebCore/css/CSSGrammar.y

    r69196 r72116  
    100100%}
    101101
    102 %expect 56
     102%expect 51
    103103
    104104%nonassoc LOWEST_PREC
     
    141141%token WEBKIT_MEDIAQUERY_SYM
    142142%token WEBKIT_SELECTOR_SYM
    143 %token WEBKIT_VARIABLES_SYM
    144 %token WEBKIT_DEFINE_SYM
    145 %token VARIABLES_FOR
    146 %token WEBKIT_VARIABLES_DECLS_SYM
    147143%token <marginBox> TOPLEFTCORNER_SYM
    148144%token <marginBox> TOPLEFT_SYM
     
    198194%token <string> UNICODERANGE
    199195
    200 %token <string> VARCALL
    201 
    202196%type <relation> combinator
    203197
     
    220214%type <rule> block_rule
    221215%type <rule> block_valid_rule
    222 %type <rule> variables_rule
    223 %type <mediaList> variables_media_list
    224216
    225217%type <string> maybe_ns_prefix
     
    283275%type <string> attr_name
    284276
    285 %type <string> variable_name
    286 %type <boolean> variables_declaration_list
    287 %type <boolean> variables_decl_list
    288 %type <boolean> variables_declaration
    289 %type <value> variable_reference
    290 
    291277%%
    292278
     
    298284  | webkit_mediaquery maybe_space
    299285  | webkit_selector maybe_space
    300   | webkit_variables_decls maybe_space
    301286  | webkit_keyframe_rule maybe_space
    302287  ;
     
    316301webkit_decls:
    317302    WEBKIT_DECLS_SYM '{' maybe_space_before_declaration declaration_list '}' {
    318         /* can be empty */
    319     }
    320 ;
    321 
    322 webkit_variables_decls:
    323     WEBKIT_VARIABLES_DECLS_SYM '{' maybe_space variables_declaration_list '}' {
    324303        /* can be empty */
    325304    }
     
    418397  | namespace
    419398  | import
    420   | variables_rule
    421399  ;
    422400
     
    455433  | namespace
    456434  | import
    457   | variables_rule
    458435  | media
    459436  ;
     
    474451    }
    475452  ;
    476 
    477 variables_rule:
    478     WEBKIT_VARIABLES_SYM maybe_space maybe_media_list '{' maybe_space variables_declaration_list '}' {
    479         $$ = static_cast<CSSParser*>(parser)->createVariablesRule($3, true);
    480     }
    481     |
    482     WEBKIT_DEFINE_SYM maybe_space variables_media_list '{' maybe_space variables_declaration_list '}' {
    483         $$ = static_cast<CSSParser*>(parser)->createVariablesRule($3, false);
    484     }
    485     ;
    486 
    487 variables_media_list:
    488     /* empty */ {
    489         $$ = static_cast<CSSParser*>(parser)->createMediaList();
    490     }
    491     |
    492     VARIABLES_FOR WHITESPACE media_list {
    493         $$ = $3;
    494     }
    495     ;
    496 
    497 variables_declaration_list:
    498     variables_declaration {
    499         $$ = $1;
    500     }
    501     | variables_decl_list variables_declaration {
    502         $$ = $1;
    503         if ($2)
    504             $$ = $2;
    505     }
    506     | variables_decl_list {
    507         $$ = $1;
    508     }
    509     | error invalid_block_list error {
    510         $$ = false;
    511     }
    512     | error {
    513         $$ = false;
    514     }
    515     | variables_decl_list error {
    516         $$ = $1;
    517     }
    518     ;
    519 
    520 variables_decl_list:
    521     variables_declaration ';' maybe_space {
    522         $$ = $1;
    523     }
    524     | variables_declaration invalid_block_list ';' maybe_space {
    525         $$ = false;
    526     }
    527     | error ';' maybe_space {
    528         $$ = false;
    529     }
    530     | error invalid_block_list error ';' maybe_space {
    531         $$ = false;
    532     }
    533     | variables_decl_list variables_declaration ';' maybe_space {
    534         $$ = $1;
    535         if ($2)
    536             $$ = $2;
    537     }
    538     | variables_decl_list error ';' maybe_space {
    539         $$ = $1;
    540     }
    541     | variables_decl_list error invalid_block_list error ';' maybe_space {
    542         $$ = $1;
    543     }
    544     ;
    545 
    546 variables_declaration:
    547     variable_name ':' maybe_space expr {
    548         $$ = static_cast<CSSParser*>(parser)->addVariable($1, $4);
    549     }
    550     |
    551     variable_name maybe_space '{' maybe_space declaration_list '}' maybe_space {
    552         $$ = static_cast<CSSParser*>(parser)->addVariableDeclarationBlock($1);
    553     }
    554     |
    555     variable_name error {
    556         $$ = false;
    557     }
    558     |
    559     variable_name ':' maybe_space error expr {
    560         $$ = false;
    561     }
    562     |
    563     variable_name ':' maybe_space {
    564         /* @variables { varname: } Just reduce away this variable with no value. */
    565         $$ = false;
    566     }
    567     |
    568     variable_name ':' maybe_space error {
    569         /* if we come across rules with invalid values like this case: @variables { varname: *; }, just discard the property/value pair */
    570         $$ = false;
    571     }
    572     ;
    573 
    574 variable_name:
    575     IDENT maybe_space {
    576         $$ = $1;
    577     }
    578     ;
    579453
    580454namespace:
     
    14311305        }
    14321306        p->markPropertyEnd($5, isPropertyParsed);
    1433     }
    1434     |
    1435     variable_reference maybe_space {
    1436         CSSParser* p = static_cast<CSSParser*>(parser);
    1437         p->m_valueList = new CSSParserValueList;
    1438         p->m_valueList->addValue(p->sinkFloatingValue($1));
    1439         int oldParsedProperties = p->m_numParsedProperties;
    1440         $$ = p->parseValue(CSSPropertyWebkitVariableDeclarationBlock, false);
    1441         if (!$$)
    1442             p->rollbackLastProperties(p->m_numParsedProperties - oldParsedProperties);
    1443         delete p->m_valueList;
    1444         p->m_valueList = 0;
    14451307    }
    14461308    |
     
    15621424  /* FIXME: according to the specs a function can have a unary_operator in front. I know no case where this makes sense */
    15631425  | function {
    1564       $$ = $1;
    1565   }
    1566   | variable_reference maybe_space {
    15671426      $$ = $1;
    15681427  }
     
    16031462  ;
    16041463
    1605 variable_reference:
    1606   VARCALL {
    1607       $$.id = 0;
    1608       $$.string = $1;
    1609       $$.unit = CSSPrimitiveValue::CSS_PARSER_VARIABLE_FUNCTION_SYNTAX;
    1610   }
    1611   ;
    1612 
    16131464function:
    16141465    FUNCTION maybe_space expr ')' maybe_space {
  • trunk/WebCore/css/CSSMutableStyleDeclaration.cpp

    r71530 r72116  
    4040CSSMutableStyleDeclaration::CSSMutableStyleDeclaration()
    4141    : m_node(0)
    42     , m_variableDependentValueCount(0)
    4342    , m_strictParsing(false)
    4443#ifndef NDEBUG
     
    5150    : CSSStyleDeclaration(parent)
    5251    , m_node(0)
    53     , m_variableDependentValueCount(0)
    5452    , m_strictParsing(!parent || parent->useStrictParsing())
    5553#ifndef NDEBUG
     
    5957}
    6058
    61 CSSMutableStyleDeclaration::CSSMutableStyleDeclaration(CSSRule* parent, const Vector<CSSProperty>& properties, unsigned variableDependentValueCount)
     59CSSMutableStyleDeclaration::CSSMutableStyleDeclaration(CSSRule* parent, const Vector<CSSProperty>& properties)
    6260    : CSSStyleDeclaration(parent)
    6361    , m_properties(properties)
    6462    , m_node(0)
    65     , m_variableDependentValueCount(variableDependentValueCount)
    6663    , m_strictParsing(!parent || parent->useStrictParsing())
    6764#ifndef NDEBUG
     
    7673    : CSSStyleDeclaration(parent)
    7774    , m_node(0)
    78     , m_variableDependentValueCount(0)
    7975    , m_strictParsing(!parent || parent->useStrictParsing())
    8076#ifndef NDEBUG
     
    8783        const CSSProperty *property = properties[i];
    8884        ASSERT(property);
    89         if (property->value()->isVariableDependentValue())
    90             m_variableDependentValueCount++;
    91         else if (candidates.contains(property->id()))
     85        if (candidates.contains(property->id()))
    9286            removeProperty(properties[i]->id(), false);
    9387        m_properties.append(*property);
     
    458452    String value = returnText ? foundProperty->value()->cssText() : String();
    459453
    460     if (foundProperty->value()->isVariableDependentValue())
    461         m_variableDependentValueCount--;
    462 
    463454    // A more efficient removal strategy would involve marking entries as empty
    464455    // and sweeping them when the vector grows too big.
     
    610601            ASSERT(properties[i]);
    611602            m_properties.append(*properties[i]);
    612             if (properties[i]->value()->isVariableDependentValue())
    613                 m_variableDependentValueCount++;
    614603        }
    615604    }
     
    822811PassRefPtr<CSSMutableStyleDeclaration> CSSMutableStyleDeclaration::copy() const
    823812{
    824     return adoptRef(new CSSMutableStyleDeclaration(0, m_properties, m_variableDependentValueCount));
     813    return adoptRef(new CSSMutableStyleDeclaration(0, m_properties));
    825814}
    826815
  • trunk/WebCore/css/CSSMutableStyleDeclaration.h

    r67704 r72116  
    7070        return adoptRef(new CSSMutableStyleDeclaration(parentRule, properties, numProperties));
    7171    }
    72     static PassRefPtr<CSSMutableStyleDeclaration> create(const Vector<CSSProperty>& properties, unsigned variableDependentValueCount)
    73     {
    74         return adoptRef(new CSSMutableStyleDeclaration(0, properties, variableDependentValueCount));
     72    static PassRefPtr<CSSMutableStyleDeclaration> create(const Vector<CSSProperty>& properties)
     73    {
     74        return adoptRef(new CSSMutableStyleDeclaration(0, properties));
    7575    }
    7676
     
    132132    void merge(CSSMutableStyleDeclaration*, bool argOverridesOnConflict = true);
    133133
    134     bool hasVariableDependentValue() const { return m_variableDependentValueCount > 0; }
    135    
    136134    void setStrictParsing(bool b) { m_strictParsing = b; }
    137135    bool useStrictParsing() const { return m_strictParsing; }
     
    144142private:
    145143    CSSMutableStyleDeclaration();
    146     CSSMutableStyleDeclaration(CSSRule* parentRule, const Vector<CSSProperty>&, unsigned variableDependentValueCount);
     144    CSSMutableStyleDeclaration(CSSRule* parentRule, const Vector<CSSProperty>&);
    147145    CSSMutableStyleDeclaration(CSSRule* parentRule, const CSSProperty* const *, int numProperties);
    148146
     
    165163
    166164    Node* m_node;
    167     unsigned m_variableDependentValueCount : 24;
    168165    bool m_strictParsing : 1;
    169166#ifndef NDEBUG
  • trunk/WebCore/css/CSSParser.cpp

    r71882 r72116  
    5454#include "CSSValueKeywords.h"
    5555#include "CSSValueList.h"
    56 #include "CSSVariableDependentValue.h"
    57 #include "CSSVariablesDeclaration.h"
    58 #include "CSSVariablesRule.h"
    5956#include "Counter.h"
    6057#include "Document.h"
     
    155152    , m_lastSelectorLineNumber(0)
    156153    , m_allowImportRules(true)
    157     , m_allowVariablesRules(true)
    158154    , m_allowNamespaceDeclarations(true)
    159155{
     
    168164    clearProperties();
    169165    fastFree(m_parsedProperties);
    170 
    171     clearVariables();
    172166
    173167    delete m_valueList;
     
    596590            return false;
    597591        addProperty(propId, CSSInitialValue::createExplicit(), important);
    598         return true;
    599     }
    600 
    601     // If we have any variables, then we don't parse the list of values yet.  We add them to the declaration
    602     // as unresolved, and allow them to be parsed later.  The parse is considered "successful" for now, even though
    603     // it might ultimately fail once the variable has been resolved.
    604     if (!inShorthand() && checkForVariables(m_valueList)) {
    605         addUnresolvedProperty(propId, important);
    606592        return true;
    607593    }
     
    17731759    case CSSPropertyTextOverline:
    17741760    case CSSPropertyTextUnderline:
    1775     case CSSPropertyWebkitVariableDeclarationBlock:
    17761761        return false;
    17771762#if ENABLE(WCSS)
     
    51195104    case FUNCTION:
    51205105    case NOTFUNCTION:
    5121     case VARCALL:
    51225106        yylval->string.characters = t;
    51235107        yylval->string.length = length;
     
    51905174    else if (equalIgnoringCase(ruleName, "@-webkit-mediaquery"))
    51915175        yyTok = WEBKIT_MEDIAQUERY_SYM;
    5192     // FIXME: Add CSS Variables if we ever decide to turn it back on.
    51935176}
    51945177
     
    52245207            l -= 2;
    52255208        }
    5226         break;
    5227     case VARCALL:
    5228         // "-webkit-var("{w}{ident}{w}")"
    5229         // strip "-webkit-var(" and ")"
    5230         start += 12;
    5231         l -= 13;
    5232         // strip {w}
    5233         while (l && isHTMLSpace(*start)) {
    5234             ++start;
    5235             --l;
    5236         }
    5237         while (l && isHTMLSpace(start[l - 1]))
    5238             --l;
    52395209        break;
    52405210    default:
     
    54605430    if (!media || !rules || !m_styleSheet)
    54615431        return 0;
    5462     m_allowImportRules = m_allowNamespaceDeclarations = m_allowVariablesRules = false;
     5432    m_allowImportRules = m_allowNamespaceDeclarations = false;
    54635433    RefPtr<CSSMediaRule> rule = CSSMediaRule::create(m_styleSheet, media, rules);
    54645434    CSSMediaRule* result = rule.get();
     
    54785448WebKitCSSKeyframesRule* CSSParser::createKeyframesRule()
    54795449{
    5480     m_allowImportRules = m_allowNamespaceDeclarations = m_allowVariablesRules = false;
     5450    m_allowImportRules = m_allowNamespaceDeclarations = false;
    54815451    RefPtr<WebKitCSSKeyframesRule> rule = WebKitCSSKeyframesRule::create(m_styleSheet);
    54825452    WebKitCSSKeyframesRule* rulePtr = rule.get();
     
    54875457CSSRule* CSSParser::createStyleRule(Vector<CSSSelector*>* selectors)
    54885458{
    5489     m_allowImportRules = m_allowNamespaceDeclarations = m_allowVariablesRules = false;
     5459    m_allowImportRules = m_allowNamespaceDeclarations = false;
    54905460    CSSStyleRule* result = 0;
    54915461    markRuleBodyEnd();
     
    55155485CSSRule* CSSParser::createFontFaceRule()
    55165486{
    5517     m_allowImportRules = m_allowNamespaceDeclarations = m_allowVariablesRules = false;
     5487    m_allowImportRules = m_allowNamespaceDeclarations = false;
    55185488    RefPtr<CSSFontFaceRule> rule = CSSFontFaceRule::create(m_styleSheet);
    55195489    for (unsigned i = 0; i < m_numParsedProperties; ++i) {
     
    55385508        return;
    55395509    m_allowImportRules = false;
    5540     m_allowVariablesRules = false;
    55415510    m_styleSheet->addNamespace(this, prefix, uri);
    55425511}
    55435512
    5544 #if !ENABLE(CSS_VARIABLES)
    5545 
    5546 CSSRule* CSSParser::createVariablesRule(MediaList*, bool)
    5547 {
    5548     return 0;
    5549 }
    5550 
    5551 bool CSSParser::addVariable(const CSSParserString&, CSSParserValueList*)
    5552 {
    5553     return false;
    5554 }
    5555 
    5556 bool CSSParser::addVariableDeclarationBlock(const CSSParserString&)
    5557 {
    5558     return false;
    5559 }
    5560 
    5561 #else
    5562 
    5563 CSSRule* CSSParser::createVariablesRule(MediaList* mediaList, bool variablesKeyword)
    5564 {
    5565     if (!m_allowVariablesRules)
    5566         return 0;
    5567     m_allowImportRules = false;
    5568     RefPtr<CSSVariablesRule> rule = CSSVariablesRule::create(m_styleSheet, mediaList, variablesKeyword);
    5569     rule->setDeclaration(CSSVariablesDeclaration::create(rule.get(), m_variableNames, m_variableValues));
    5570     clearVariables();
    5571     CSSRule* result = rule.get();
    5572     m_parsedStyleObjects.append(rule.release());
    5573     return result;
    5574 }
    5575 
    5576 bool CSSParser::addVariable(const CSSParserString& name, CSSParserValueList* valueList)
    5577 {
    5578     if (checkForVariables(valueList)) {
    5579         delete valueList;
    5580         return false;
    5581     }
    5582     m_variableNames.append(String(name));
    5583     m_variableValues.append(CSSValueList::createFromParserValueList(valueList));
    5584     return true;
    5585 }
    5586 
    5587 bool CSSParser::addVariableDeclarationBlock(const CSSParserString&)
    5588 {
    5589 // FIXME: Disabling declarations as variable values for now since they no longer have a common base class with CSSValues.
    5590 #if 0
    5591     m_variableNames.append(String(name));
    5592     m_variableValues.append(CSSMutableStyleDeclaration::create(0, m_parsedProperties, m_numParsedProperties));
    5593     clearProperties();
    5594 #endif
    5595     return true;
    5596 }
    5597 
    5598 #endif
    5599 
    56005513CSSRule* CSSParser::createPageRule(CSSSelector* pageSelector)
    56015514{
    56025515    // FIXME: Margin at-rules are ignored.
    5603     m_allowImportRules = m_allowNamespaceDeclarations = m_allowVariablesRules = false;
     5516    m_allowImportRules = m_allowNamespaceDeclarations = false;
    56045517    CSSPageRule* pageRule = 0;
    56055518    if (pageSelector) {
     
    56345547    rollbackLastProperties(m_numParsedProperties - m_numParsedPropertiesBeforeMarginBox);
    56355548    m_numParsedPropertiesBeforeMarginBox = INVALID_NUM_PARSED_PROPERTIES;
    5636 }
    5637 
    5638 void CSSParser::clearVariables()
    5639 {
    5640     m_variableNames.clear();
    5641     m_variableValues.clear();
    5642 }
    5643 
    5644 bool CSSParser::parseVariable(CSSVariablesDeclaration* declaration, const String& variableName, const String& variableValue)
    5645 {
    5646     m_styleSheet = static_cast<CSSStyleSheet*>(declaration->stylesheet());
    5647 
    5648     String nameValuePair = variableName + ": ";
    5649     nameValuePair += variableValue;
    5650 
    5651     setupParser("@-webkit-variables-decls{", nameValuePair, "} ");
    5652     cssyyparse(this);
    5653     m_rule = 0;
    5654 
    5655     bool ok = false;
    5656     if (m_variableNames.size()) {
    5657         ok = true;
    5658         declaration->addParsedVariable(variableName, m_variableValues[0]);
    5659     }
    5660 
    5661     clearVariables();
    5662 
    5663     return ok;
    5664 }
    5665 
    5666 void CSSParser::parsePropertyWithResolvedVariables(int propId, bool isImportant, CSSMutableStyleDeclaration* declaration, CSSParserValueList* list)
    5667 {
    5668     m_valueList = list;
    5669     m_styleSheet = static_cast<CSSStyleSheet*>(declaration->stylesheet());
    5670 
    5671     if (parseValue(propId, isImportant))
    5672         declaration->addParsedProperties(m_parsedProperties, m_numParsedProperties);
    5673 
    5674     clearProperties();
    5675     m_valueList = 0;
    5676 }
    5677 
    5678 bool CSSParser::checkForVariables(CSSParserValueList* valueList)
    5679 {
    5680     if (!valueList || !valueList->containsVariables())
    5681         return false;
    5682 
    5683     bool hasVariables = false;
    5684     for (unsigned i = 0; i < valueList->size(); ++i) {
    5685         if (valueList->valueAt(i)->isVariable()) {
    5686             hasVariables = true;
    5687             break;
    5688         }
    5689 
    5690         if (valueList->valueAt(i)->unit == CSSParserValue::Function && checkForVariables(valueList->valueAt(i)->function->args.get())) {
    5691             hasVariables = true;
    5692             break;
    5693         }
    5694     }
    5695 
    5696     return hasVariables;
    5697 }
    5698 
    5699 void CSSParser::addUnresolvedProperty(int propId, bool important)
    5700 {
    5701     RefPtr<CSSVariableDependentValue> val = CSSVariableDependentValue::create(CSSValueList::createFromParserValueList(m_valueList));
    5702     addProperty(propId, val.release(), important);
    57035549}
    57045550
  • trunk/WebCore/css/CSSParser.h

    r69196 r72116  
    4646    class CSSValue;
    4747    class CSSValueList;
    48     class CSSVariablesDeclaration;
    4948    class Document;
    5049    class MediaList;
     
    162161        bool parseTransformOrigin(int propId, int& propId1, int& propId2, int& propId3, RefPtr<CSSValue>&, RefPtr<CSSValue>&, RefPtr<CSSValue>&);
    163162        bool parsePerspectiveOrigin(int propId, int& propId1, int& propId2,  RefPtr<CSSValue>&, RefPtr<CSSValue>&);
    164         bool parseVariable(CSSVariablesDeclaration*, const String& variableName, const String& variableValue);
    165         void parsePropertyWithResolvedVariables(int propId, bool important, CSSMutableStyleDeclaration*, CSSParserValueList*);
    166163
    167164        int yyparse();
     
    187184        CSSRule* createStyleRule(Vector<CSSSelector*>* selectors);
    188185        CSSRule* createFontFaceRule();
    189         CSSRule* createVariablesRule(MediaList*, bool variablesKeyword);
    190186        CSSRule* createPageRule(CSSSelector* pageSelector);
    191187        CSSRule* createMarginAtRule(CSSSelector::MarginBoxType marginBox);
     
    203199        void addNamespace(const AtomicString& prefix, const AtomicString& uri);
    204200
    205         bool addVariable(const CSSParserString&, CSSParserValueList*);
    206         bool addVariableDeclarationBlock(const CSSParserString&);
    207         bool checkForVariables(CSSParserValueList*);
    208         void addUnresolvedProperty(int propId, bool important);
    209201        void invalidBlockHit();
    210202
     
    235227        bool m_hasFontFaceOnlyValues;
    236228        bool m_hadSyntacticallyValidCSSRule;
    237 
    238         Vector<String> m_variableNames;
    239         Vector<RefPtr<CSSValue> > m_variableValues;
    240229
    241230        AtomicString m_defaultNamespace;
     
    271260        void checkForOrphanedUnits();
    272261
    273         void clearVariables();
    274 
    275262        void deleteFontFaceOnlyValues();
    276263
     
    300287
    301288        bool m_allowImportRules;
    302         bool m_allowVariablesRules;
    303289        bool m_allowNamespaceDeclarations;
    304290
  • trunk/WebCore/css/CSSParserValues.cpp

    r45919 r72116  
    2727namespace WebCore {
    2828
    29 bool CSSParserValue::isVariable() const
    30 {
    31     return unit == CSSPrimitiveValue::CSS_PARSER_VARIABLE_FUNCTION_SYNTAX;
    32 }
    33 
    3429CSSParserValueList::~CSSParserValueList()
    3530{
     
    4338void CSSParserValueList::addValue(const CSSParserValue& v)
    4439{
    45     if (v.unit == CSSPrimitiveValue::CSS_PARSER_VARIABLE_FUNCTION_SYNTAX) // isVariable() is not inlined. This is hot.
    46         m_variablesCount++;
    4740    m_values.append(v);
    4841}
     
    5043void CSSParserValueList::deleteValueAt(unsigned i)
    5144{
    52     if (m_values[i].isVariable())
    53         m_variablesCount--;
    5445    m_values.remove(i);
    5546}
     
    7061    } else if (unit == CSSParserValue::Function)
    7162        parsedValue = CSSFunctionValue::create(function);
    72     else if (unit == CSSPrimitiveValue::CSS_STRING || unit == CSSPrimitiveValue::CSS_URI || unit == CSSPrimitiveValue::CSS_PARSER_HEXCOLOR || isVariable())
     63    else if (unit == CSSPrimitiveValue::CSS_STRING || unit == CSSPrimitiveValue::CSS_URI || unit == CSSPrimitiveValue::CSS_PARSER_HEXCOLOR)
    7364        parsedValue = CSSPrimitiveValue::create(string, (CSSPrimitiveValue::UnitTypes)unit);
    7465    else if (unit >= CSSPrimitiveValue::CSS_NUMBER && unit <= CSSPrimitiveValue::CSS_KHZ)
  • trunk/WebCore/css/CSSParserValues.h

    r66334 r72116  
    5656    int unit;
    5757   
    58     bool isVariable() const;
    5958   
    6059    PassRefPtr<CSSValue> createCSSValue();
     
    6564    CSSParserValueList()
    6665        : m_current(0)
    67         , m_variablesCount(0)
    6866    {
    6967    }
     
    8179    void clear() { m_values.clear(); }
    8280
    83     bool containsVariables() const { return m_variablesCount; }
    84 
    8581private:
    8682    unsigned m_current;
    87     unsigned m_variablesCount;
    8883    Vector<CSSParserValue, 4> m_values;
    8984};
  • trunk/WebCore/css/CSSPrimitiveValue.cpp

    r72095 r72116  
    275275        case CSS_URI:
    276276        case CSS_ATTR:
    277         case CSS_PARSER_VARIABLE_FUNCTION_SYNTAX:
    278277        case CSS_PARSER_HEXCOLOR:
    279278            if (m_value.string)
     
    524523        case CSS_ATTR:
    525524        case CSS_URI:
    526         case CSS_PARSER_VARIABLE_FUNCTION_SYNTAX:
    527525            return m_value.string;
    528526        case CSS_IDENT:
     
    542540        case CSS_ATTR:
    543541        case CSS_URI:
    544         case CSS_PARSER_VARIABLE_FUNCTION_SYNTAX:
    545542             return m_value.string;
    546543        case CSS_IDENT:
     
    824821            break;
    825822#endif
    826         case CSS_PARSER_VARIABLE_FUNCTION_SYNTAX:
    827             text = "-webkit-var(";
    828             text += m_value.string;
    829             text += ")";
    830             break;
    831823        case CSS_PARSER_OPERATOR: {
    832824            char c = static_cast<char>(m_value.ident);
     
    878870        case CSS_STRING:
    879871        case CSS_URI:
    880         case CSS_PARSER_VARIABLE_FUNCTION_SYNTAX:
    881872        case CSS_PARSER_HEXCOLOR:
    882873            value.string.characters = const_cast<UChar*>(m_value.string->characters());
  • trunk/WebCore/css/CSSPrimitiveValue.h

    r72095 r72116  
    8484        CSS_PARSER_OPERATOR = 103,
    8585        CSS_PARSER_INTEGER = 104,
    86         CSS_PARSER_VARIABLE_FUNCTION_SYNTAX = 105,
    87         CSS_PARSER_HEXCOLOR = 106,
     86        CSS_PARSER_HEXCOLOR = 105,
    8887       
    8988        // This is used internally for unknown identifiers
    90         CSS_PARSER_IDENTIFIER = 107,
     89        CSS_PARSER_IDENTIFIER = 106,
    9190       
    9291        // These are from CSS3 Values and Units, but that isn't a finished standard yet
    93         CSS_TURN = 108,
    94         CSS_REMS = 109
     92        CSS_TURN = 107,
     93        CSS_REMS = 108
    9594    };
    9695   
     
    113112
    114113    unsigned short primitiveType() const { return m_type; }
    115 
    116     bool isVariable() const { return m_type == CSS_PARSER_VARIABLE_FUNCTION_SYNTAX; }
    117114
    118115    /*
  • trunk/WebCore/css/CSSProperty.cpp

    r69220 r72116  
    3030String CSSProperty::cssText() const
    3131{
    32     if (id() == CSSPropertyWebkitVariableDeclarationBlock)
    33         return m_value->cssText() + ";";
    3432    return String(getPropertyName(static_cast<CSSPropertyID>(id()))) + ": " + m_value->cssText() + (isImportant() ? " !important" : "") + "; ";
    3533}
  • trunk/WebCore/css/CSSPropertyNames.in

    r71348 r72116  
    298298-webkit-user-modify
    299299-webkit-user-select
    300 -webkit-variable-declaration-block
  • trunk/WebCore/css/CSSRule.h

    r70335 r72116  
    4747        FONT_FACE_RULE,
    4848        PAGE_RULE,
    49         VARIABLES_RULE,
    50         WEBKIT_KEYFRAMES_RULE,
     49        // 7 used to be VARIABLES_RULE
     50        WEBKIT_KEYFRAMES_RULE = 8,
    5151        WEBKIT_KEYFRAME_RULE
    5252    };
  • trunk/WebCore/css/CSSRule.idl

    r52921 r72116  
    3535        const unsigned short FONT_FACE_RULE = 5;
    3636        const unsigned short PAGE_RULE = 6;
    37         const unsigned short VARIABLES_RULE = 7;
    3837        const unsigned short WEBKIT_KEYFRAMES_RULE = 8;
    3938        const unsigned short WEBKIT_KEYFRAME_RULE = 9;
  • trunk/WebCore/css/CSSStyleDeclaration.cpp

    r65468 r72116  
    149149    Vector<CSSProperty> list;
    150150    list.reserveInitialCapacity(length);
    151     unsigned variableDependentValueCount = 0;
    152151    for (unsigned i = 0; i < length; i++) {
    153152        RefPtr<CSSValue> value = getPropertyCSSValue(set[i]);
    154         if (value) {
    155             if (value->isVariableDependentValue())
    156                 variableDependentValueCount++;
     153        if (value)
    157154            list.append(CSSProperty(set[i], value.release(), false));
    158         }
    159155    }
    160     return CSSMutableStyleDeclaration::create(list, variableDependentValueCount);
     156    return CSSMutableStyleDeclaration::create(list);
    161157}
    162158
  • trunk/WebCore/css/CSSStyleSelector.cpp

    r71641 r72116  
    4545#include "CSSTimingFunctionValue.h"
    4646#include "CSSValueList.h"
    47 #include "CSSVariableDependentValue.h"
    48 #include "CSSVariablesDeclaration.h"
    49 #include "CSSVariablesRule.h"
    5047#include "CachedImage.h"
    5148#include "Counter.h"
     
    572569void CSSStyleSelector::addMatchedDeclaration(CSSMutableStyleDeclaration* decl)
    573570{
    574     if (!decl->hasVariableDependentValue()) {
    575         m_matchedDecls.append(decl);
    576         return;
    577     }
    578 
    579     // See if we have already resolved the variables in this declaration.
    580     CSSMutableStyleDeclaration* resolvedDecl = m_resolvedVariablesDeclarations.get(decl).get();
    581     if (resolvedDecl) {
    582         m_matchedDecls.append(resolvedDecl);
    583         return;
    584     }
    585 
    586     // If this declaration has any variables in it, then we need to make a cloned
    587     // declaration with as many variables resolved as possible for this style selector's media.
    588     RefPtr<CSSMutableStyleDeclaration> newDecl = CSSMutableStyleDeclaration::create(decl->parentRule());
    589     m_matchedDecls.append(newDecl.get());
    590     m_resolvedVariablesDeclarations.set(decl, newDecl);
    591 
    592     HashSet<String> usedBlockVariables;
    593     resolveVariablesForDeclaration(decl, newDecl.get(), usedBlockVariables);
    594 }
    595 
    596 void CSSStyleSelector::resolveVariablesForDeclaration(CSSMutableStyleDeclaration* decl, CSSMutableStyleDeclaration* newDecl, HashSet<String>& usedBlockVariables)
    597 {
    598     // Now iterate over the properties in the original declaration.  As we resolve variables we'll end up
    599     // mutating the new declaration (possibly expanding shorthands).  The new declaration has no m_node
    600     // though, so it can't mistakenly call setChanged on anything.
    601     CSSMutableStyleDeclaration::const_iterator end = decl->end();
    602     for (CSSMutableStyleDeclaration::const_iterator it = decl->begin(); it != end; ++it) {
    603         const CSSProperty& current = *it;
    604         if (!current.value()->isVariableDependentValue()) {
    605             // We can just add the parsed property directly.
    606             newDecl->addParsedProperty(current);
    607             continue;
    608         }
    609         CSSValueList* valueList = static_cast<CSSVariableDependentValue*>(current.value())->valueList();
    610         if (!valueList)
    611             continue;
    612         CSSParserValueList resolvedValueList;
    613         unsigned s = valueList->length();
    614         bool fullyResolved = true;
    615         for (unsigned i = 0; i < s; ++i) {
    616             CSSValue* transformValue = valueList->item(i);
    617             CSSPrimitiveValue* primitiveValue = transformValue->isPrimitiveValue() ? static_cast<CSSPrimitiveValue*>(transformValue) : 0;
    618             if (primitiveValue && primitiveValue->isVariable()) {
    619                 CSSVariablesRule* rule = m_variablesMap.get(primitiveValue->getStringValue());
    620                 if (!rule || !rule->variables()) {
    621                     fullyResolved = false;
    622                     break;
    623                 }
    624                
    625                 if (current.id() == CSSPropertyWebkitVariableDeclarationBlock && s == 1) {
    626                     fullyResolved = false;
    627                     if (!usedBlockVariables.contains(primitiveValue->getStringValue())) {
    628                         CSSMutableStyleDeclaration* declBlock = rule->variables()->getParsedVariableDeclarationBlock(primitiveValue->getStringValue());
    629                         if (declBlock) {
    630                             usedBlockVariables.add(primitiveValue->getStringValue());
    631                             resolveVariablesForDeclaration(declBlock, newDecl, usedBlockVariables);
    632                         }
    633                     }
    634                 }
    635 
    636                 CSSValueList* resolvedVariable = rule->variables()->getParsedVariable(primitiveValue->getStringValue());
    637                 if (!resolvedVariable) {
    638                     fullyResolved = false;
    639                     break;
    640                 }
    641                 unsigned valueSize = resolvedVariable->length();
    642                 for (unsigned j = 0; j < valueSize; ++j)
    643                     resolvedValueList.addValue(resolvedVariable->item(j)->parserValue());
    644             } else
    645                 resolvedValueList.addValue(transformValue->parserValue());
    646         }
    647        
    648         if (!fullyResolved)
    649             continue;
    650 
    651         // We now have a fully resolved new value list.  We want the parser to use this value list
    652         // and parse our new declaration.
    653         CSSParser(m_checker.m_strictParsing).parsePropertyWithResolvedVariables(current.id(), current.isImportant(), newDecl, &resolvedValueList);
    654     }
     571    m_matchedDecls.append(decl);
    655572}
    656573
     
    27862703}
    27872704
    2788 void CSSStyleSelector::addVariables(CSSVariablesRule* variables)
    2789 {
    2790     CSSVariablesDeclaration* decl = variables->variables();
    2791     if (!decl)
    2792         return;
    2793     unsigned size = decl->length();
    2794     for (unsigned i = 0; i < size; ++i) {
    2795         String name = decl->item(i);
    2796         m_variablesMap.set(name, variables);
    2797     }
    2798 }
    2799 
    2800 CSSValue* CSSStyleSelector::resolveVariableDependentValue(CSSVariableDependentValue*)
    2801 {
    2802     return 0;
    2803 }
    2804 
    28052705// -----------------------------------------------------------------
    28062706
     
    29092809            const CSSFontFaceRule* fontFaceRule = static_cast<CSSFontFaceRule*>(item);
    29102810            styleSelector->fontSelector()->addFontFaceRule(fontFaceRule);
    2911         } else if (item->isVariablesRule()) {
    2912             // Evaluate the media query and make sure it matches.
    2913             CSSVariablesRule* variables = static_cast<CSSVariablesRule*>(item);
    2914             if (!variables->media() || medium.eval(variables->media(), styleSelector))
    2915                 styleSelector->addVariables(variables);
    29162811        } else if (item->isKeyframesRule())
    29172812            styleSelector->addKeyframeStyle(static_cast<WebKitCSSKeyframesRule*>(item));
     
    56125507    case CSSPropertyWebkitTextDecorationsInEffect:
    56135508    case CSSPropertyWebkitTextStroke:
    5614     case CSSPropertyWebkitVariableDeclarationBlock:
    56155509        return;
    56165510#if ENABLE(WCSS)
  • trunk/WebCore/css/CSSStyleSelector.h

    r70335 r72116  
    5151class CSSStyleSheet;
    5252class CSSValue;
    53 class CSSVariableDependentValue;
    54 class CSSVariablesRule;
    5553class ContainerNode;
    5654class DataGridColumn;
     
    166164        void visitedStateChanged(LinkHash visitedHash) { m_checker.visitedStateChanged(visitedHash); }
    167165
    168         void addVariables(CSSVariablesRule* variables);
    169         CSSValue* resolveVariableDependentValue(CSSVariableDependentValue*);
    170         void resolveVariablesForDeclaration(CSSMutableStyleDeclaration* decl, CSSMutableStyleDeclaration* newDecl, HashSet<String>& usedBlockVariables);
    171 
    172166        void addKeyframeStyle(PassRefPtr<WebKitCSSKeyframesRule> rule);
    173167        void addPageStyle(PassRefPtr<CSSPageRule>);
     
    320314        Vector<CSSMutableStyleDeclaration*> m_additionalAttributeStyleDecls;
    321315        Vector<MediaQueryResult*> m_viewportDependentMediaQueryResults;
    322        
    323         HashMap<String, CSSVariablesRule*> m_variablesMap;
    324         HashMap<CSSMutableStyleDeclaration*, RefPtr<CSSMutableStyleDeclaration> > m_resolvedVariablesDeclarations;
    325316    };
    326317
  • trunk/WebCore/css/CSSValue.h

    r71641 r72116  
    7373#endif
    7474
    75     virtual bool isVariableDependentValue() const { return false; }
    7675    virtual CSSParserValue parserValue() const { ASSERT_NOT_REACHED(); return CSSParserValue(); }
    7776
  • trunk/WebCore/css/StyleBase.h

    r65021 r72116  
    5454        virtual bool isKeyframesRule() { return false; }
    5555        virtual bool isMediaRule() { return false; }
    56         virtual bool isVariablesRule() { return false; }
    5756        virtual bool isPageRule() { return false; }
    5857       
  • trunk/WebCore/css/tokenizer.flex

    r67158 r72116  
    4242<mediaquery>"only"      {yyTok = MEDIA_ONLY; return yyTok;}
    4343<mediaquery>"and"       {yyTok = MEDIA_AND; return yyTok;}
    44 <forkeyword>"for"       {BEGIN(mediaquery); yyTok = VARIABLES_FOR; return yyTok; }
    4544
    4645{string}                {yyTok = STRING; return yyTok;}
     
    7877"@-webkit-mediaquery"   {BEGIN(mediaquery); yyTok = WEBKIT_MEDIAQUERY_SYM; return yyTok; }
    7978"@-webkit-selector"     {yyTok = WEBKIT_SELECTOR_SYM; return yyTok; }
    80 "@-webkit-variables"    {BEGIN(mediaquery); yyTok = WEBKIT_VARIABLES_SYM; return yyTok; }
    81 "@-webkit-define"       {BEGIN(forkeyword); yyTok = WEBKIT_DEFINE_SYM; return yyTok; }
    82 "@-webkit-variables-decls" { yyTok = WEBKIT_VARIABLES_DECLS_SYM; return yyTok; }
    8379"@-webkit-keyframes"    {yyTok = WEBKIT_KEYFRAMES_SYM; return yyTok; }
    8480"@-webkit-keyframe-rule" {yyTok = WEBKIT_KEYFRAME_RULE_SYM; return yyTok; }
     
    114110"url("{w}{string}{w}")" {yyTok = URI; return yyTok;}
    115111"url("{w}{url}{w}")"    {yyTok = URI; return yyTok;}
    116 "-webkit-var("{w}{ident}{w}")" { yyTok = VARCALL; return yyTok; }
    117112{ident}"("              {yyTok = FUNCTION; return yyTok;}
    118113
  • trunk/WebCore/page/DOMWindow.idl

    r72036 r72116  
    363363        attribute CSSStyleRuleConstructor CSSStyleRule;
    364364       
    365         attribute CSSVariablesRuleConstructor CSSVariablesRule;
    366         attribute CSSVariablesDeclarationConstructor CSSVariablesDeclaration;
    367 
    368365        attribute CSSStyleDeclarationConstructor CSSStyleDeclaration;
    369366        attribute MediaListConstructor MediaList;
Note: See TracChangeset for help on using the changeset viewer.