Changeset 72116 in webkit
- Timestamp:
- Nov 16, 2010 10:25:46 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 13 deleted
- 45 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r72108 r72116 1 2010-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 1 319 2010-11-16 Mihai Parparita <mihaip@chromium.org> 2 320 -
trunk/LayoutTests/fast/dom/Window/window-properties-expected.txt
r71373 r72116 209 209 window.CSSCharsetRule.prototype.STYLE_RULE [number] 210 210 window.CSSCharsetRule.prototype.UNKNOWN_RULE [number] 211 window.CSSCharsetRule.prototype.VARIABLES_RULE [number]212 211 window.CSSCharsetRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 213 212 window.CSSCharsetRule.prototype.WEBKIT_KEYFRAME_RULE [number] … … 221 220 window.CSSFontFaceRule.prototype.STYLE_RULE [number] 222 221 window.CSSFontFaceRule.prototype.UNKNOWN_RULE [number] 223 window.CSSFontFaceRule.prototype.VARIABLES_RULE [number]224 222 window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 225 223 window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAME_RULE [number] … … 233 231 window.CSSImportRule.prototype.STYLE_RULE [number] 234 232 window.CSSImportRule.prototype.UNKNOWN_RULE [number] 235 window.CSSImportRule.prototype.VARIABLES_RULE [number]236 233 window.CSSImportRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 237 234 window.CSSImportRule.prototype.WEBKIT_KEYFRAME_RULE [number] … … 245 242 window.CSSMediaRule.prototype.STYLE_RULE [number] 246 243 window.CSSMediaRule.prototype.UNKNOWN_RULE [number] 247 window.CSSMediaRule.prototype.VARIABLES_RULE [number]248 244 window.CSSMediaRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 249 245 window.CSSMediaRule.prototype.WEBKIT_KEYFRAME_RULE [number] … … 259 255 window.CSSPageRule.prototype.STYLE_RULE [number] 260 256 window.CSSPageRule.prototype.UNKNOWN_RULE [number] 261 window.CSSPageRule.prototype.VARIABLES_RULE [number]262 257 window.CSSPageRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 263 258 window.CSSPageRule.prototype.WEBKIT_KEYFRAME_RULE [number] … … 335 330 window.CSSRule.STYLE_RULE [number] 336 331 window.CSSRule.UNKNOWN_RULE [number] 337 window.CSSRule.VARIABLES_RULE [number]338 332 window.CSSRule.WEBKIT_KEYFRAMES_RULE [number] 339 333 window.CSSRule.WEBKIT_KEYFRAME_RULE [number] … … 346 340 window.CSSRule.prototype.STYLE_RULE [number] 347 341 window.CSSRule.prototype.UNKNOWN_RULE [number] 348 window.CSSRule.prototype.VARIABLES_RULE [number]349 342 window.CSSRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 350 343 window.CSSRule.prototype.WEBKIT_KEYFRAME_RULE [number] … … 382 375 window.CSSValueList [object CSSValueListConstructor] 383 376 window.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]392 377 window.CanvasGradient [object CanvasGradientConstructor] 393 378 window.CanvasGradient.prototype [object CanvasGradientPrototype] -
trunk/LayoutTests/fast/dom/Window/window-property-descriptors-expected.txt
r71373 r72116 25 25 PASS typeof Object.getOwnPropertyDescriptor(window, 'CSSValue') is 'object' 26 26 PASS 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'29 27 PASS typeof Object.getOwnPropertyDescriptor(window, 'CanvasGradient') is 'object' 30 28 PASS typeof Object.getOwnPropertyDescriptor(window, 'CanvasPattern') is 'object' -
trunk/LayoutTests/fast/dom/prototype-inheritance-2-expected.txt
r71373 r72116 221 221 Never found CDATASection 222 222 Never found CSSRule 223 Never found CSSVariablesDeclaration224 Never found CSSVariablesRule225 223 Never found CanvasGradient 226 224 Never found CharacterData -
trunk/LayoutTests/fast/dom/prototype-inheritance-expected.txt
r71373 r72116 46 46 PASS inner.CSSValueList.isInner is true 47 47 PASS inner.CSSValueList.constructor.isInner is true 48 PASS inner.CSSVariablesDeclaration.isInner is true49 PASS inner.CSSVariablesDeclaration.constructor.isInner is true50 PASS inner.CSSVariablesRule.isInner is true51 PASS inner.CSSVariablesRule.constructor.isInner is true52 48 PASS inner.CanvasGradient.isInner is true 53 49 PASS inner.CanvasGradient.constructor.isInner is true -
trunk/LayoutTests/fast/js/global-constructors-expected.txt
r71373 r72116 23 23 PASS CSSValue.toString() is '[object CSSValueConstructor]' 24 24 PASS CSSValueList.toString() is '[object CSSValueListConstructor]' 25 PASS CSSVariablesDeclaration.toString() is '[object CSSVariablesDeclarationConstructor]'26 PASS CSSVariablesRule.toString() is '[object CSSVariablesRuleConstructor]'27 25 PASS CanvasGradient.toString() is '[object CanvasGradientConstructor]' 28 26 PASS CanvasPattern.toString() is '[object CanvasPatternConstructor]' -
trunk/LayoutTests/platform/gtk/Skipped
r72068 r72116 1695 1695 fast/css/namespaces/namespaces-escapes.xml 1696 1696 fast/css/namespaces/namespaces-invalid-at.xml 1697 fast/css/variables/block-cycle-test.html1698 fast/css/variables/colors-test.html1699 fast/css/variables/declaration-block-test.html1700 fast/css/variables/font-test.html1701 fast/css/variables/image-test.html1702 fast/css/variables/import-test.html1703 fast/css/variables/inline-style-test.html1704 fast/css/variables/invalid-variable-test.html1705 fast/css/variables/margin-test.html1706 fast/css/variables/misplaced-import-test.html1707 fast/css/variables/misplaced-variables-test.html1708 fast/css/variables/multiple-blocks-test.html1709 fast/css/variables/multiple-term-test.html1710 fast/css/variables/override-test.html1711 fast/css/variables/print-test.html1712 fast/css/variables/remove-variable-test.html1713 fast/css/variables/set-variable-test.html1714 fast/css/variables/shorthand-test.html1715 fast/css/variables/variable-iteration-test.html1716 1697 fast/doctypes/001.html 1717 1698 fast/doctypes/002.html -
trunk/LayoutTests/platform/qt/Skipped
r72098 r72116 3011 3011 fast/css/universal-hover-quirk.html 3012 3012 fast/css/value-list-out-of-bounds-crash.html 3013 fast/css/variables/block-cycle-test.html3014 fast/css/variables/colors-test.html3015 fast/css/variables/declaration-block-test.html3016 fast/css/variables/font-test.html3017 fast/css/variables/image-test.html3018 fast/css/variables/import-test.html3019 fast/css/variables/inline-style-test.html3020 fast/css/variables/invalid-variable-test.html3021 fast/css/variables/margin-test.html3022 fast/css/variables/misplaced-import-test.html3023 fast/css/variables/misplaced-variables-test.html3024 fast/css/variables/multiple-blocks-test.html3025 fast/css/variables/multiple-term-test.html3026 fast/css/variables/override-test.html3027 fast/css/variables/print-test.html3028 fast/css/variables/remove-variable-test.html3029 fast/css/variables/set-variable-test.html3030 fast/css/variables/shorthand-test.html3031 fast/css/variables/variable-iteration-test.html3032 3013 fast/css/vertical-align-lengths.html 3033 3014 fast/css/visibility-hit-test.html -
trunk/WebCore/Android.derived.jscbindings.mk
r71373 r72116 69 69 $(intermediates)/css/JSCSSValue.h \ 70 70 $(intermediates)/css/JSCSSValueList.h \ 71 $(intermediates)/css/JSCSSVariablesDeclaration.h \72 $(intermediates)/css/JSCSSVariablesRule.h \73 71 $(intermediates)/css/JSCounter.h \ 74 72 $(intermediates)/css/JSMediaList.h \ -
trunk/WebCore/Android.derived.v8bindings.mk
r71512 r72116 50 50 $(intermediates)/bindings/V8CSSValue.h \ 51 51 $(intermediates)/bindings/V8CSSValueList.h \ 52 $(intermediates)/bindings/V8CSSVariablesDeclaration.h \53 $(intermediates)/bindings/V8CSSVariablesRule.h \54 52 $(intermediates)/bindings/V8Counter.h \ 55 53 $(intermediates)/bindings/V8MediaList.h \ -
trunk/WebCore/Android.mk
r71951 r72116 66 66 css/CSSUnicodeRangeValue.cpp \ 67 67 css/CSSValueList.cpp \ 68 css/CSSVariableDependentValue.cpp \69 css/CSSVariablesDeclaration.cpp \70 css/CSSVariablesRule.cpp \71 68 css/FontFamilyValue.cpp \ 72 69 css/FontValue.cpp \ -
trunk/WebCore/CMakeLists.txt
r71982 r72116 129 129 css/CSSValue.idl 130 130 css/CSSValueList.idl 131 css/CSSVariablesDeclaration.idl132 css/CSSVariablesRule.idl133 131 css/MediaList.idl 134 132 css/Rect.idl … … 759 757 css/CSSUnicodeRangeValue.cpp 760 758 css/CSSValueList.cpp 761 css/CSSVariableDependentValue.cpp762 css/CSSVariablesDeclaration.cpp763 css/CSSVariablesRule.cpp764 759 css/FontFamilyValue.cpp 765 760 css/FontValue.cpp -
trunk/WebCore/ChangeLog
r72115 r72116 1 2010-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 1 87 2010-11-16 Darin Adler <darin@apple.com> 2 88 … … 1533 1619 1534 1620 https://bugs.webkit.org/show_bug.cgi?id=49473 1621 WebKitCSSMatrix shouldn't inherit from StyleBase 1535 1622 1536 1623 No change in behavior, so no tests. -
trunk/WebCore/DerivedSources.make
r71951 r72116 74 74 CSSValue \ 75 75 CSSValueList \ 76 CSSVariablesRule \77 CSSVariablesDeclaration \78 76 WebGLActiveInfo \ 79 77 ArrayBufferView \ -
trunk/WebCore/GNUmakefile.am
r72033 r72116 183 183 DerivedSources/WebCore/JSCSSValueList.cpp \ 184 184 DerivedSources/WebCore/JSCSSValueList.h \ 185 DerivedSources/WebCore/JSCSSVariablesDeclaration.cpp \186 DerivedSources/WebCore/JSCSSVariablesDeclaration.h \187 DerivedSources/WebCore/JSCSSVariablesRule.cpp \188 DerivedSources/WebCore/JSCSSVariablesRule.h \189 185 DerivedSources/WebCore/JSCustomEvent.cpp \ 190 186 DerivedSources/WebCore/JSCustomEvent.h \ … … 988 984 WebCore/css/CSSValueList.cpp \ 989 985 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 \996 986 WebCore/css/DashboardRegion.h \ 997 987 WebCore/css/FontFamilyValue.cpp \ -
trunk/WebCore/WebCore.gypi
r72090 r72116 16 16 'css/CSSValue.idl', 17 17 'css/CSSValueList.idl', 18 'css/CSSVariablesDeclaration.idl',19 'css/CSSVariablesRule.idl',20 18 'css/Counter.idl', 21 19 'css/MediaList.idl', … … 1053 1051 'css/CSSValueList.cpp', 1054 1052 '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',1061 1053 'css/Counter.h', 1062 1054 'css/DashboardRegion.h', -
trunk/WebCore/WebCore.pri
r71951 r72116 84 84 css/CSSValue.idl \ 85 85 css/CSSValueList.idl \ 86 css/CSSVariablesDeclaration.idl \87 css/CSSVariablesRule.idl \88 86 css/MediaList.idl \ 89 87 css/Rect.idl \ -
trunk/WebCore/WebCore.pro
r72034 r72116 645 645 css/CSSUnicodeRangeValue.cpp \ 646 646 css/CSSValueList.cpp \ 647 css/CSSVariableDependentValue.cpp \648 css/CSSVariablesDeclaration.cpp \649 css/CSSVariablesRule.cpp \650 647 css/FontFamilyValue.cpp \ 651 648 css/FontValue.cpp \ … … 1564 1561 css/CSSUnicodeRangeValue.h \ 1565 1562 css/CSSValueList.h \ 1566 css/CSSVariableDependentValue.h \1567 css/CSSVariablesDeclaration.h \1568 css/CSSVariablesRule.h \1569 1563 css/FontFamilyValue.h \ 1570 1564 css/FontValue.h \ -
trunk/WebCore/WebCore.vcproj/WebCore.vcproj
r72090 r72116 2481 2481 </File> 2482 2482 <File 2483 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSCSSVariablesDeclaration.cpp"2484 >2485 <FileConfiguration2486 Name="Debug|Win32"2487 ExcludedFromBuild="true"2488 >2489 <Tool2490 Name="VCCLCompilerTool"2491 />2492 </FileConfiguration>2493 <FileConfiguration2494 Name="Release|Win32"2495 ExcludedFromBuild="true"2496 >2497 <Tool2498 Name="VCCLCompilerTool"2499 />2500 </FileConfiguration>2501 <FileConfiguration2502 Name="Debug_Internal|Win32"2503 ExcludedFromBuild="true"2504 >2505 <Tool2506 Name="VCCLCompilerTool"2507 />2508 </FileConfiguration>2509 <FileConfiguration2510 Name="Debug_Cairo|Win32"2511 ExcludedFromBuild="true"2512 >2513 <Tool2514 Name="VCCLCompilerTool"2515 />2516 </FileConfiguration>2517 <FileConfiguration2518 Name="Release_Cairo|Win32"2519 ExcludedFromBuild="true"2520 >2521 <Tool2522 Name="VCCLCompilerTool"2523 />2524 </FileConfiguration>2525 <FileConfiguration2526 Name="Debug_All|Win32"2527 ExcludedFromBuild="true"2528 >2529 <Tool2530 Name="VCCLCompilerTool"2531 />2532 </FileConfiguration>2533 </File>2534 <File2535 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSCSSVariablesDeclaration.h"2536 >2537 </File>2538 <File2539 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSCSSVariablesRule.cpp"2540 >2541 <FileConfiguration2542 Name="Debug|Win32"2543 ExcludedFromBuild="true"2544 >2545 <Tool2546 Name="VCCLCompilerTool"2547 />2548 </FileConfiguration>2549 <FileConfiguration2550 Name="Release|Win32"2551 ExcludedFromBuild="true"2552 >2553 <Tool2554 Name="VCCLCompilerTool"2555 />2556 </FileConfiguration>2557 <FileConfiguration2558 Name="Debug_Internal|Win32"2559 ExcludedFromBuild="true"2560 >2561 <Tool2562 Name="VCCLCompilerTool"2563 />2564 </FileConfiguration>2565 <FileConfiguration2566 Name="Debug_Cairo|Win32"2567 ExcludedFromBuild="true"2568 >2569 <Tool2570 Name="VCCLCompilerTool"2571 />2572 </FileConfiguration>2573 <FileConfiguration2574 Name="Release_Cairo|Win32"2575 ExcludedFromBuild="true"2576 >2577 <Tool2578 Name="VCCLCompilerTool"2579 />2580 </FileConfiguration>2581 <FileConfiguration2582 Name="Debug_All|Win32"2583 ExcludedFromBuild="true"2584 >2585 <Tool2586 Name="VCCLCompilerTool"2587 />2588 </FileConfiguration>2589 </File>2590 <File2591 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSCSSVariablesRule.h"2592 >2593 </File>2594 <File2595 2483 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSCustomEvent.cpp" 2596 2484 > … … 30597 30485 </File> 30598 30486 <File 30599 RelativePath="..\css\CSSVariableDependentValue.cpp"30600 >30601 </File>30602 <File30603 RelativePath="..\css\CSSVariableDependentValue.h"30604 >30605 </File>30606 <File30607 RelativePath="..\css\CSSVariablesDeclaration.cpp"30608 >30609 </File>30610 <File30611 RelativePath="..\css\CSSVariablesDeclaration.h"30612 >30613 </File>30614 <File30615 RelativePath="..\css\CSSVariablesRule.cpp"30616 >30617 </File>30618 <File30619 RelativePath="..\css\CSSVariablesRule.h"30620 >30621 </File>30622 <File30623 30487 RelativePath="..\css\DashboardRegion.h" 30624 30488 > -
trunk/WebCore/WebCore.xcodeproj/project.pbxproj
r71951 r72116 4916 4916 BC64B4DB0CB4298A005F2B62 /* CSSFontSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC64B4D30CB4298A005F2B62 /* CSSFontSelector.cpp */; }; 4917 4917 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 */; };4928 4918 BC6932730D7E293900AE44D1 /* JSDOMWindowBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC6932710D7E293900AE44D1 /* JSDOMWindowBase.cpp */; }; 4929 4919 BC6932740D7E293900AE44D1 /* JSDOMWindowBase.h in Headers */ = {isa = PBXBuildFile; fileRef = BC6932720D7E293900AE44D1 /* JSDOMWindowBase.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 5093 5083 BCCBAD400C18C14200CE890F /* JSHTMLCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCCBAD3E0C18C14200CE890F /* JSHTMLCollection.cpp */; }; 5094 5084 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 */; };5101 5085 BCCD74DC0A4C8D35005FDA6D /* HTMLViewSourceDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = BCCD74DB0A4C8D35005FDA6D /* HTMLViewSourceDocument.h */; }; 5102 5086 BCCD74E50A4C8DDF005FDA6D /* HTMLViewSourceDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCCD74E40A4C8DDF005FDA6D /* HTMLViewSourceDocument.cpp */; }; … … 10954 10938 BC64B4D30CB4298A005F2B62 /* CSSFontSelector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSFontSelector.cpp; sourceTree = "<group>"; }; 10955 10939 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>"; };10966 10940 BC6932710D7E293900AE44D1 /* JSDOMWindowBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMWindowBase.cpp; sourceTree = "<group>"; }; 10967 10941 BC6932720D7E293900AE44D1 /* JSDOMWindowBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMWindowBase.h; sourceTree = "<group>"; }; … … 11145 11119 BCCBAD3E0C18C14200CE890F /* JSHTMLCollection.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLCollection.cpp; sourceTree = "<group>"; }; 11146 11120 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>"; };11153 11121 BCCD74DB0A4C8D35005FDA6D /* HTMLViewSourceDocument.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HTMLViewSourceDocument.h; sourceTree = "<group>"; }; 11154 11122 BCCD74E40A4C8DDF005FDA6D /* HTMLViewSourceDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLViewSourceDocument.cpp; sourceTree = "<group>"; }; … … 13529 13497 858C383A0AA8ED8200B187A4 /* DOMCSSValueList.h */, 13530 13498 858C383B0AA8ED8200B187A4 /* DOMCSSValueList.mm */, 13531 BC686CAC0E0C343900DE8A08 /* DOMCSSVariablesDeclaration.h */,13532 BC686CAD0E0C343900DE8A08 /* DOMCSSVariablesDeclaration.mm */,13533 BC686CAF0E0C343900DE8A08 /* DOMCSSVariablesRule.h */,13534 BC686CB00E0C343900DE8A08 /* DOMCSSVariablesRule.mm */,13535 13499 858C38A30AA8F20400B187A4 /* DOMRect.h */, 13536 13500 858C38A40AA8F20400B187A4 /* DOMRect.mm */, … … 14239 14203 85B498F20ADB336A00925CBB /* DOMCSSValueInternal.h */, 14240 14204 85909D280ACC7D5500DF01F1 /* DOMCSSValueListInternal.h */, 14241 BC686CB90E0C349D00DE8A08 /* DOMCSSVariablesDeclarationInternal.h */,14242 BC686CBA0E0C349D00DE8A08 /* DOMCSSVariablesRuleInternal.h */,14243 14205 85E711450AC5D5340053270F /* DOMDocumentFragmentInternal.h */, 14244 14206 85E711460AC5D5340053270F /* DOMDocumentInternal.h */, … … 15832 15794 A8D05FA90A23B30F005E7203 /* JSCSSValueList.cpp */, 15833 15795 A8D05FAA0A23B30F005E7203 /* JSCSSValueList.h */, 15834 BC686C780E0C330100DE8A08 /* JSCSSVariablesDeclaration.cpp */,15835 BC686C790E0C330100DE8A08 /* JSCSSVariablesDeclaration.h */,15836 BC686C7A0E0C330100DE8A08 /* JSCSSVariablesRule.cpp */,15837 BC686C7B0E0C330100DE8A08 /* JSCSSVariablesRule.h */,15838 15796 BC3C39B40C0D3D8D005F4D7A /* JSMediaList.cpp */, 15839 15797 BC3C39B50C0D3D8D005F4D7A /* JSMediaList.h */, … … 17816 17774 A80E6CBF0A1989CA007FB8C5 /* CSSValueList.h */, 17817 17775 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 */,17824 17776 A80E6CE10A1989CA007FB8C5 /* DashboardRegion.h */, 17825 17777 FE49EF970DC51462004266E1 /* DashboardSupportCSSPropertyNames.in */, … … 18747 18699 6565815109D13043000E61D7 /* CSSValueKeywords.h in Headers */, 18748 18700 A80E6CE90A1989CA007FB8C5 /* CSSValueList.h in Headers */, 18749 BCCBE7B20E07159A00EAFA8E /* CSSVariableDependentValue.h in Headers */,18750 BCCBE68A0E06E60D00EAFA8E /* CSSVariablesDeclaration.h in Headers */,18751 BCCBE68C0E06E60D00EAFA8E /* CSSVariablesRule.h in Headers */,18752 18701 93F1992F08245E59001E9ABC /* Cursor.h in Headers */, 18753 18702 BC2272A20E82E87C00E7F975 /* CursorData.h in Headers */, … … 18863 18812 858C383C0AA8ED8200B187A4 /* DOMCSSValueList.h in Headers */, 18864 18813 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 */,18869 18814 E10B9CCC0B747A44003ED890 /* DOMCustomXPathNSResolver.h in Headers */, 18870 18815 BC7DAAEF0FF9615D00CE0138 /* DOMDataGridDataSource.h in Headers */, … … 20007 19952 14CF78A609F58CD800EB3665 /* JSCSSValue.h in Headers */, 20008 19953 A8D05FAC0A23B30F005E7203 /* JSCSSValueList.h in Headers */, 20009 BC686C7D0E0C330100DE8A08 /* JSCSSVariablesDeclaration.h in Headers */,20010 BC686C7F0E0C330100DE8A08 /* JSCSSVariablesRule.h in Headers */,20011 19954 E4778B80115A581A00B5D372 /* JSCustomEvent.h in Headers */, 20012 19955 FE80D7A80E9C1ED2000D6F75 /* JSCustomPositionCallback.h in Headers */, … … 21886 21829 1ABA76CB11D20E57004C201C /* CSSValueKeywords.cpp in Sources */, 21887 21830 A80E6CE40A1989CA007FB8C5 /* CSSValueList.cpp in Sources */, 21888 BCCBE7B50E07166900EAFA8E /* CSSVariableDependentValue.cpp in Sources */,21889 BCCBE69B0E06F51000EAFA8E /* CSSVariablesDeclaration.cpp in Sources */,21890 BCCBE68B0E06E60D00EAFA8E /* CSSVariablesRule.cpp in Sources */,21891 21831 E11AF15111B9A1A300805103 /* Cursor.cpp in Sources */, 21892 21832 93F19A2608245E59001E9ABC /* CursorMac.mm in Sources */, … … 21961 21901 858C381D0AA8E29600B187A4 /* DOMCSSValue.mm in Sources */, 21962 21902 858C383D0AA8ED8200B187A4 /* DOMCSSValueList.mm in Sources */, 21963 BC686CB30E0C343900DE8A08 /* DOMCSSVariablesDeclaration.mm in Sources */,21964 BC686CB60E0C343900DE8A08 /* DOMCSSVariablesRule.mm in Sources */,21965 21903 E10B9CCD0B747A44003ED890 /* DOMCustomXPathNSResolver.mm in Sources */, 21966 21904 BC7DAAEE0FF9615D00CE0138 /* DOMDataGridDataSource.cpp in Sources */, … … 22637 22575 BC20FB7F0C0E8E6C00D1447F /* JSCSSValueCustom.cpp in Sources */, 22638 22576 A8D05FAB0A23B30F005E7203 /* JSCSSValueList.cpp in Sources */, 22639 BC686C7C0E0C330100DE8A08 /* JSCSSVariablesDeclaration.cpp in Sources */,22640 BC686C7E0E0C330100DE8A08 /* JSCSSVariablesRule.cpp in Sources */,22641 22577 E4778B7F115A581A00B5D372 /* JSCustomEvent.cpp in Sources */, 22642 22578 FE80D7A70E9C1ED2000D6F75 /* JSCustomPositionCallback.cpp in Sources */, -
trunk/WebCore/bindings/js/JSCSSRuleCustom.cpp
r51363 r72116 33 33 #include "CSSPageRule.h" 34 34 #include "CSSStyleRule.h" 35 #include "CSSVariablesRule.h"36 35 #include "JSCSSCharsetRule.h" 37 36 #include "JSCSSFontFaceRule.h" … … 40 39 #include "JSCSSPageRule.h" 41 40 #include "JSCSSStyleRule.h" 42 #include "JSCSSVariablesRule.h"43 41 #include "JSWebKitCSSKeyframeRule.h" 44 42 #include "JSWebKitCSSKeyframesRule.h" … … 78 76 wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, CSSCharsetRule, rule); 79 77 break; 80 case CSSRule::VARIABLES_RULE:81 wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, CSSVariablesRule, rule);82 break;83 78 case CSSRule::WEBKIT_KEYFRAME_RULE: 84 79 wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, WebKitCSSKeyframeRule, rule); -
trunk/WebCore/bindings/objc/DOMCSS.mm
r47877 r72116 43 43 #import "DOMCSSValueInternal.h" 44 44 #import "DOMCSSValueList.h" 45 #import "DOMCSSVariablesRule.h"46 45 #import "DOMInternal.h" 47 46 #import "DOMStyleSheetInternal.h" … … 84 83 case DOM_PAGE_RULE: 85 84 return [DOMCSSPageRule class]; 86 case DOM_VARIABLES_RULE:87 return [DOMCSSVariablesRule class];88 85 case DOM_WEBKIT_KEYFRAMES_RULE: 89 86 return [DOMWebKitCSSKeyframesRule class]; -
trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm
r71802 r72116 232 232 my $type = shift; 233 233 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"; 235 235 return 0; 236 236 } -
trunk/WebCore/bindings/v8/custom/V8CSSRuleCustom.cpp
r54153 r72116 38 38 #include "V8CSSPageRule.h" 39 39 #include "V8CSSStyleRule.h" 40 #include "V8CSSVariablesRule.h"41 40 #include "V8WebKitCSSKeyframeRule.h" 42 41 #include "V8WebKitCSSKeyframesRule.h" … … 61 60 case CSSRule::PAGE_RULE: 62 61 return toV8(static_cast<CSSPageRule*>(impl)); 63 case CSSRule::VARIABLES_RULE:64 return toV8(static_cast<CSSVariablesRule*>(impl));65 62 case CSSRule::WEBKIT_KEYFRAME_RULE: 66 63 return toV8(static_cast<WebKitCSSKeyframeRule*>(impl)); -
trunk/WebCore/css/CSSComputedStyleDeclaration.cpp
r71348 r72116 1644 1644 case CSSPropertyWebkitTransformOriginZ: 1645 1645 case CSSPropertyWebkitTransition: 1646 case CSSPropertyWebkitVariableDeclarationBlock:1647 1646 break; 1648 1647 #if ENABLE(SVG) -
trunk/WebCore/css/CSSGrammar.y
r69196 r72116 100 100 %} 101 101 102 %expect 5 6102 %expect 51 103 103 104 104 %nonassoc LOWEST_PREC … … 141 141 %token WEBKIT_MEDIAQUERY_SYM 142 142 %token WEBKIT_SELECTOR_SYM 143 %token WEBKIT_VARIABLES_SYM144 %token WEBKIT_DEFINE_SYM145 %token VARIABLES_FOR146 %token WEBKIT_VARIABLES_DECLS_SYM147 143 %token <marginBox> TOPLEFTCORNER_SYM 148 144 %token <marginBox> TOPLEFT_SYM … … 198 194 %token <string> UNICODERANGE 199 195 200 %token <string> VARCALL201 202 196 %type <relation> combinator 203 197 … … 220 214 %type <rule> block_rule 221 215 %type <rule> block_valid_rule 222 %type <rule> variables_rule223 %type <mediaList> variables_media_list224 216 225 217 %type <string> maybe_ns_prefix … … 283 275 %type <string> attr_name 284 276 285 %type <string> variable_name286 %type <boolean> variables_declaration_list287 %type <boolean> variables_decl_list288 %type <boolean> variables_declaration289 %type <value> variable_reference290 291 277 %% 292 278 … … 298 284 | webkit_mediaquery maybe_space 299 285 | webkit_selector maybe_space 300 | webkit_variables_decls maybe_space301 286 | webkit_keyframe_rule maybe_space 302 287 ; … … 316 301 webkit_decls: 317 302 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 '}' {324 303 /* can be empty */ 325 304 } … … 418 397 | namespace 419 398 | import 420 | variables_rule421 399 ; 422 400 … … 455 433 | namespace 456 434 | import 457 | variables_rule458 435 | media 459 436 ; … … 474 451 } 475 452 ; 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 ;579 453 580 454 namespace: … … 1431 1305 } 1432 1306 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;1445 1307 } 1446 1308 | … … 1562 1424 /* FIXME: according to the specs a function can have a unary_operator in front. I know no case where this makes sense */ 1563 1425 | function { 1564 $$ = $1;1565 }1566 | variable_reference maybe_space {1567 1426 $$ = $1; 1568 1427 } … … 1603 1462 ; 1604 1463 1605 variable_reference:1606 VARCALL {1607 $$.id = 0;1608 $$.string = $1;1609 $$.unit = CSSPrimitiveValue::CSS_PARSER_VARIABLE_FUNCTION_SYNTAX;1610 }1611 ;1612 1613 1464 function: 1614 1465 FUNCTION maybe_space expr ')' maybe_space { -
trunk/WebCore/css/CSSMutableStyleDeclaration.cpp
r71530 r72116 40 40 CSSMutableStyleDeclaration::CSSMutableStyleDeclaration() 41 41 : m_node(0) 42 , m_variableDependentValueCount(0)43 42 , m_strictParsing(false) 44 43 #ifndef NDEBUG … … 51 50 : CSSStyleDeclaration(parent) 52 51 , m_node(0) 53 , m_variableDependentValueCount(0)54 52 , m_strictParsing(!parent || parent->useStrictParsing()) 55 53 #ifndef NDEBUG … … 59 57 } 60 58 61 CSSMutableStyleDeclaration::CSSMutableStyleDeclaration(CSSRule* parent, const Vector<CSSProperty>& properties , unsigned variableDependentValueCount)59 CSSMutableStyleDeclaration::CSSMutableStyleDeclaration(CSSRule* parent, const Vector<CSSProperty>& properties) 62 60 : CSSStyleDeclaration(parent) 63 61 , m_properties(properties) 64 62 , m_node(0) 65 , m_variableDependentValueCount(variableDependentValueCount)66 63 , m_strictParsing(!parent || parent->useStrictParsing()) 67 64 #ifndef NDEBUG … … 76 73 : CSSStyleDeclaration(parent) 77 74 , m_node(0) 78 , m_variableDependentValueCount(0)79 75 , m_strictParsing(!parent || parent->useStrictParsing()) 80 76 #ifndef NDEBUG … … 87 83 const CSSProperty *property = properties[i]; 88 84 ASSERT(property); 89 if (property->value()->isVariableDependentValue()) 90 m_variableDependentValueCount++; 91 else if (candidates.contains(property->id())) 85 if (candidates.contains(property->id())) 92 86 removeProperty(properties[i]->id(), false); 93 87 m_properties.append(*property); … … 458 452 String value = returnText ? foundProperty->value()->cssText() : String(); 459 453 460 if (foundProperty->value()->isVariableDependentValue())461 m_variableDependentValueCount--;462 463 454 // A more efficient removal strategy would involve marking entries as empty 464 455 // and sweeping them when the vector grows too big. … … 610 601 ASSERT(properties[i]); 611 602 m_properties.append(*properties[i]); 612 if (properties[i]->value()->isVariableDependentValue())613 m_variableDependentValueCount++;614 603 } 615 604 } … … 822 811 PassRefPtr<CSSMutableStyleDeclaration> CSSMutableStyleDeclaration::copy() const 823 812 { 824 return adoptRef(new CSSMutableStyleDeclaration(0, m_properties , m_variableDependentValueCount));813 return adoptRef(new CSSMutableStyleDeclaration(0, m_properties)); 825 814 } 826 815 -
trunk/WebCore/css/CSSMutableStyleDeclaration.h
r67704 r72116 70 70 return adoptRef(new CSSMutableStyleDeclaration(parentRule, properties, numProperties)); 71 71 } 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)); 75 75 } 76 76 … … 132 132 void merge(CSSMutableStyleDeclaration*, bool argOverridesOnConflict = true); 133 133 134 bool hasVariableDependentValue() const { return m_variableDependentValueCount > 0; }135 136 134 void setStrictParsing(bool b) { m_strictParsing = b; } 137 135 bool useStrictParsing() const { return m_strictParsing; } … … 144 142 private: 145 143 CSSMutableStyleDeclaration(); 146 CSSMutableStyleDeclaration(CSSRule* parentRule, const Vector<CSSProperty>& , unsigned variableDependentValueCount);144 CSSMutableStyleDeclaration(CSSRule* parentRule, const Vector<CSSProperty>&); 147 145 CSSMutableStyleDeclaration(CSSRule* parentRule, const CSSProperty* const *, int numProperties); 148 146 … … 165 163 166 164 Node* m_node; 167 unsigned m_variableDependentValueCount : 24;168 165 bool m_strictParsing : 1; 169 166 #ifndef NDEBUG -
trunk/WebCore/css/CSSParser.cpp
r71882 r72116 54 54 #include "CSSValueKeywords.h" 55 55 #include "CSSValueList.h" 56 #include "CSSVariableDependentValue.h"57 #include "CSSVariablesDeclaration.h"58 #include "CSSVariablesRule.h"59 56 #include "Counter.h" 60 57 #include "Document.h" … … 155 152 , m_lastSelectorLineNumber(0) 156 153 , m_allowImportRules(true) 157 , m_allowVariablesRules(true)158 154 , m_allowNamespaceDeclarations(true) 159 155 { … … 168 164 clearProperties(); 169 165 fastFree(m_parsedProperties); 170 171 clearVariables();172 166 173 167 delete m_valueList; … … 596 590 return false; 597 591 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 declaration602 // as unresolved, and allow them to be parsed later. The parse is considered "successful" for now, even though603 // it might ultimately fail once the variable has been resolved.604 if (!inShorthand() && checkForVariables(m_valueList)) {605 addUnresolvedProperty(propId, important);606 592 return true; 607 593 } … … 1773 1759 case CSSPropertyTextOverline: 1774 1760 case CSSPropertyTextUnderline: 1775 case CSSPropertyWebkitVariableDeclarationBlock:1776 1761 return false; 1777 1762 #if ENABLE(WCSS) … … 5119 5104 case FUNCTION: 5120 5105 case NOTFUNCTION: 5121 case VARCALL:5122 5106 yylval->string.characters = t; 5123 5107 yylval->string.length = length; … … 5190 5174 else if (equalIgnoringCase(ruleName, "@-webkit-mediaquery")) 5191 5175 yyTok = WEBKIT_MEDIAQUERY_SYM; 5192 // FIXME: Add CSS Variables if we ever decide to turn it back on.5193 5176 } 5194 5177 … … 5224 5207 l -= 2; 5225 5208 } 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;5239 5209 break; 5240 5210 default: … … 5460 5430 if (!media || !rules || !m_styleSheet) 5461 5431 return 0; 5462 m_allowImportRules = m_allowNamespaceDeclarations = m_allowVariablesRules =false;5432 m_allowImportRules = m_allowNamespaceDeclarations = false; 5463 5433 RefPtr<CSSMediaRule> rule = CSSMediaRule::create(m_styleSheet, media, rules); 5464 5434 CSSMediaRule* result = rule.get(); … … 5478 5448 WebKitCSSKeyframesRule* CSSParser::createKeyframesRule() 5479 5449 { 5480 m_allowImportRules = m_allowNamespaceDeclarations = m_allowVariablesRules =false;5450 m_allowImportRules = m_allowNamespaceDeclarations = false; 5481 5451 RefPtr<WebKitCSSKeyframesRule> rule = WebKitCSSKeyframesRule::create(m_styleSheet); 5482 5452 WebKitCSSKeyframesRule* rulePtr = rule.get(); … … 5487 5457 CSSRule* CSSParser::createStyleRule(Vector<CSSSelector*>* selectors) 5488 5458 { 5489 m_allowImportRules = m_allowNamespaceDeclarations = m_allowVariablesRules =false;5459 m_allowImportRules = m_allowNamespaceDeclarations = false; 5490 5460 CSSStyleRule* result = 0; 5491 5461 markRuleBodyEnd(); … … 5515 5485 CSSRule* CSSParser::createFontFaceRule() 5516 5486 { 5517 m_allowImportRules = m_allowNamespaceDeclarations = m_allowVariablesRules =false;5487 m_allowImportRules = m_allowNamespaceDeclarations = false; 5518 5488 RefPtr<CSSFontFaceRule> rule = CSSFontFaceRule::create(m_styleSheet); 5519 5489 for (unsigned i = 0; i < m_numParsedProperties; ++i) { … … 5538 5508 return; 5539 5509 m_allowImportRules = false; 5540 m_allowVariablesRules = false;5541 5510 m_styleSheet->addNamespace(this, prefix, uri); 5542 5511 } 5543 5512 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 #else5562 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 05591 m_variableNames.append(String(name));5592 m_variableValues.append(CSSMutableStyleDeclaration::create(0, m_parsedProperties, m_numParsedProperties));5593 clearProperties();5594 #endif5595 return true;5596 }5597 5598 #endif5599 5600 5513 CSSRule* CSSParser::createPageRule(CSSSelector* pageSelector) 5601 5514 { 5602 5515 // FIXME: Margin at-rules are ignored. 5603 m_allowImportRules = m_allowNamespaceDeclarations = m_allowVariablesRules =false;5516 m_allowImportRules = m_allowNamespaceDeclarations = false; 5604 5517 CSSPageRule* pageRule = 0; 5605 5518 if (pageSelector) { … … 5634 5547 rollbackLastProperties(m_numParsedProperties - m_numParsedPropertiesBeforeMarginBox); 5635 5548 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);5703 5549 } 5704 5550 -
trunk/WebCore/css/CSSParser.h
r69196 r72116 46 46 class CSSValue; 47 47 class CSSValueList; 48 class CSSVariablesDeclaration;49 48 class Document; 50 49 class MediaList; … … 162 161 bool parseTransformOrigin(int propId, int& propId1, int& propId2, int& propId3, RefPtr<CSSValue>&, RefPtr<CSSValue>&, RefPtr<CSSValue>&); 163 162 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*);166 163 167 164 int yyparse(); … … 187 184 CSSRule* createStyleRule(Vector<CSSSelector*>* selectors); 188 185 CSSRule* createFontFaceRule(); 189 CSSRule* createVariablesRule(MediaList*, bool variablesKeyword);190 186 CSSRule* createPageRule(CSSSelector* pageSelector); 191 187 CSSRule* createMarginAtRule(CSSSelector::MarginBoxType marginBox); … … 203 199 void addNamespace(const AtomicString& prefix, const AtomicString& uri); 204 200 205 bool addVariable(const CSSParserString&, CSSParserValueList*);206 bool addVariableDeclarationBlock(const CSSParserString&);207 bool checkForVariables(CSSParserValueList*);208 void addUnresolvedProperty(int propId, bool important);209 201 void invalidBlockHit(); 210 202 … … 235 227 bool m_hasFontFaceOnlyValues; 236 228 bool m_hadSyntacticallyValidCSSRule; 237 238 Vector<String> m_variableNames;239 Vector<RefPtr<CSSValue> > m_variableValues;240 229 241 230 AtomicString m_defaultNamespace; … … 271 260 void checkForOrphanedUnits(); 272 261 273 void clearVariables();274 275 262 void deleteFontFaceOnlyValues(); 276 263 … … 300 287 301 288 bool m_allowImportRules; 302 bool m_allowVariablesRules;303 289 bool m_allowNamespaceDeclarations; 304 290 -
trunk/WebCore/css/CSSParserValues.cpp
r45919 r72116 27 27 namespace WebCore { 28 28 29 bool CSSParserValue::isVariable() const30 {31 return unit == CSSPrimitiveValue::CSS_PARSER_VARIABLE_FUNCTION_SYNTAX;32 }33 34 29 CSSParserValueList::~CSSParserValueList() 35 30 { … … 43 38 void CSSParserValueList::addValue(const CSSParserValue& v) 44 39 { 45 if (v.unit == CSSPrimitiveValue::CSS_PARSER_VARIABLE_FUNCTION_SYNTAX) // isVariable() is not inlined. This is hot.46 m_variablesCount++;47 40 m_values.append(v); 48 41 } … … 50 43 void CSSParserValueList::deleteValueAt(unsigned i) 51 44 { 52 if (m_values[i].isVariable())53 m_variablesCount--;54 45 m_values.remove(i); 55 46 } … … 70 61 } else if (unit == CSSParserValue::Function) 71 62 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) 73 64 parsedValue = CSSPrimitiveValue::create(string, (CSSPrimitiveValue::UnitTypes)unit); 74 65 else if (unit >= CSSPrimitiveValue::CSS_NUMBER && unit <= CSSPrimitiveValue::CSS_KHZ) -
trunk/WebCore/css/CSSParserValues.h
r66334 r72116 56 56 int unit; 57 57 58 bool isVariable() const;59 58 60 59 PassRefPtr<CSSValue> createCSSValue(); … … 65 64 CSSParserValueList() 66 65 : m_current(0) 67 , m_variablesCount(0)68 66 { 69 67 } … … 81 79 void clear() { m_values.clear(); } 82 80 83 bool containsVariables() const { return m_variablesCount; }84 85 81 private: 86 82 unsigned m_current; 87 unsigned m_variablesCount;88 83 Vector<CSSParserValue, 4> m_values; 89 84 }; -
trunk/WebCore/css/CSSPrimitiveValue.cpp
r72095 r72116 275 275 case CSS_URI: 276 276 case CSS_ATTR: 277 case CSS_PARSER_VARIABLE_FUNCTION_SYNTAX:278 277 case CSS_PARSER_HEXCOLOR: 279 278 if (m_value.string) … … 524 523 case CSS_ATTR: 525 524 case CSS_URI: 526 case CSS_PARSER_VARIABLE_FUNCTION_SYNTAX:527 525 return m_value.string; 528 526 case CSS_IDENT: … … 542 540 case CSS_ATTR: 543 541 case CSS_URI: 544 case CSS_PARSER_VARIABLE_FUNCTION_SYNTAX:545 542 return m_value.string; 546 543 case CSS_IDENT: … … 824 821 break; 825 822 #endif 826 case CSS_PARSER_VARIABLE_FUNCTION_SYNTAX:827 text = "-webkit-var(";828 text += m_value.string;829 text += ")";830 break;831 823 case CSS_PARSER_OPERATOR: { 832 824 char c = static_cast<char>(m_value.ident); … … 878 870 case CSS_STRING: 879 871 case CSS_URI: 880 case CSS_PARSER_VARIABLE_FUNCTION_SYNTAX:881 872 case CSS_PARSER_HEXCOLOR: 882 873 value.string.characters = const_cast<UChar*>(m_value.string->characters()); -
trunk/WebCore/css/CSSPrimitiveValue.h
r72095 r72116 84 84 CSS_PARSER_OPERATOR = 103, 85 85 CSS_PARSER_INTEGER = 104, 86 CSS_PARSER_VARIABLE_FUNCTION_SYNTAX = 105, 87 CSS_PARSER_HEXCOLOR = 106, 86 CSS_PARSER_HEXCOLOR = 105, 88 87 89 88 // This is used internally for unknown identifiers 90 CSS_PARSER_IDENTIFIER = 10 7,89 CSS_PARSER_IDENTIFIER = 106, 91 90 92 91 // These are from CSS3 Values and Units, but that isn't a finished standard yet 93 CSS_TURN = 10 8,94 CSS_REMS = 10 992 CSS_TURN = 107, 93 CSS_REMS = 108 95 94 }; 96 95 … … 113 112 114 113 unsigned short primitiveType() const { return m_type; } 115 116 bool isVariable() const { return m_type == CSS_PARSER_VARIABLE_FUNCTION_SYNTAX; }117 114 118 115 /* -
trunk/WebCore/css/CSSProperty.cpp
r69220 r72116 30 30 String CSSProperty::cssText() const 31 31 { 32 if (id() == CSSPropertyWebkitVariableDeclarationBlock)33 return m_value->cssText() + ";";34 32 return String(getPropertyName(static_cast<CSSPropertyID>(id()))) + ": " + m_value->cssText() + (isImportant() ? " !important" : "") + "; "; 35 33 } -
trunk/WebCore/css/CSSPropertyNames.in
r71348 r72116 298 298 -webkit-user-modify 299 299 -webkit-user-select 300 -webkit-variable-declaration-block -
trunk/WebCore/css/CSSRule.h
r70335 r72116 47 47 FONT_FACE_RULE, 48 48 PAGE_RULE, 49 VARIABLES_RULE,50 WEBKIT_KEYFRAMES_RULE ,49 // 7 used to be VARIABLES_RULE 50 WEBKIT_KEYFRAMES_RULE = 8, 51 51 WEBKIT_KEYFRAME_RULE 52 52 }; -
trunk/WebCore/css/CSSRule.idl
r52921 r72116 35 35 const unsigned short FONT_FACE_RULE = 5; 36 36 const unsigned short PAGE_RULE = 6; 37 const unsigned short VARIABLES_RULE = 7;38 37 const unsigned short WEBKIT_KEYFRAMES_RULE = 8; 39 38 const unsigned short WEBKIT_KEYFRAME_RULE = 9; -
trunk/WebCore/css/CSSStyleDeclaration.cpp
r65468 r72116 149 149 Vector<CSSProperty> list; 150 150 list.reserveInitialCapacity(length); 151 unsigned variableDependentValueCount = 0;152 151 for (unsigned i = 0; i < length; i++) { 153 152 RefPtr<CSSValue> value = getPropertyCSSValue(set[i]); 154 if (value) { 155 if (value->isVariableDependentValue()) 156 variableDependentValueCount++; 153 if (value) 157 154 list.append(CSSProperty(set[i], value.release(), false)); 158 }159 155 } 160 return CSSMutableStyleDeclaration::create(list , variableDependentValueCount);156 return CSSMutableStyleDeclaration::create(list); 161 157 } 162 158 -
trunk/WebCore/css/CSSStyleSelector.cpp
r71641 r72116 45 45 #include "CSSTimingFunctionValue.h" 46 46 #include "CSSValueList.h" 47 #include "CSSVariableDependentValue.h"48 #include "CSSVariablesDeclaration.h"49 #include "CSSVariablesRule.h"50 47 #include "CachedImage.h" 51 48 #include "Counter.h" … … 572 569 void CSSStyleSelector::addMatchedDeclaration(CSSMutableStyleDeclaration* decl) 573 570 { 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); 655 572 } 656 573 … … 2786 2703 } 2787 2704 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 2805 2705 // ----------------------------------------------------------------- 2806 2706 … … 2909 2809 const CSSFontFaceRule* fontFaceRule = static_cast<CSSFontFaceRule*>(item); 2910 2810 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);2916 2811 } else if (item->isKeyframesRule()) 2917 2812 styleSelector->addKeyframeStyle(static_cast<WebKitCSSKeyframesRule*>(item)); … … 5612 5507 case CSSPropertyWebkitTextDecorationsInEffect: 5613 5508 case CSSPropertyWebkitTextStroke: 5614 case CSSPropertyWebkitVariableDeclarationBlock:5615 5509 return; 5616 5510 #if ENABLE(WCSS) -
trunk/WebCore/css/CSSStyleSelector.h
r70335 r72116 51 51 class CSSStyleSheet; 52 52 class CSSValue; 53 class CSSVariableDependentValue;54 class CSSVariablesRule;55 53 class ContainerNode; 56 54 class DataGridColumn; … … 166 164 void visitedStateChanged(LinkHash visitedHash) { m_checker.visitedStateChanged(visitedHash); } 167 165 168 void addVariables(CSSVariablesRule* variables);169 CSSValue* resolveVariableDependentValue(CSSVariableDependentValue*);170 void resolveVariablesForDeclaration(CSSMutableStyleDeclaration* decl, CSSMutableStyleDeclaration* newDecl, HashSet<String>& usedBlockVariables);171 172 166 void addKeyframeStyle(PassRefPtr<WebKitCSSKeyframesRule> rule); 173 167 void addPageStyle(PassRefPtr<CSSPageRule>); … … 320 314 Vector<CSSMutableStyleDeclaration*> m_additionalAttributeStyleDecls; 321 315 Vector<MediaQueryResult*> m_viewportDependentMediaQueryResults; 322 323 HashMap<String, CSSVariablesRule*> m_variablesMap;324 HashMap<CSSMutableStyleDeclaration*, RefPtr<CSSMutableStyleDeclaration> > m_resolvedVariablesDeclarations;325 316 }; 326 317 -
trunk/WebCore/css/CSSValue.h
r71641 r72116 73 73 #endif 74 74 75 virtual bool isVariableDependentValue() const { return false; }76 75 virtual CSSParserValue parserValue() const { ASSERT_NOT_REACHED(); return CSSParserValue(); } 77 76 -
trunk/WebCore/css/StyleBase.h
r65021 r72116 54 54 virtual bool isKeyframesRule() { return false; } 55 55 virtual bool isMediaRule() { return false; } 56 virtual bool isVariablesRule() { return false; }57 56 virtual bool isPageRule() { return false; } 58 57 -
trunk/WebCore/css/tokenizer.flex
r67158 r72116 42 42 <mediaquery>"only" {yyTok = MEDIA_ONLY; return yyTok;} 43 43 <mediaquery>"and" {yyTok = MEDIA_AND; return yyTok;} 44 <forkeyword>"for" {BEGIN(mediaquery); yyTok = VARIABLES_FOR; return yyTok; }45 44 46 45 {string} {yyTok = STRING; return yyTok;} … … 78 77 "@-webkit-mediaquery" {BEGIN(mediaquery); yyTok = WEBKIT_MEDIAQUERY_SYM; return yyTok; } 79 78 "@-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; }83 79 "@-webkit-keyframes" {yyTok = WEBKIT_KEYFRAMES_SYM; return yyTok; } 84 80 "@-webkit-keyframe-rule" {yyTok = WEBKIT_KEYFRAME_RULE_SYM; return yyTok; } … … 114 110 "url("{w}{string}{w}")" {yyTok = URI; return yyTok;} 115 111 "url("{w}{url}{w}")" {yyTok = URI; return yyTok;} 116 "-webkit-var("{w}{ident}{w}")" { yyTok = VARCALL; return yyTok; }117 112 {ident}"(" {yyTok = FUNCTION; return yyTok;} 118 113 -
trunk/WebCore/page/DOMWindow.idl
r72036 r72116 363 363 attribute CSSStyleRuleConstructor CSSStyleRule; 364 364 365 attribute CSSVariablesRuleConstructor CSSVariablesRule;366 attribute CSSVariablesDeclarationConstructor CSSVariablesDeclaration;367 368 365 attribute CSSStyleDeclarationConstructor CSSStyleDeclaration; 369 366 attribute MediaListConstructor MediaList;
Note: See TracChangeset
for help on using the changeset viewer.