[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:31:13 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 409ee4d938adc51a96ece090234d882fda1253f1
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Mar 24 18:58:19 2003 +0000
Add error-handling case to deal with a common CSS malformation:
clip: rect( )
The bug is 3206171.
Reviewed by darin
* khtml/css/parser.cpp:
* khtml/css/parser.y:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3905 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a27652c..d120235 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2003-03-24 David Hyatt <hyatt at apple.com>
+
+ Add error-handling case to deal with a common CSS malformation:
+
+ clip: rect( )
+
+ The bug is 3206171.
+
+ Reviewed by darin
+
+ * khtml/css/parser.cpp:
+ * khtml/css/parser.y:
+
2003-03-22 Darin Adler <darin at apple.com>
Reviewed by John.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a27652c..d120235 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2003-03-24 David Hyatt <hyatt at apple.com>
+
+ Add error-handling case to deal with a common CSS malformation:
+
+ clip: rect( )
+
+ The bug is 3206171.
+
+ Reviewed by darin
+
+ * khtml/css/parser.cpp:
+ * khtml/css/parser.y:
+
2003-03-22 Darin Adler <darin at apple.com>
Reviewed by John.
diff --git a/WebCore/khtml/css/parser.cpp b/WebCore/khtml/css/parser.cpp
index 42f7244..81e405f 100644
--- a/WebCore/khtml/css/parser.cpp
+++ b/WebCore/khtml/css/parser.cpp
@@ -181,7 +181,7 @@ static int cssyylex( YYSTYPE *yylval ) {
-#define YYFINAL 261
+#define YYFINAL 262
#define YYFLAG -32768
#define YYNTBASE 60
@@ -235,8 +235,8 @@ static const short yyprhs[] = { 0,
321, 325, 328, 331, 334, 335, 337, 340, 343, 346,
349, 352, 354, 356, 359, 362, 365, 368, 371, 374,
377, 380, 383, 386, 389, 392, 395, 398, 401, 404,
- 407, 410, 413, 419, 422, 426, 430, 433, 439, 443,
- 445
+ 407, 410, 413, 419, 423, 426, 430, 434, 437, 443,
+ 447, 449
};
static const short yyrhs[] = { 66,
@@ -281,10 +281,11 @@ static const short yyrhs[] = { 66,
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, 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
+ 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
@@ -304,8 +305,8 @@ static const short yyrline[] = { 0,
814, 827, 833, 837, 840, 845, 847, 848, 849, 855,
856, 857, 859, 864, 866, 867, 868, 869, 870, 871,
872, 873, 874, 875, 876, 877, 878, 879, 880, 881,
- 882, 883, 887, 902, 909, 916, 924, 950, 952, 955,
- 957
+ 882, 883, 887, 895, 907, 914, 921, 929, 955, 957,
+ 960, 962
};
#endif
@@ -344,8 +345,8 @@ static const short yyr1[] = { 0,
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, 102, 103, 104, 105, 105, 106, 107, 107, 108,
- 108
+ 102, 102, 103, 103, 104, 105, 105, 106, 107, 107,
+ 108, 108
};
static const short yyr2[] = { 0,
@@ -362,8 +363,8 @@ static const short yyr2[] = { 0,
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, 2, 5, 2, 3, 3, 2, 5, 3, 1,
- 3
+ 2, 2, 5, 3, 2, 3, 3, 2, 5, 3,
+ 1, 3
};
static const short yydefact[] = { 13,
@@ -375,131 +376,136 @@ static const short yydefact[] = { 13,
85, 0, 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, 100, 106, 113, 112, 0, 0, 10, 139, 140,
+ 0, 100, 106, 113, 112, 0, 0, 10, 140, 141,
0, 14, 82, 0, 8, 70, 0, 0, 54, 8,
8, 57, 8, 8, 0, 58, 0, 65, 60, 64,
8, 0, 97, 6, 0, 86, 8, 8, 108, 109,
- 134, 130, 129, 131, 116, 117, 118, 119, 120, 121,
+ 135, 130, 129, 131, 116, 117, 118, 119, 120, 121,
122, 123, 124, 125, 126, 127, 128, 132, 115, 114,
110, 0, 111, 107, 102, 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, 91, 88, 8, 0,
- 8, 90, 0, 0, 104, 103, 101, 29, 28, 30,
- 31, 8, 137, 0, 34, 0, 0, 20, 138, 141,
- 8, 71, 75, 76, 77, 78, 79, 72, 74, 8,
- 0, 0, 8, 94, 0, 93, 0, 8, 34, 43,
- 42, 8, 0, 35, 45, 44, 136, 135, 0, 0,
- 51, 92, 8, 8, 96, 133, 0, 0, 41, 37,
- 8, 8, 84, 81, 80, 8, 95, 98, 27, 39,
- 0, 0, 0, 36, 73, 38, 8, 40, 0, 0,
- 0
+ 8, 90, 0, 134, 0, 104, 103, 101, 29, 28,
+ 30, 31, 8, 138, 0, 34, 0, 0, 20, 139,
+ 142, 8, 71, 75, 76, 77, 78, 79, 72, 74,
+ 8, 0, 0, 8, 94, 0, 93, 0, 8, 34,
+ 43, 42, 8, 0, 35, 45, 44, 137, 136, 0,
+ 0, 51, 92, 8, 8, 96, 133, 0, 0, 41,
+ 37, 8, 8, 84, 81, 80, 8, 95, 98, 27,
+ 39, 0, 0, 0, 36, 73, 38, 8, 40, 0,
+ 0, 0
};
-static const short yydefgoto[] = { 259,
+static const short yydefgoto[] = { 260,
5, 6, 7, 10, 17, 8, 28, 87, 157, 88,
- 192, 237, 223, 158, 253, 224, 159, 160, 105, 80,
+ 193, 238, 224, 158, 254, 225, 159, 160, 105, 80,
37, 38, 39, 40, 41, 42, 43, 44, 169, 45,
- 210, 246, 46, 49, 50, 51, 52, 235, 81, 149,
+ 211, 247, 46, 49, 50, 51, 52, 236, 81, 149,
82, 83, 84, 85, 162, 163, 90, 91
};
-static const short yypact[] = { 118,
+static const short yypact[] = { 204,
17, -21, -3, 39,-32768,-32768,-32768,-32768, 58, 98,
--32768,-32768,-32768, 94, 94, 94, 162, 144,-32768,-32768,
--32768,-32768, 121, 13, 434,-32768,-32768, 135, 130, 31,
--32768,-32768, 2, 108,-32768,-32768,-32768, 32, 382,-32768,
- 185, 168,-32768,-32768,-32768,-32768, 62,-32768, 113, 99,
- 124, 172,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768, 94, 94, 94, 174, 118,-32768,-32768,
+-32768,-32768, 121, 13, 463,-32768,-32768, 124, 154, 31,
+-32768,-32768, 2, 141,-32768,-32768,-32768, 32, 153,-32768,
+ 234, 386,-32768,-32768,-32768,-32768, 62,-32768, 107, 99,
+ 112, 160,-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, 379,
- 283,-32768,-32768,-32768,-32768, 157, 103,-32768,-32768,-32768,
- 192,-32768,-32768, 200,-32768,-32768, 8, 89,-32768,-32768,
--32768,-32768,-32768,-32768, 114, 94, 168,-32768, 94,-32768,
--32768, 202, 94,-32768, 101, 175,-32768,-32768, 94, 94,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 529,
+ 284,-32768,-32768,-32768,-32768, 150, 103,-32768,-32768,-32768,
+ 185,-32768,-32768, 179,-32768,-32768, 8, 89,-32768,-32768,
+-32768,-32768,-32768,-32768, 115, 94, 386,-32768, 94,-32768,
+-32768, 198, 94,-32768, 76, 159,-32768,-32768, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 434, 94,-32768,-32768,-32768,-32768,-32768, 471, 137,
- 120, 179, 226,-32768, 229, 230,-32768,-32768,-32768,-32768,
--32768,-32768,-32768, 162, 159,-32768, 121,-32768, 33,-32768,
- 13, 121, 94, 94,-32768, 94, 94, 145,-32768, 231,
--32768, 94, 434, 334, 94, 94,-32768,-32768,-32768,-32768,
--32768,-32768,-32768, 155, 20, 163, 167, 162,-32768,-32768,
--32768, 94,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
- 186, 388,-32768, 94, 174, 94, 232,-32768, 82,-32768,
--32768,-32768, 44,-32768,-32768,-32768,-32768,-32768, 19, 18,
--32768, 94,-32768,-32768,-32768, 94, 189, 34, 94,-32768,
--32768,-32768,-32768,-32768,-32768,-32768, 94, 94,-32768, 94,
- 20, 22, 141,-32768,-32768,-32768,-32768, 94, 235, 239,
--32768
+ 94, 419, 94,-32768,-32768,-32768,-32768,-32768, 500, 92,
+ 135, 166, 214,-32768, 216, 221,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768, 174, 164,-32768, 121,-32768, 33,-32768,
+ 13, 121, 94, 94,-32768, 94, 94, 101,-32768, 227,
+-32768, 94, 463,-32768, 335, 94, 94,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768, 109, 20, 138, 146, 174,-32768,
+-32768,-32768, 94,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768, 183, 169,-32768, 94, 149, 94, 233,-32768, 82,
+-32768,-32768,-32768, 44,-32768,-32768,-32768,-32768,-32768, 19,
+ 18,-32768, 94,-32768,-32768,-32768, 94, 184, 34, 94,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768, 94, 94,-32768,
+ 94, 20, 22, 290,-32768,-32768,-32768,-32768, 94, 232,
+ 235,-32768
};
static const short yypgoto[] = {-32768,
-32768,-32768,-32768, -5, -79,-32768,-32768,-32768,-32768,-32768,
--32768,-32768, 21,-32768,-32768, -4,-32768,-32768,-32768,-32768,
- -83,-32768, 73, -93,-32768, 205, -32,-32768,-32768,-32768,
--32768,-32768,-32768, 77,-32768, 199,-32768,-32768, -96,-32768,
- 102, 170,-32768,-32768,-32768,-32768, -6, -42
+-32768,-32768, 16,-32768,-32768, -13,-32768,-32768,-32768,-32768,
+ -83,-32768, 68, -93,-32768, 200, -32,-32768,-32768,-32768,
+-32768,-32768,-32768, 79,-32768, 201,-32768,-32768, -96,-32768,
+ 105, 172,-32768,-32768,-32768,-32768, -6, -42
};
-#define YYLAST 524
+#define YYLAST 572
static const short yytable[] = { 14,
15, 16, 20, 161, 112, 23, 24, 25, 164, 110,
21, 175, 93, 47, 94, 21, 30, 9, 168, -8,
- 21, 21, 21, 48, 21, 11, -8, 244, 245, 97,
- 222, 98, 99, 21, 240, 106, 109, 203, 204, 205,
- 206, 207, 113, 12, 240, 184, 95, 119, 120, 121,
+ 21, 21, 21, 48, 21, 11, -8, 245, 246, 97,
+ 223, 98, 99, 21, 241, 106, 109, 204, 205, 206,
+ 207, 208, 113, 12, 241, 185, 95, 119, 120, 121,
122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
- 142, 143, 180, 201, 110, 243, 255, 198, 100, 92,
- 151, 101, -33, 242, 21, 13, 217, 208, 209, 167,
- 241, 21, 222, 242, 171, 172, 21, 173, 174, 115,
+ 142, 143, 180, 202, 110, 244, 256, 199, 100, 92,
+ 151, 101, -33, 243, 21, 13, 218, 209, 210, 167,
+ 242, 21, 223, 243, 171, 172, 21, 173, 174, 115,
21, 176, -1, 152, 18, 177, 19, 22, 18, 48,
- 111, 182, 183, 31, 32, 33, 34, 35, 96, 153,
- 154, 155, 21, 21, 31, 32, 33, 34, 35, 190,
- -32, 31, 32, 33, 34, 35, 170, 1, 2, 3,
- 4, 185, 186, 189, 29, 193, -87, 18, 195, 179,
- 86, 31, 32, 33, 34, 35, 36, 150, 200, -8,
- 114, 156, 202, 191, 26, 27, -8, 36, 108, 257,
- -8, 200, 117, 214, 36, 216, 18, 89, -8, 32,
- 33, 34, 35, 18, 118, 188, 219, 221, 256, 226,
- 228, 18, 165, 213, 36, 229, 32, 33, 34, 35,
- -8, 18, 178, 220, 230, 18, 199, 232, 200, 18,
- 166, 225, 236, 18, -8, 227, 239, -8, -8, -8,
- 18, -8, 233, 181, -8, 18, 194, 247, 248, 196,
- 197, 215, 145, 231, 260, 250, 251, 249, 261, 238,
- 252, -105, -105, -105, 212, 107, 254, 211, 116, 144,
- 187, 258, 0, 0, 0, 234, -105, -105, -105, -105,
- -105, -105, -105, -105, -105, -105, -105, -105, -105, -105,
- -105, -105, -105, -105, -105, -105, -105, -105, 0, -99,
- -99, 147, -105, 145, -105, 0, 0, 0, 0, 148,
- 0, 0, -105, -105, -105, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, -105, -105, -105,
+ 111, 182, 183, 31, 32, 33, 34, 35, 29, 153,
+ 154, 155, 18, 21, 179, 31, 32, 33, 34, 35,
+ -32, 31, 32, 33, 34, 35, 170, 21, 18, 86,
+ 189, 186, 187, 190, 191, 194, -87, 18, 196, 214,
+ 150, 96, -8, 102, 114, 18, 36, 221, 201, -8,
+ 117, 156, 203, -48, -48, -48, -48, -48, 36, 102,
+ 258, 201, 118, 215, 36, 217, 26, 27, 192, -48,
+ -48, -48, -48, -48, 18, 165, 226, 220, 222, 166,
+ 227, 229, 18, -8, 228, 18, 230, 234, 178, -52,
+ 18, 89, -52, 103, 104, 231, -48, 181, 233, 201,
+ 18, 200, 18, 237, 195, -53, 197, 240, -53, 103,
+ 104, 198, -48, 1, 2, 3, 4, 216, 248, 249,
+ 232, 261, 250, 145, 262, 239, 251, 252, 255, 213,
+ 107, 253, -105, -105, -105, 32, 33, 34, 35, 212,
+ 116, 144, 259, 188, 0, 0, 235, -105, -105, -105,
-105, -105, -105, -105, -105, -105, -105, -105, -105, -105,
-105, -105, -105, -105, -105, -105, -105, -105, -105, 0,
- 146, 0, 147, -105, 145, -105, 0, 0, 0, 0,
+ -99, -99, 147, -105, 145, -105, 0, 0, 0, 0,
148, 0, 0, -105, -105, -105, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, -105, -105,
+ 31, 32, 33, 34, 35, 0, 0, 0, -105, -105,
+ -105, -105, -105, -105, -105, -105, -105, -105, -105, -105,
+ -105, -105, -105, -105, -105, -105, -105, -105, -105, -105,
+ 0, 146, 0, 147, -105, 145, -105, 257, 0, 0,
+ 0, 148, 0, 36, -105, -105, -105, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, -105,
-105, -105, -105, -105, -105, -105, -105, -105, -105, -105,
-105, -105, -105, -105, -105, -105, -105, -105, -105, -105,
- 0, 0, 102, 147, -105, 0, -105, 0, 102, 0,
- 218, 148, -48, -48, -48, -48, -48, 0, -48, -48,
- -48, -48, -48, 56, 57, 58, 59, 60, 61, 62,
+ -105, 0, 0, 0, 147, -105, 108, -105, -8, 0,
+ 0, 219, 148, 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, 184,
+ 0, 21, 0, 0, 0, 0, 0, 0, 53, 54,
+ 55, 0, -8, 0, 0, -8, -8, -8, 0, -8,
+ 0, 0, -8, 56, 57, 58, 59, 60, 61, 62,
63, 64, 65, 66, 67, 68, 69, 70, 71, 72,
- 73, 74, 0, 0, 0, 0, 0, 0, -52, 0,
- 0, -52, 103, 104, -53, -48, 21, -53, 103, 104,
- 0, -48, 0, 53, 54, 55, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 56, 57,
- 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
- 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
- 53, 54, 55, 0, 78, 0, 79, 0, 0, 0,
- 0, 0, 0, 0, 0, 56, 57, 58, 59, 60,
- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
- 71, 72, 73, 74, 75, 76, 77, 0, 0, 0,
- 0, 78, 0, 79
+ 73, 74, 75, 76, 77, 21, 0, 0, 0, 78,
+ 0, 79, 53, 54, 55, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 56, 57, 58,
+ 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
+ 69, 70, 71, 72, 73, 74, 75, 76, 77, 53,
+ 54, 55, 0, 78, 0, 79, 0, 0, 0, 0,
+ 0, 0, 0, 0, 56, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
+ 72, 73, 74, 75, 76, 77, 0, 0, 0, 0,
+ 78, 0, 79, 56, 57, 58, 59, 60, 61, 62,
+ 63, 64, 65, 66, 67, 68, 69, 70, 71, 72,
+ 73, 74
};
static const short yycheck[] = { 5,
@@ -514,48 +520,53 @@ static const short yycheck[] = { 5,
86, 50, 49, 50, 3, 47, 183, 55, 56, 95,
47, 3, 11, 50, 100, 101, 3, 103, 104, 1,
3, 107, 0, 1, 47, 111, 49, 10, 47, 11,
- 49, 117, 118, 11, 12, 13, 14, 15, 11, 17,
- 18, 19, 3, 3, 11, 12, 13, 14, 15, 10,
- 49, 11, 12, 13, 14, 15, 48, 20, 21, 22,
- 23, 147, 148, 150, 1, 152, 48, 47, 154, 49,
- 16, 11, 12, 13, 14, 15, 54, 1, 165, 3,
- 48, 59, 168, 44, 3, 4, 10, 54, 1, 253,
- 3, 178, 49, 179, 54, 181, 47, 48, 11, 12,
- 13, 14, 15, 47, 13, 49, 192, 194, 48, 196,
- 197, 47, 1, 49, 54, 201, 12, 13, 14, 15,
- 44, 47, 1, 49, 210, 47, 48, 213, 215, 47,
- 11, 49, 218, 47, 47, 49, 222, 50, 51, 52,
- 47, 54, 49, 49, 57, 47, 1, 233, 234, 1,
- 1, 1, 1, 48, 0, 241, 242, 49, 0, 219,
- 246, 10, 11, 12, 172, 41, 251, 171, 50, 80,
- 149, 257, -1, -1, -1, 24, 25, 26, 27, 28,
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, 46, -1, 48,
- 49, 50, 51, 1, 53, -1, -1, -1, -1, 58,
- -1, -1, 10, 11, 12, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 25, 26, 27,
+ 49, 117, 118, 11, 12, 13, 14, 15, 1, 17,
+ 18, 19, 47, 3, 49, 11, 12, 13, 14, 15,
+ 49, 11, 12, 13, 14, 15, 48, 3, 47, 16,
+ 49, 147, 148, 150, 10, 152, 48, 47, 154, 49,
+ 1, 11, 3, 1, 48, 47, 54, 49, 165, 10,
+ 49, 59, 168, 11, 12, 13, 14, 15, 54, 1,
+ 254, 178, 13, 179, 54, 181, 3, 4, 44, 11,
+ 12, 13, 14, 15, 47, 1, 49, 193, 195, 11,
+ 197, 198, 47, 44, 49, 47, 202, 49, 1, 47,
+ 47, 48, 50, 51, 52, 211, 54, 49, 214, 216,
+ 47, 48, 47, 219, 1, 47, 1, 223, 50, 51,
+ 52, 1, 54, 20, 21, 22, 23, 1, 234, 235,
+ 48, 0, 49, 1, 0, 220, 242, 243, 252, 172,
+ 41, 247, 10, 11, 12, 12, 13, 14, 15, 171,
+ 50, 80, 258, 149, -1, -1, 24, 25, 26, 27,
28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, -1,
- 48, -1, 50, 51, 1, 53, -1, -1, -1, -1,
+ 48, 49, 50, 51, 1, 53, -1, -1, -1, -1,
58, -1, -1, 10, 11, 12, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 25, 26,
+ 11, 12, 13, 14, 15, -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, 1, 50, 51, -1, 53, -1, 1, -1,
- 57, 58, 11, 12, 13, 14, 15, -1, 11, 12,
- 13, 14, 15, 25, 26, 27, 28, 29, 30, 31,
+ -1, 48, -1, 50, 51, 1, 53, 48, -1, -1,
+ -1, 58, -1, 54, 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, -1, 50, 51, 1, 53, 3, -1,
+ -1, 57, 58, -1, -1, -1, 11, 12, 13, 14,
+ 15, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 1,
+ -1, 3, -1, -1, -1, -1, -1, -1, 10, 11,
+ 12, -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, -1, -1, -1, -1, -1, -1, 47, -1,
- -1, 50, 51, 52, 47, 54, 3, 50, 51, 52,
- -1, 54, -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,
- 10, 11, 12, -1, 51, -1, 53, -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, -1,
- -1, 51, -1, 53
+ 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, 10,
+ 11, 12, -1, 51, -1, 53, -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, -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
@@ -1905,11 +1916,19 @@ case 133:
;
break;}
case 134:
-#line 903 "parser.y"
-{ yyval.string = yyvsp[-1].string; ;
+#line 896 "parser.y"
+{
+ yyval.value.id = 0;
+ yyval.value.unit = Value::Function;
+ yyval.value.function = 0;
+ ;
break;}
case 135:
-#line 910 "parser.y"
+#line 908 "parser.y"
+{ yyval.string = yyvsp[-1].string; ;
+ break;}
+case 136:
+#line 915 "parser.y"
{
yyval.rule = 0;
#ifdef CSS_DEBUG
@@ -1917,8 +1936,8 @@ case 135:
#endif
;
break;}
-case 136:
-#line 916 "parser.y"
+case 137:
+#line 921 "parser.y"
{
yyval.rule = 0;
#ifdef CSS_DEBUG
@@ -1926,8 +1945,8 @@ case 136:
#endif
;
break;}
-case 137:
-#line 925 "parser.y"
+case 138:
+#line 930 "parser.y"
{
yyval.rule = 0;
#ifdef CSS_DEBUG
@@ -2157,6 +2176,6 @@ yyerrhandle:
}
return 1;
}
-#line 960 "parser.y"
+#line 965 "parser.y"
diff --git a/WebCore/khtml/css/parser.y b/WebCore/khtml/css/parser.y
index 01abd68..5e79150 100644
--- a/WebCore/khtml/css/parser.y
+++ b/WebCore/khtml/css/parser.y
@@ -892,6 +892,11 @@ function:
$$.id = 0;
$$.unit = Value::Function;
$$.function = f;
+ } |
+ FUNCTION maybe_space error {
+ $$.id = 0;
+ $$.unit = Value::Function;
+ $$.function = 0;
}
;
/*
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list