[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
hyatt
hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:40:30 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit b8f15030213ccc8f4378b9b0cced326fc2570230
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon May 5 23:26:52 2003 +0000
Fix for 3247722. Make sure the grammar accepts properties with
no values as declarations (albeit bad ones).
Reviewed by darin
* khtml/css/parser.cpp:
* khtml/css/parser.y:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4279 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d76342b..83d373b 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
2003-05-05 David Hyatt <hyatt at apple.com>
+ Fix for 3247722. Make sure the grammar accepts properties with
+ no values as declarations (albeit bad ones).
+
+ Reviewed by darin
+
+ * khtml/css/parser.cpp:
+ * khtml/css/parser.y:
+
+2003-05-05 David Hyatt <hyatt at apple.com>
+
Fix for 3248587. Refine the crash fix for generated image
content so that we still set the image's intrinsic width
and height properly.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d76342b..83d373b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
2003-05-05 David Hyatt <hyatt at apple.com>
+ Fix for 3247722. Make sure the grammar accepts properties with
+ no values as declarations (albeit bad ones).
+
+ Reviewed by darin
+
+ * khtml/css/parser.cpp:
+ * khtml/css/parser.y:
+
+2003-05-05 David Hyatt <hyatt at apple.com>
+
Fix for 3248587. Refine the crash fix for generated image
content so that we still set the image's intrinsic width
and height properly.
diff --git a/WebCore/khtml/css/parser.cpp b/WebCore/khtml/css/parser.cpp
index 89bee53..1b48e2e 100644
--- a/WebCore/khtml/css/parser.cpp
+++ b/WebCore/khtml/css/parser.cpp
@@ -232,11 +232,11 @@ static const short yyprhs[] = { 0,
215, 218, 223, 232, 234, 236, 238, 240, 242, 244,
246, 248, 251, 255, 262, 264, 267, 269, 273, 275,
279, 284, 288, 294, 299, 304, 311, 317, 320, 327,
- 329, 332, 335, 336, 338, 342, 345, 348, 351, 352,
- 354, 357, 360, 363, 366, 369, 371, 373, 376, 379,
- 382, 385, 388, 391, 394, 397, 400, 403, 406, 409,
- 412, 415, 418, 421, 424, 427, 430, 436, 440, 443,
- 447, 451, 454, 460, 464, 466
+ 329, 333, 336, 339, 340, 342, 346, 349, 352, 355,
+ 356, 358, 361, 364, 367, 370, 373, 375, 377, 380,
+ 383, 386, 389, 392, 395, 398, 401, 404, 407, 410,
+ 413, 416, 419, 422, 425, 428, 431, 434, 440, 444,
+ 447, 451, 455, 458, 464, 468, 470
};
static const short yyrhs[] = { 66,
@@ -272,21 +272,22 @@ static const short yyrhs[] = { 66,
49, 64, 0, 95, 96, 49, 64, 0, 95, 1,
49, 64, 0, 95, 1, 108, 1, 49, 64, 0,
97, 13, 64, 99, 98, 0, 97, 1, 0, 97,
- 13, 64, 1, 99, 98, 0, 98, 0, 11, 64,
- 0, 24, 64, 0, 0, 101, 0, 99, 100, 101,
- 0, 99, 1, 0, 58, 64, 0, 50, 64, 0,
- 0, 102, 0, 80, 102, 0, 10, 64, 0, 11,
- 64, 0, 44, 64, 0, 46, 64, 0, 104, 0,
- 103, 0, 43, 64, 0, 42, 64, 0, 28, 64,
- 0, 29, 64, 0, 30, 64, 0, 31, 64, 0,
- 32, 64, 0, 33, 64, 0, 34, 64, 0, 35,
- 64, 0, 36, 64, 0, 37, 64, 0, 38, 64,
- 0, 39, 64, 0, 40, 64, 0, 26, 64, 0,
- 25, 64, 0, 27, 64, 0, 41, 64, 0, 45,
- 64, 99, 57, 64, 0, 45, 64, 1, 0, 12,
- 64, 0, 59, 1, 107, 0, 59, 1, 49, 0,
- 1, 107, 0, 47, 1, 108, 1, 48, 0, 47,
- 1, 48, 0, 107, 0, 108, 1, 107, 0
+ 13, 64, 1, 99, 98, 0, 98, 0, 97, 13,
+ 64, 0, 11, 64, 0, 24, 64, 0, 0, 101,
+ 0, 99, 100, 101, 0, 99, 1, 0, 58, 64,
+ 0, 50, 64, 0, 0, 102, 0, 80, 102, 0,
+ 10, 64, 0, 11, 64, 0, 44, 64, 0, 46,
+ 64, 0, 104, 0, 103, 0, 43, 64, 0, 42,
+ 64, 0, 28, 64, 0, 29, 64, 0, 30, 64,
+ 0, 31, 64, 0, 32, 64, 0, 33, 64, 0,
+ 34, 64, 0, 35, 64, 0, 36, 64, 0, 37,
+ 64, 0, 38, 64, 0, 39, 64, 0, 40, 64,
+ 0, 26, 64, 0, 25, 64, 0, 27, 64, 0,
+ 41, 64, 0, 45, 64, 99, 57, 64, 0, 45,
+ 64, 1, 0, 12, 64, 0, 59, 1, 107, 0,
+ 59, 1, 49, 0, 1, 107, 0, 47, 1, 108,
+ 1, 48, 0, 47, 1, 48, 0, 107, 0, 108,
+ 1, 107, 0
};
#endif
@@ -303,11 +304,11 @@ static const short yyrline[] = { 0,
632, 656, 662, 670, 674, 677, 680, 683, 686, 691,
693, 696, 702, 708, 716, 720, 725, 728, 734, 742,
746, 749, 755, 761, 766, 772, 780, 803, 807, 815,
- 822, 829, 831, 834, 839, 852, 858, 862, 865, 870,
- 872, 873, 874, 880, 881, 882, 884, 889, 891, 892,
- 893, 894, 895, 896, 897, 898, 899, 900, 901, 902,
- 903, 904, 905, 906, 907, 908, 912, 920, 932, 939,
- 946, 954, 980, 982, 985, 987
+ 820, 827, 834, 836, 839, 844, 857, 863, 867, 870,
+ 875, 877, 878, 879, 885, 886, 887, 889, 894, 896,
+ 897, 898, 899, 900, 901, 902, 903, 904, 905, 906,
+ 907, 908, 909, 910, 911, 912, 913, 917, 925, 937,
+ 944, 951, 959, 985, 987, 990, 992
};
#endif
@@ -343,11 +344,11 @@ static const short yyr1[] = { 0,
89, 90, 90, 91, 91, 91, 91, 91, 91, 92,
92, 93, 93, 93, 94, 94, 94, 94, 94, 95,
95, 95, 95, 95, 95, 95, 96, 96, 96, 96,
- 97, 98, 98, 99, 99, 99, 100, 100, 100, 101,
- 101, 101, 101, 101, 101, 101, 101, 102, 102, 102,
+ 96, 97, 98, 98, 99, 99, 99, 100, 100, 100,
+ 101, 101, 101, 101, 101, 101, 101, 101, 102, 102,
102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
- 102, 102, 102, 102, 102, 102, 103, 103, 104, 105,
- 105, 106, 107, 107, 108, 108
+ 102, 102, 102, 102, 102, 102, 102, 103, 103, 104,
+ 105, 105, 106, 107, 107, 108, 108
};
static const short yyr2[] = { 0,
@@ -361,11 +362,11 @@ static const short yyr2[] = { 0,
2, 4, 8, 1, 1, 1, 1, 1, 1, 1,
1, 2, 3, 6, 1, 2, 1, 3, 1, 3,
4, 3, 5, 4, 4, 6, 5, 2, 6, 1,
- 2, 2, 0, 1, 3, 2, 2, 2, 0, 1,
- 2, 2, 2, 2, 2, 1, 1, 2, 2, 2,
+ 3, 2, 2, 0, 1, 3, 2, 2, 2, 0,
+ 1, 2, 2, 2, 2, 2, 1, 1, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 5, 3, 2, 3,
- 3, 2, 5, 3, 1, 3
+ 2, 2, 2, 2, 2, 2, 2, 5, 3, 2,
+ 3, 3, 2, 5, 3, 1, 3
};
static const short yydefact[] = { 13,
@@ -377,23 +378,23 @@ static const short yydefact[] = { 13,
0, 85, 0, 100, 8, 8, 8, 8, 8, 8,
8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
8, 8, 8, 8, 8, 8, 8, 8, 8, 50,
- 49, 0, 0, 104, 110, 117, 116, 0, 0, 10,
- 144, 145, 0, 14, 82, 0, 8, 70, 0, 0,
+ 49, 0, 0, 105, 111, 118, 117, 0, 0, 10,
+ 145, 146, 0, 14, 82, 0, 8, 70, 0, 0,
54, 8, 8, 57, 8, 8, 0, 58, 0, 65,
- 60, 64, 8, 0, 101, 102, 6, 0, 86, 8,
- 0, 98, 8, 112, 113, 139, 134, 133, 135, 120,
- 121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
- 131, 132, 136, 119, 118, 114, 0, 115, 111, 106,
+ 60, 64, 8, 0, 102, 103, 6, 0, 86, 8,
+ 0, 98, 8, 113, 114, 140, 135, 134, 136, 121,
+ 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
+ 132, 133, 137, 120, 119, 115, 0, 116, 112, 107,
7, 8, 8, 0, 0, 0, 0, 0, 8, 0,
0, 10, 22, 23, 24, 21, 26, 25, 18, 0,
83, 0, 8, 0, 5, 0, 0, 46, 47, 56,
59, 92, 88, 8, 0, 8, 90, 0, 8, 0,
- 138, 0, 108, 107, 105, 29, 28, 30, 31, 8,
- 142, 0, 34, 0, 0, 20, 143, 146, 8, 71,
+ 139, 0, 109, 108, 106, 29, 28, 30, 31, 8,
+ 143, 0, 34, 0, 0, 20, 144, 147, 8, 71,
75, 76, 77, 78, 79, 72, 74, 8, 0, 0,
8, 95, 0, 94, 91, 0, 0, 8, 34, 43,
- 42, 8, 0, 35, 45, 44, 141, 140, 0, 0,
- 51, 93, 8, 0, 97, 137, 0, 0, 41, 37,
+ 42, 8, 0, 35, 45, 44, 142, 141, 0, 0,
+ 51, 93, 8, 0, 97, 138, 0, 0, 41, 37,
8, 8, 84, 81, 80, 8, 96, 99, 27, 39,
0, 0, 0, 36, 73, 38, 8, 40, 0, 0,
0
@@ -410,27 +411,27 @@ static const short yydefgoto[] = { 269,
static const short yypact[] = { 198,
19, -28, -19, 2,-32768,-32768,-32768,-32768, -24, 106,
-32768,-32768,-32768, 84, 84, 84, 149, 120,-32768,-32768,
--32768,-32768, 129, 564, 518,-32768,-32768, 122, 108, 82,
+-32768,-32768, 129, 567, 521,-32768,-32768, 122, 108, 82,
-32768,-32768, 1, 116,-32768,-32768,-32768, 44, 160,-32768,
222, 395,-32768,-32768,-32768,-32768, 70,-32768,-32768, 55,
109, 90, 14,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768, 618, 293,-32768,-32768,-32768,-32768, 159, 111,-32768,
+-32768, 621, 293,-32768,-32768,-32768,-32768, 159, 111,-32768,
-32768,-32768, 145,-32768,-32768, 139,-32768,-32768, 102, 87,
-32768,-32768,-32768,-32768,-32768,-32768, 244, 84, 395,-32768,
84,-32768,-32768, 158, 84, 84,-32768, 153, 114,-32768,
85,-32768,-32768, 84, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
- 84, 84, 84, 84, 84, 84, 428, 84,-32768,-32768,
--32768,-32768,-32768, 589, 192, 92, 150, 175,-32768, 200,
+ 84, 84, 84, 84, 84, 84, 477, 84,-32768,-32768,
+-32768,-32768,-32768, 592, 192, 92, 150, 175,-32768, 200,
204,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 149, 119,
--32768, 129,-32768, 33,-32768, 564, 129, 84, 84,-32768,
- 84, 84, 193,-32768, 205,-32768, 84, 150,-32768, 474,
+-32768, 129,-32768, 33,-32768, 567, 129, 84, 84,-32768,
+ 84, 84, 193,-32768, 205,-32768, 84, 150,-32768, 428,
-32768, 344, 84, 84,-32768,-32768,-32768,-32768,-32768,-32768,
-32768, 201, 103, 214, 250, 149,-32768,-32768,-32768, 84,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 161, 179,
--32768, 84, 259, 84, 84, 589, 242,-32768, 96,-32768,
+-32768, 84, 259, 84, 84, 592, 242,-32768, 96,-32768,
-32768,-32768, 46,-32768,-32768,-32768,-32768,-32768, 18, 23,
-32768, 84,-32768, 242,-32768, 84, 166, 30, 84,-32768,
-32768,-32768,-32768,-32768,-32768,-32768, 84,-32768,-32768, 84,
@@ -447,7 +448,7 @@ static const short yypgoto[] = {-32768,
};
-#define YYLAST 661
+#define YYLAST 664
static const short yytable[] = { 14,
@@ -466,7 +467,7 @@ static const short yytable[] = { 14,
29, 31, 32, 33, 34, 35, 98, 158, 159, 160,
94, 21, 49, 189, 175, 199, 18, 88, 120, 31,
32, 33, 34, 35, -32, 170, 193, 194, 197, 171,
- 201, 26, 27, 203, 18, 91, -87, -103, 183, 155,
+ 201, 26, 27, 203, 18, 91, -87, -104, 183, 155,
104, -8, 186, 208, 36, 18, 207, 210, -8, 161,
-48, -48, -48, -48, -48, 202, 208, 267, 222, 104,
224, 208, 36, 225, 31, 32, 33, 34, 35, -48,
@@ -476,48 +477,48 @@ static const short yytable[] = { 14,
4, 266, 246, 271, 248, -53, 249, 36, -53, 105,
106, 264, -48, 32, 33, 34, 35, 257, 18, 18,
196, 221, 150, 220, 219, 260, 261, 18, 195, 230,
- 262, -109, -109, -109, 31, 32, 33, 34, 35, 109,
- 18, 268, 235, 119, 149, 49, -109, -109, -109, -109,
- -109, -109, -109, -109, -109, -109, -109, -109, -109, -109,
- -109, -109, -109, -109, -109, -109, -109, -109, -103, -103,
- -103, 152, -109, 150, -109, 0, 18, 36, 237, 153,
- 0, 0, -109, -109, -109, 18, 0, 243, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, -109, -109, -109,
- -109, -109, -109, -109, -109, -109, -109, -109, -109, -109,
- -109, -109, -109, -109, -109, -109, -109, -109, -109, 0,
- 151, 0, 152, -109, 150, -109, 0, 0, 0, 0,
- 153, 0, 0, -109, -109, -109, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, -109, -109,
- -109, -109, -109, -109, -109, -109, -109, -109, -109, -109,
- -109, -109, -109, -109, -109, -109, -109, -109, -109, -109,
- 0, 0, 0, 152, -109, 110, -109, -8, 0, 0,
+ 262, -110, -110, -110, 31, 32, 33, 34, 35, 109,
+ 18, 268, 235, 119, 149, 49, -110, -110, -110, -110,
+ -110, -110, -110, -110, -110, -110, -110, -110, -110, -110,
+ -110, -110, -110, -110, -110, -110, -110, -110, -104, -104,
+ -104, 152, -110, 150, -110, 0, 18, 36, 237, 153,
+ 0, 0, -110, -110, -110, 18, 0, 243, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, -110, -110, -110,
+ -110, -110, -110, -110, -110, -110, -110, -110, -110, -110,
+ -110, -110, -110, -110, -110, -110, -110, -110, -110, 0,
+ 151, 0, 152, -110, 150, -110, 0, 0, 0, 0,
+ 153, 0, 0, -110, -110, -110, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, -110, -110,
+ -110, -110, -110, -110, -110, -110, -110, -110, -110, -110,
+ -110, -110, -110, -110, -110, -110, -110, -110, -110, -110,
+ 0, 0, 0, 152, -110, 110, -110, -8, 0, 0,
228, 153, 0, 0, 0, -8, 32, 33, 34, 35,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 191, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 226, 0,
21, 0, 0, 0, 0, 0, 0, 55, 56, 57,
0, -8, 0, 0, -8, -8, -8, 0, -8, 0,
0, -8, 58, 59, 60, 61, 62, 63, 64, 65,
66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
- 76, 77, 78, 79, 226, 0, 21, 0, 80, 0,
- 81, 0, 0, 55, 56, 57, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 58, 59,
- 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
- 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 21, 0, 0, 0, 80, 0, 81, 55, 56, 57,
+ 76, 77, 78, 79, -101, -101, -101, 191, 80, 21,
+ 81, 0, 0, 0, 0, 0, 55, 56, 57, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
- 76, 77, 78, 79, 47, 0, 21, 0, 80, 0,
- 81, 0, 0, 0, 48, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 49, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 55, 56,
- 57, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- -103, -103, -103, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
- 75, 76, 77, 78, 79, 0, 0, 0, 0, 80,
- 0, 81, 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
- 76
+ 0, 58, 59, 60, 61, 62, 63, 64, 65, 66,
+ 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
+ 77, 78, 79, 21, 0, 0, 0, 80, 0, 81,
+ 55, 56, 57, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 58, 59, 60, 61, 62,
+ 63, 64, 65, 66, 67, 68, 69, 70, 71, 72,
+ 73, 74, 75, 76, 77, 78, 79, 47, 0, 21,
+ 0, 80, 0, 81, 0, 0, 0, 48, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 49, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 55, 56, 57, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, -104, -104, -104, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
+ 72, 73, 74, 75, 76, 77, 78, 79, 0, 0,
+ 0, 0, 80, 0, 81, 58, 59, 60, 61, 62,
+ 63, 64, 65, 66, 67, 68, 69, 70, 71, 72,
+ 73, 74, 75, 76
};
static const short yycheck[] = { 5,
@@ -568,26 +569,26 @@ static const short yycheck[] = { 5,
-1, 47, -1, -1, 50, 51, 52, -1, 54, -1,
-1, 57, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, 1, -1, 3, -1, 51, -1,
- 53, -1, -1, 10, 11, 12, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 3, -1, -1, -1, 51, -1, 53, 10, 11, 12,
+ 43, 44, 45, 46, 47, 48, 49, 1, 51, 3,
+ 53, -1, -1, -1, -1, -1, 10, 11, 12, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, 1, -1, 3, -1, 51, -1,
- 53, -1, -1, -1, 11, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 24, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 10, 11,
- 12, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 47, 48, 49, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
- 42, 43, 44, 45, 46, -1, -1, -1, -1, 51,
- -1, 53, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
- 43
+ -1, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+ 44, 45, 46, 3, -1, -1, -1, 51, -1, 53,
+ 10, 11, 12, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 1, -1, 3,
+ -1, 51, -1, 53, -1, -1, -1, 11, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 24, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 10, 11, 12, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 47, 48, 49, 25, 26, 27, 28,
+ 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
+ 39, 40, 41, 42, 43, 44, 45, 46, -1, -1,
+ -1, -1, 51, -1, 53, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43
};
#define YYPURE 1
@@ -1782,29 +1783,36 @@ case 100:
;
break;}
case 101:
-#line 823 "parser.y"
+#line 821 "parser.y"
+{
+ /* div { font-family: } Just reduce away this property with no value. */
+ yyval.ok = false;
+ ;
+ break;}
+case 102:
+#line 828 "parser.y"
{
QString str = qString(yyvsp[-1].string);
yyval.prop_id = getPropertyID( str.lower().latin1(), str.length() );
;
break;}
-case 102:
-#line 830 "parser.y"
+case 103:
+#line 835 "parser.y"
{ yyval.b = true; ;
break;}
-case 103:
-#line 831 "parser.y"
+case 104:
+#line 836 "parser.y"
{ yyval.b = false; ;
break;}
-case 104:
-#line 835 "parser.y"
+case 105:
+#line 840 "parser.y"
{
yyval.valueList = new ValueList;
yyval.valueList->addValue( yyvsp[0].value );
;
break;}
-case 105:
-#line 839 "parser.y"
+case 106:
+#line 844 "parser.y"
{
yyval.valueList = yyvsp[-2].valueList;
if ( yyval.valueList ) {
@@ -1819,45 +1827,45 @@ case 105:
}
;
break;}
-case 106:
-#line 852 "parser.y"
+case 107:
+#line 857 "parser.y"
{
delete yyvsp[-1].valueList;
yyval.valueList = 0;
;
break;}
-case 107:
-#line 859 "parser.y"
+case 108:
+#line 864 "parser.y"
{
yyval.tok = '/';
;
break;}
-case 108:
-#line 862 "parser.y"
+case 109:
+#line 867 "parser.y"
{
yyval.tok = ',';
;
break;}
-case 109:
-#line 865 "parser.y"
+case 110:
+#line 870 "parser.y"
{
yyval.tok = 0;
;
break;}
-case 110:
-#line 871 "parser.y"
+case 111:
+#line 876 "parser.y"
{ yyval.value = yyvsp[0].value; ;
break;}
-case 111:
-#line 872 "parser.y"
+case 112:
+#line 877 "parser.y"
{ yyval.value = yyvsp[0].value; yyval.value.fValue *= yyvsp[-1].val; ;
break;}
-case 112:
-#line 873 "parser.y"
+case 113:
+#line 878 "parser.y"
{ yyval.value.id = 0; yyval.value.string = yyvsp[-1].string; yyval.value.unit = CSSPrimitiveValue::CSS_STRING; ;
break;}
-case 113:
-#line 874 "parser.y"
+case 114:
+#line 879 "parser.y"
{
QString str = qString( yyvsp[-1].string );
yyval.value.id = getValueID( str.lower().latin1(), str.length() );
@@ -1865,102 +1873,102 @@ case 113:
yyval.value.string = yyvsp[-1].string;
;
break;}
-case 114:
-#line 880 "parser.y"
+case 115:
+#line 885 "parser.y"
{ yyval.value.id = 0; yyval.value.string = yyvsp[-1].string; yyval.value.unit = CSSPrimitiveValue::CSS_URI; ;
break;}
-case 115:
-#line 881 "parser.y"
+case 116:
+#line 886 "parser.y"
{ yyval.value.id = 0; yyval.value.iValue = 0; yyval.value.unit = CSSPrimitiveValue::CSS_UNKNOWN;/* ### */ ;
break;}
-case 116:
-#line 882 "parser.y"
+case 117:
+#line 887 "parser.y"
{ yyval.value.id = 0; yyval.value.string = yyvsp[0].string; yyval.value.unit = CSSPrimitiveValue::CSS_RGBCOLOR; ;
break;}
-case 117:
-#line 884 "parser.y"
+case 118:
+#line 889 "parser.y"
{
yyval.value = yyvsp[0].value;
;
break;}
-case 118:
-#line 890 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_NUMBER; ;
- break;}
case 119:
-#line 891 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PERCENTAGE; ;
+#line 895 "parser.y"
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_NUMBER; ;
break;}
case 120:
-#line 892 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PX; ;
+#line 896 "parser.y"
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PERCENTAGE; ;
break;}
case 121:
-#line 893 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_CM; ;
+#line 897 "parser.y"
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PX; ;
break;}
case 122:
-#line 894 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_MM; ;
+#line 898 "parser.y"
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_CM; ;
break;}
case 123:
-#line 895 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_IN; ;
+#line 899 "parser.y"
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_MM; ;
break;}
case 124:
-#line 896 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PT; ;
+#line 900 "parser.y"
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_IN; ;
break;}
case 125:
-#line 897 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PC; ;
+#line 901 "parser.y"
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PT; ;
break;}
case 126:
-#line 898 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_DEG; ;
+#line 902 "parser.y"
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PC; ;
break;}
case 127:
-#line 899 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_RAD; ;
+#line 903 "parser.y"
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_DEG; ;
break;}
case 128:
-#line 900 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_GRAD; ;
+#line 904 "parser.y"
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_RAD; ;
break;}
case 129:
-#line 901 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_MS; ;
+#line 905 "parser.y"
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_GRAD; ;
break;}
case 130:
-#line 902 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_S; ;
+#line 906 "parser.y"
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_MS; ;
break;}
case 131:
-#line 903 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_HZ; ;
+#line 907 "parser.y"
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_S; ;
break;}
case 132:
-#line 904 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_KHZ; ;
+#line 908 "parser.y"
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_HZ; ;
break;}
case 133:
-#line 905 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_EMS; ;
+#line 909 "parser.y"
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_KHZ; ;
break;}
case 134:
-#line 906 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = Value::Q_EMS; ;
+#line 910 "parser.y"
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_EMS; ;
break;}
case 135:
-#line 907 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_EXS; ;
+#line 911 "parser.y"
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = Value::Q_EMS; ;
break;}
case 136:
-#line 908 "parser.y"
-{ yyval.value.id = 0; yyval.value.string = yyvsp[-1].string; yyval.value.unit = CSSPrimitiveValue::CSS_DIMENSION ;
+#line 912 "parser.y"
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_EXS; ;
break;}
case 137:
#line 913 "parser.y"
+{ yyval.value.id = 0; yyval.value.string = yyvsp[-1].string; yyval.value.unit = CSSPrimitiveValue::CSS_DIMENSION ;
+ break;}
+case 138:
+#line 918 "parser.y"
{
Function *f = new Function;
f->name = yyvsp[-4].string;
@@ -1970,20 +1978,20 @@ case 137:
yyval.value.function = f;
;
break;}
-case 138:
-#line 921 "parser.y"
+case 139:
+#line 926 "parser.y"
{
yyval.value.id = 0;
yyval.value.unit = Value::Function;
yyval.value.function = 0;
;
break;}
-case 139:
-#line 933 "parser.y"
+case 140:
+#line 938 "parser.y"
{ yyval.string = yyvsp[-1].string; ;
break;}
-case 140:
-#line 940 "parser.y"
+case 141:
+#line 945 "parser.y"
{
yyval.rule = 0;
#ifdef CSS_DEBUG
@@ -1991,8 +1999,8 @@ case 140:
#endif
;
break;}
-case 141:
-#line 946 "parser.y"
+case 142:
+#line 951 "parser.y"
{
yyval.rule = 0;
#ifdef CSS_DEBUG
@@ -2000,8 +2008,8 @@ case 141:
#endif
;
break;}
-case 142:
-#line 955 "parser.y"
+case 143:
+#line 960 "parser.y"
{
yyval.rule = 0;
#ifdef CSS_DEBUG
@@ -2231,6 +2239,6 @@ yyerrhandle:
}
return 1;
}
-#line 990 "parser.y"
+#line 995 "parser.y"
diff --git a/WebCore/khtml/css/parser.y b/WebCore/khtml/css/parser.y
index 0cd5909..3e7cc41 100644
--- a/WebCore/khtml/css/parser.y
+++ b/WebCore/khtml/css/parser.y
@@ -817,6 +817,11 @@ declaration:
/* Handle this case: div { text-align: center; !important } Just reduce away the stray !important. */
$$ = false;
}
+ |
+ property ':' maybe_space {
+ /* div { font-family: } Just reduce away this property with no value. */
+ $$ = false;
+ }
;
property:
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list