[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:35:18 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 6b55e02eb12b4255a4e2f9647d3218809ef67ed4
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Apr 8 19:04:29 2003 +0000
Fix for 3220979. Regression caused by changes to the CSS
parser's error handling. Fix is to narrow my original patch
to handle a specific subtype of error for properties.
Reviewed by darin
* khtml/css/parser.cpp:
* khtml/css/parser.y:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4044 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7e4786d..4a01a19 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-04-08 David Hyatt <hyatt at apple.com>
+
+ Fix for 3220979. Regression caused by changes to the CSS
+ parser's error handling. Fix is to narrow my original patch
+ to handle a specific subtype of error for properties.
+
+ Reviewed by darin
+
+ * khtml/css/parser.cpp:
+ * khtml/css/parser.y:
+
2003-04-08 Richard Williamson <rjw at apple.com>
Fixed 3221353. Added check for nil part.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7e4786d..4a01a19 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-04-08 David Hyatt <hyatt at apple.com>
+
+ Fix for 3220979. Regression caused by changes to the CSS
+ parser's error handling. Fix is to narrow my original patch
+ to handle a specific subtype of error for properties.
+
+ Reviewed by darin
+
+ * khtml/css/parser.cpp:
+ * khtml/css/parser.y:
+
2003-04-08 Richard Williamson <rjw at apple.com>
Fixed 3221353. Added check for nil part.
diff --git a/WebCore/khtml/css/parser.cpp b/WebCore/khtml/css/parser.cpp
index becbadd..7dc6791 100644
--- a/WebCore/khtml/css/parser.cpp
+++ b/WebCore/khtml/css/parser.cpp
@@ -181,7 +181,7 @@ static int cssyylex( YYSTYPE *yylval ) {
-#define YYFINAL 262
+#define YYFINAL 263
#define YYFLAG -32768
#define YYNTBASE 60
@@ -231,12 +231,12 @@ static const short yyprhs[] = { 0,
192, 194, 196, 198, 201, 204, 206, 208, 210, 212,
215, 218, 223, 232, 234, 236, 238, 240, 242, 244,
246, 248, 251, 255, 262, 264, 267, 269, 273, 275,
- 279, 283, 289, 294, 299, 306, 312, 314, 317, 320,
- 321, 323, 327, 330, 333, 336, 337, 339, 342, 345,
- 348, 351, 354, 356, 358, 361, 364, 367, 370, 373,
- 376, 379, 382, 385, 388, 391, 394, 397, 400, 403,
- 406, 409, 412, 415, 421, 425, 428, 432, 436, 439,
- 445, 449, 451
+ 279, 283, 289, 294, 299, 306, 312, 315, 318, 321,
+ 322, 324, 328, 331, 334, 337, 338, 340, 343, 346,
+ 349, 352, 355, 357, 359, 362, 365, 368, 371, 374,
+ 377, 380, 383, 386, 389, 392, 395, 398, 401, 404,
+ 407, 410, 413, 416, 422, 426, 429, 433, 437, 440,
+ 446, 450, 452
};
static const short yyrhs[] = { 66,
@@ -271,21 +271,21 @@ static const short yyrhs[] = { 66,
64, 0, 1, 108, 1, 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, 1, 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
+ 0, 97, 1, 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
@@ -359,7 +359,7 @@ static const short yyr2[] = { 0,
1, 1, 1, 2, 2, 1, 1, 1, 1, 2,
2, 4, 8, 1, 1, 1, 1, 1, 1, 1,
1, 2, 3, 6, 1, 2, 1, 3, 1, 3,
- 3, 5, 4, 4, 6, 5, 1, 2, 2, 0,
+ 3, 5, 4, 4, 6, 5, 2, 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,
@@ -379,194 +379,194 @@ static const short yydefact[] = { 13,
0, 101, 107, 114, 113, 0, 0, 10, 141, 142,
0, 14, 82, 0, 8, 70, 0, 0, 54, 8,
8, 57, 8, 8, 0, 58, 0, 65, 60, 64,
- 8, 0, 98, 6, 97, 86, 8, 8, 109, 110,
- 136, 131, 130, 132, 117, 118, 119, 120, 121, 122,
- 123, 124, 125, 126, 127, 128, 129, 133, 116, 115,
- 111, 0, 112, 108, 103, 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, 135, 0, 105, 104, 102, 29, 28,
- 30, 31, 8, 139, 0, 34, 0, 0, 20, 140,
- 143, 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, 138, 137, 0,
- 0, 51, 92, 8, 8, 96, 134, 0, 0, 41,
- 37, 8, 8, 84, 81, 80, 8, 95, 99, 27,
- 39, 0, 0, 0, 36, 73, 38, 8, 40, 0,
- 0, 0
+ 8, 0, 98, 6, 0, 86, 8, 97, 8, 109,
+ 110, 136, 131, 130, 132, 117, 118, 119, 120, 121,
+ 122, 123, 124, 125, 126, 127, 128, 129, 133, 116,
+ 115, 111, 0, 112, 108, 103, 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, 135, 0, 105, 104, 102, 29,
+ 28, 30, 31, 8, 139, 0, 34, 0, 0, 20,
+ 140, 143, 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, 138, 137,
+ 0, 0, 51, 92, 8, 8, 96, 134, 0, 0,
+ 41, 37, 8, 8, 84, 81, 80, 8, 95, 99,
+ 27, 39, 0, 0, 0, 36, 73, 38, 8, 40,
+ 0, 0, 0
};
-static const short yydefgoto[] = { 260,
- 5, 6, 7, 10, 17, 8, 28, 87, 157, 88,
- 193, 238, 224, 158, 254, 225, 159, 160, 105, 80,
- 37, 38, 39, 40, 41, 42, 43, 44, 169, 45,
- 211, 247, 46, 49, 50, 51, 52, 236, 81, 149,
- 82, 83, 84, 85, 162, 163, 90, 91
+static const short yydefgoto[] = { 261,
+ 5, 6, 7, 10, 17, 8, 28, 87, 158, 88,
+ 194, 239, 225, 159, 255, 226, 160, 161, 105, 80,
+ 37, 38, 39, 40, 41, 42, 43, 44, 170, 45,
+ 212, 248, 46, 49, 50, 51, 52, 237, 81, 150,
+ 82, 83, 84, 85, 163, 164, 90, 91
};
-static const short yypact[] = { 204,
- 17, -21, -3, 39,-32768,-32768,-32768,-32768, 58, 98,
--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,
+static const short yypact[] = { 174,
+ 18, -23, -18, -14,-32768,-32768,-32768,-32768, 79, 10,
+-32768,-32768,-32768, 41, 41, 41, 149, 46,-32768,-32768,
+-32768,-32768, 122, 15, 464,-32768,-32768, 70, 109, 31,
+-32768,-32768, 1, 92,-32768,-32768,-32768, 44, 154,-32768,
+ 213, 387,-32768,-32768,-32768,-32768, 102,-32768, 62, 81,
+ 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, 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, 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
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 530,
+ 285,-32768,-32768,-32768,-32768, 110, 104,-32768,-32768,-32768,
+ 129,-32768,-32768, 135,-32768,-32768, 20, 84,-32768,-32768,
+-32768,-32768,-32768,-32768, 236, 41, 387,-32768, 41,-32768,
+-32768, 141, 41,-32768, 112, 113,-32768,-32768,-32768, 41,
+ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
+ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
+ 41, 41, 420, 41,-32768,-32768,-32768,-32768,-32768, 501,
+ 131, 97, 123, 173,-32768, 178, 186,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768, 149, 189,-32768, 122,-32768, 33,
+-32768, 15, 122, 41, 41,-32768, 41, 41, 139,-32768,
+ 190,-32768, 41, 464,-32768, 336, 41, 41,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768, 153, 137, 165, 169, 149,
+-32768,-32768,-32768, 41,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768, 151, 170,-32768, 41, 185, 41, 234,-32768,
+ 82,-32768,-32768,-32768, 77,-32768,-32768,-32768,-32768,-32768,
+ 19, 98,-32768, 41,-32768,-32768,-32768, 41, 160, 34,
+ 41,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 41, 41,
+-32768, 41, 137, 22, 291,-32768,-32768,-32768,-32768, 41,
+ 203, 223,-32768
};
static const short yypgoto[] = {-32768,
-32768,-32768,-32768, -5, -79,-32768,-32768,-32768,-32768,-32768,
--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
+-32768,-32768, -8,-32768,-32768, -24,-32768,-32768,-32768,-32768,
+ -83,-32768, 60, -94,-32768, 199, -32,-32768,-32768,-32768,
+-32768,-32768,-32768, 69,-32768, 192,-32768,-32768, -46,-32768,
+ 103, 172,-32768,-32768,-32768,-32768, -6, -42
};
-#define YYLAST 572
+#define YYLAST 573
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, 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, 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, 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, -106, -106, -106, 32, 33, 34, 35, 212,
- 116, 144, 259, 188, 0, 0, 235, -106, -106, -106,
+ 15, 16, 20, 162, 112, 23, 24, 25, 165, 110,
+ 176, 93, 21, 94, 118, 47, 30, 21, 9, 22,
+ -8, 21, 21, 11, 21, 48, 119, -8, 12, 97,
+ 169, 98, 13, 21, 242, 106, 109, 205, 206, 207,
+ 208, 209, 113, 21, 99, 95, 29, 120, 121, 122,
+ 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+ 133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
+ 143, 144, 181, 203, 110, 245, 257, 242, 200, 92,
+ 152, 115, -33, 244, 21, 86, 21, 210, 211, 168,
+ 100, 48, 224, 101, 172, 173, 186, 174, 175, 21,
+ 21, 177, 96, -1, 153, 178, 192, 246, 247, 114,
+ 151, 183, -8, 184, 31, 32, 33, 34, 35, -8,
+ 154, 155, 156, 243, 21, 18, 244, 19, -87, 166,
+ -32, 171, 31, 32, 33, 34, 35, 219, 117, 21,
+ 193, 179, 187, 188, 191, 167, 195, 224, 18, 197,
+ 111, 26, 27, -8, 102, 18, 89, 36, 18, 202,
+ 180, 182, 157, 204, -48, -48, -48, -48, -48, 18,
+ 102, 259, 202, 196, 216, 36, 218, 18, 198, 190,
+ -48, -48, -48, -48, -48, 18, 199, 215, 221, 223,
+ 217, 228, 230, 1, 2, 3, 4, 231, 233, 18,
+ -52, 222, 262, -52, 103, 104, 232, -48, 251, 234,
+ 202, 18, 240, 227, 238, 18, -53, 229, 241, -53,
+ 103, 104, 263, -48, 32, 33, 34, 35, 256, 249,
+ 250, 18, 214, 235, 146, 18, 201, 252, 253, 107,
+ 213, 116, 254, -106, -106, -106, 31, 32, 33, 34,
+ 35, 145, 189, 260, 0, 0, 0, 236, -106, -106,
-106, -106, -106, -106, -106, -106, -106, -106, -106, -106,
- -106, -106, -106, -106, -106, -106, -106, -106, -106, 0,
- -100, -100, 147, -106, 145, -106, 0, 0, 0, 0,
- 148, 0, 0, -106, -106, -106, 0, 0, 0, 0,
- 31, 32, 33, 34, 35, 0, 0, 0, -106, -106,
-106, -106, -106, -106, -106, -106, -106, -106, -106, -106,
+ 0, -100, -100, 148, -106, 146, -106, 0, 0, 36,
+ 0, 149, 0, 0, -106, -106, -106, 0, 0, 0,
+ 0, 31, 32, 33, 34, 35, 0, 0, 0, -106,
-106, -106, -106, -106, -106, -106, -106, -106, -106, -106,
- 0, 146, 0, 147, -106, 145, -106, 257, 0, 0,
- 0, 148, 0, 36, -106, -106, -106, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, -106,
-106, -106, -106, -106, -106, -106, -106, -106, -106, -106,
+ -106, 0, 147, 0, 148, -106, 146, -106, 258, 0,
+ 0, 0, 149, 0, 36, -106, -106, -106, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-106, -106, -106, -106, -106, -106, -106, -106, -106, -106,
- -106, 0, 0, 0, 147, -106, 108, -106, -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, 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,
+ -106, -106, -106, -106, -106, -106, -106, -106, -106, -106,
+ -106, -106, 0, 0, 0, 148, -106, 108, -106, -8,
+ 0, 0, 220, 149, 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,
+ 185, 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, 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, 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
+ 72, 73, 74
};
static const short yycheck[] = { 5,
6, 7, 9, 87, 47, 11, 12, 13, 88, 42,
- 3, 105, 11, 1, 13, 3, 22, 1, 11, 3,
- 3, 3, 3, 11, 3, 47, 10, 10, 11, 35,
- 11, 37, 1, 3, 1, 41, 42, 5, 6, 7,
- 8, 9, 48, 47, 1, 142, 45, 53, 54, 55,
+ 105, 11, 3, 13, 1, 1, 22, 3, 1, 10,
+ 3, 3, 3, 47, 3, 11, 13, 10, 47, 35,
+ 11, 37, 47, 3, 1, 41, 42, 5, 6, 7,
+ 8, 9, 48, 3, 1, 45, 1, 53, 54, 55,
56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
- 76, 77, 115, 167, 107, 57, 55, 157, 47, 49,
- 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, 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, 49, 50, 51, 1, 53, -1, -1, -1, -1,
- 58, -1, -1, 10, 11, 12, -1, -1, -1, -1,
- 11, 12, 13, 14, 15, -1, -1, -1, 25, 26,
+ 76, 77, 115, 168, 107, 57, 55, 1, 158, 49,
+ 86, 1, 49, 50, 3, 16, 3, 55, 56, 95,
+ 47, 11, 11, 50, 100, 101, 143, 103, 104, 3,
+ 3, 107, 11, 0, 1, 111, 10, 10, 11, 48,
+ 1, 117, 3, 119, 11, 12, 13, 14, 15, 10,
+ 17, 18, 19, 47, 3, 47, 50, 49, 48, 1,
+ 49, 48, 11, 12, 13, 14, 15, 184, 49, 3,
+ 44, 1, 148, 149, 151, 11, 153, 11, 47, 155,
+ 49, 3, 4, 44, 1, 47, 48, 54, 47, 166,
+ 49, 49, 59, 169, 11, 12, 13, 14, 15, 47,
+ 1, 255, 179, 1, 180, 54, 182, 47, 1, 49,
+ 11, 12, 13, 14, 15, 47, 1, 49, 194, 196,
+ 1, 198, 199, 20, 21, 22, 23, 203, 48, 47,
+ 47, 49, 0, 50, 51, 52, 212, 54, 49, 215,
+ 217, 47, 221, 49, 220, 47, 47, 49, 224, 50,
+ 51, 52, 0, 54, 12, 13, 14, 15, 253, 235,
+ 236, 47, 173, 49, 1, 47, 48, 243, 244, 41,
+ 172, 50, 248, 10, 11, 12, 11, 12, 13, 14,
+ 15, 80, 150, 259, -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, -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,
+ -1, 48, 49, 50, 51, 1, 53, -1, -1, 54,
+ -1, 58, -1, -1, 10, 11, 12, -1, -1, -1,
+ -1, 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, 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, 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,
+ 46, -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, 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, 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
+ 41, 42, 43
};
#define YYPURE 1
diff --git a/WebCore/khtml/css/parser.y b/WebCore/khtml/css/parser.y
index a20066e..fb7050e 100644
--- a/WebCore/khtml/css/parser.y
+++ b/WebCore/khtml/css/parser.y
@@ -793,7 +793,7 @@ declaration:
p->valueList = 0;
}
|
- error {
+ property error {
$$ = false;
}
;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list