[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:29:32 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit a265bbbe1758066d3e67fd0414ec29a30002514c
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Mar 13 23:03:05 2003 +0000
Reviewed by Dave.
- fixed 3197728 -- REGRESSION: crash at http://transitive.com/company.htm
* khtml/rendering/bidi.cpp: (appendRun): Added an if statement to handle
the case where obj is 0; the while loop already handled that case.
- did the "no inlining workaround" needed for newer versions of gcc
* khtml/css/parser.y: Added #define __inline as we have elsewhere.
* khtml/css/parser.cpp: Regenerated.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3823 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 712c55e..9473961 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2003-03-13 Darin Adler <darin at apple.com>
+
+ Reviewed by Dave.
+
+ - fixed 3197728 -- REGRESSION: crash at http://transitive.com/company.htm
+
+ * khtml/rendering/bidi.cpp: (appendRun): Added an if statement to handle
+ the case where obj is 0; the while loop already handled that case.
+
+ - did the "no inlining workaround" needed for newer versions of gcc
+
+ * khtml/css/parser.y: Added #define __inline as we have elsewhere.
+ * khtml/css/parser.cpp: Regenerated.
+
2003-03-13 David Hyatt <hyatt at apple.com>
Add color dumping and bgcolor dumping to the render dump tool.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 712c55e..9473961 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2003-03-13 Darin Adler <darin at apple.com>
+
+ Reviewed by Dave.
+
+ - fixed 3197728 -- REGRESSION: crash at http://transitive.com/company.htm
+
+ * khtml/rendering/bidi.cpp: (appendRun): Added an if statement to handle
+ the case where obj is 0; the while loop already handled that case.
+
+ - did the "no inlining workaround" needed for newer versions of gcc
+
+ * khtml/css/parser.y: Added #define __inline as we have elsewhere.
+ * khtml/css/parser.cpp: Regenerated.
+
2003-03-13 David Hyatt <hyatt at apple.com>
Add color dumping and bgcolor dumping to the render dump tool.
diff --git a/WebCore/khtml/css/parser.cpp b/WebCore/khtml/css/parser.cpp
index 84c641e..42f7244 100644
--- a/WebCore/khtml/css/parser.cpp
+++ b/WebCore/khtml/css/parser.cpp
@@ -103,8 +103,13 @@ using namespace DOM;
//
// with 'props->id' a CSS property in the range from CSS_PROP_MIN to
// (and including) CSS_PROP_TOTAL-1
+
+// turn off inlining to void warning with newer gcc
+#undef __inline
+#define __inline
#include "cssproperties.c"
#include "cssvalues.c"
+#undef __inline
int DOM::getPropertyID(const char *tagStr, int len)
{
@@ -129,7 +134,7 @@ static inline int getValueID(const char *tagStr, int len)
#define YYMAXDEPTH 0
#define YYPARSE_PARAM parser
-#line 79 "parser.y"
+#line 84 "parser.y"
typedef union {
CSSRuleImpl *rule;
CSSSelector *selector;
@@ -149,7 +154,7 @@ typedef union {
Value value;
ValueList *valueList;
} YYSTYPE;
-#line 99 "parser.y"
+#line 104 "parser.y"
static inline int cssyyerror(const char *x ) {
@@ -286,21 +291,21 @@ static const short yyrhs[] = { 66,
#if YYDEBUG != 0
static const short yyrline[] = { 0,
- 225, 227, 228, 229, 232, 239, 245, 270, 272, 275,
- 277, 278, 281, 283, 288, 289, 292, 294, 305, 307,
- 317, 319, 320, 321, 322, 323, 326, 339, 342, 347,
- 349, 352, 356, 360, 364, 368, 372, 378, 392, 394,
- 403, 425, 429, 434, 438, 443, 445, 446, 449, 451,
- 454, 474, 488, 502, 508, 512, 531, 537, 542, 547,
- 554, 575, 580, 585, 595, 601, 608, 609, 610, 613,
- 622, 646, 652, 660, 664, 667, 670, 673, 676, 681,
- 683, 686, 692, 698, 706, 710, 715, 718, 724, 732,
- 736, 742, 748, 753, 759, 767, 792, 799, 801, 804,
- 809, 822, 828, 832, 835, 840, 842, 843, 844, 850,
- 851, 852, 854, 859, 861, 862, 863, 864, 865, 866,
- 867, 868, 869, 870, 871, 872, 873, 874, 875, 876,
- 877, 878, 882, 897, 904, 911, 919, 945, 947, 950,
- 952
+ 230, 232, 233, 234, 237, 244, 250, 275, 277, 280,
+ 282, 283, 286, 288, 293, 294, 297, 299, 310, 312,
+ 322, 324, 325, 326, 327, 328, 331, 344, 347, 352,
+ 354, 357, 361, 365, 369, 373, 377, 383, 397, 399,
+ 408, 430, 434, 439, 443, 448, 450, 451, 454, 456,
+ 459, 479, 493, 507, 513, 517, 536, 542, 547, 552,
+ 559, 580, 585, 590, 600, 606, 613, 614, 615, 618,
+ 627, 651, 657, 665, 669, 672, 675, 678, 681, 686,
+ 688, 691, 697, 703, 711, 715, 720, 723, 729, 737,
+ 741, 747, 753, 758, 764, 772, 797, 804, 806, 809,
+ 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
};
#endif
@@ -1098,20 +1103,20 @@ yyreduce:
switch (yyn) {
case 5:
-#line 233 "parser.y"
+#line 238 "parser.y"
{
CSSParser *p = static_cast<CSSParser *>(parser);
p->rule = yyvsp[-2].rule;
;
break;}
case 6:
-#line 240 "parser.y"
+#line 245 "parser.y"
{
/* can be empty */
;
break;}
case 7:
-#line 246 "parser.y"
+#line 251 "parser.y"
{
CSSParser *p = static_cast<CSSParser *>(parser);
if ( yyvsp[-1].valueList ) {
@@ -1136,7 +1141,7 @@ case 7:
;
break;}
case 14:
-#line 283 "parser.y"
+#line 288 "parser.y"
{
#ifdef CSS_DEBUG
kdDebug( 6080 ) << "charset rule: " << qString(yyvsp[-2].string) << endl;
@@ -1144,7 +1149,7 @@ case 14:
;
break;}
case 18:
-#line 294 "parser.y"
+#line 299 "parser.y"
{
CSSParser *p = static_cast<CSSParser *>(parser);
if ( yyvsp[-1].rule && p->styleElement && p->styleElement->isCSSStyleSheet() ) {
@@ -1155,7 +1160,7 @@ case 18:
;
break;}
case 20:
-#line 307 "parser.y"
+#line 312 "parser.y"
{
CSSParser *p = static_cast<CSSParser *>(parser);
if ( yyvsp[-1].rule && p->styleElement && p->styleElement->isCSSStyleSheet() ) {
@@ -1166,7 +1171,7 @@ case 20:
;
break;}
case 27:
-#line 327 "parser.y"
+#line 332 "parser.y"
{
#ifdef CSS_DEBUG
kdDebug( 6080 ) << "@import: " << qString(yyvsp[-3].string) << endl;
@@ -1181,52 +1186,52 @@ case 27:
;
break;}
case 28:
-#line 339 "parser.y"
+#line 344 "parser.y"
{
yyval.rule = 0;
;
break;}
case 29:
-#line 342 "parser.y"
+#line 347 "parser.y"
{
yyval.rule = 0;
;
break;}
case 32:
-#line 353 "parser.y"
+#line 358 "parser.y"
{
yyval.mediaList = 0;
;
break;}
case 34:
-#line 361 "parser.y"
+#line 366 "parser.y"
{
yyval.mediaList = 0;
;
break;}
case 35:
-#line 364 "parser.y"
+#line 369 "parser.y"
{
yyval.mediaList = new MediaListImpl();
yyval.mediaList->appendMedium( domString(yyvsp[0].string) );
;
break;}
case 36:
-#line 368 "parser.y"
+#line 373 "parser.y"
{
yyval.mediaList = yyvsp[-3].mediaList;
yyval.mediaList->appendMedium( domString(yyvsp[0].string) );
;
break;}
case 37:
-#line 372 "parser.y"
+#line 377 "parser.y"
{
delete yyvsp[-1].mediaList;
yyval.mediaList = 0;
;
break;}
case 38:
-#line 379 "parser.y"
+#line 384 "parser.y"
{
CSSParser *p = static_cast<CSSParser *>(parser);
if ( yyvsp[-4].mediaList && yyvsp[-1].ruleList &&
@@ -1240,11 +1245,11 @@ case 38:
;
break;}
case 39:
-#line 393 "parser.y"
+#line 398 "parser.y"
{ yyval.ruleList = 0; ;
break;}
case 40:
-#line 394 "parser.y"
+#line 399 "parser.y"
{
yyval.ruleList = yyvsp[-2].ruleList;
if ( yyvsp[-1].rule ) {
@@ -1254,57 +1259,57 @@ case 40:
;
break;}
case 41:
-#line 404 "parser.y"
+#line 409 "parser.y"
{
yyval.string = yyvsp[-1].string;
;
break;}
case 42:
-#line 426 "parser.y"
+#line 431 "parser.y"
{
yyval.rule = 0;
;
break;}
case 43:
-#line 429 "parser.y"
+#line 434 "parser.y"
{
yyval.rule = 0;
;
break;}
case 44:
-#line 435 "parser.y"
+#line 440 "parser.y"
{
yyval.rule = 0;
;
break;}
case 45:
-#line 438 "parser.y"
+#line 443 "parser.y"
{
yyval.rule = 0;
;
break;}
case 46:
-#line 444 "parser.y"
+#line 449 "parser.y"
{ yyval.relation = CSSSelector::Sibling; ;
break;}
case 47:
-#line 445 "parser.y"
+#line 450 "parser.y"
{ yyval.relation = CSSSelector::Child; ;
break;}
case 48:
-#line 446 "parser.y"
+#line 451 "parser.y"
{ yyval.relation = CSSSelector::Descendant; ;
break;}
case 49:
-#line 450 "parser.y"
+#line 455 "parser.y"
{ yyval.val = -1; ;
break;}
case 50:
-#line 451 "parser.y"
+#line 456 "parser.y"
{ yyval.val = 1; ;
break;}
case 51:
-#line 455 "parser.y"
+#line 460 "parser.y"
{
#ifdef CSS_DEBUG
kdDebug( 6080 ) << "got ruleset" << endl << " selector:" << endl;
@@ -1324,7 +1329,7 @@ case 51:
;
break;}
case 52:
-#line 475 "parser.y"
+#line 480 "parser.y"
{
if ( yyvsp[0].selector ) {
yyval.selectorList = new QPtrList<CSSSelector>;
@@ -1340,7 +1345,7 @@ case 52:
;
break;}
case 53:
-#line 488 "parser.y"
+#line 493 "parser.y"
{
if ( yyvsp[-3].selectorList && yyvsp[0].selector ) {
yyval.selectorList = yyvsp[-3].selectorList;
@@ -1357,20 +1362,20 @@ case 53:
;
break;}
case 54:
-#line 502 "parser.y"
+#line 507 "parser.y"
{
delete yyvsp[-1].selectorList;
yyval.selectorList = 0;
;
break;}
case 55:
-#line 509 "parser.y"
+#line 514 "parser.y"
{
yyval.selector = yyvsp[0].selector;
;
break;}
case 56:
-#line 512 "parser.y"
+#line 517 "parser.y"
{
yyval.selector = yyvsp[0].selector;
if (yyval.selector) {
@@ -1392,21 +1397,21 @@ case 56:
;
break;}
case 57:
-#line 531 "parser.y"
+#line 536 "parser.y"
{
delete yyvsp[-1].selector;
yyval.selector = 0;
;
break;}
case 58:
-#line 538 "parser.y"
+#line 543 "parser.y"
{
yyval.selector = new CSSSelector();
yyval.selector->tag = yyvsp[-1].element;
;
break;}
case 59:
-#line 542 "parser.y"
+#line 547 "parser.y"
{
yyval.selector = yyvsp[-1].selector;
if ( yyval.selector )
@@ -1414,7 +1419,7 @@ case 59:
;
break;}
case 60:
-#line 547 "parser.y"
+#line 552 "parser.y"
{
yyval.selector = yyvsp[-1].selector;
if ( yyval.selector )
@@ -1422,7 +1427,7 @@ case 60:
;
break;}
case 61:
-#line 555 "parser.y"
+#line 560 "parser.y"
{
CSSParser *p = static_cast<CSSParser *>(parser);
DOM::DocumentImpl *doc = p->document();
@@ -1445,20 +1450,20 @@ case 61:
;
break;}
case 62:
-#line 575 "parser.y"
+#line 580 "parser.y"
{
yyval.element = -1;
;
break;}
case 63:
-#line 581 "parser.y"
+#line 586 "parser.y"
{
yyval.selector = yyvsp[0].selector;
yyval.selector->nonCSSHint = static_cast<CSSParser *>(parser)->nonCSSHint;
;
break;}
case 64:
-#line 585 "parser.y"
+#line 590 "parser.y"
{
yyval.selector = yyvsp[-1].selector;
if (yyval.selector) {
@@ -1471,14 +1476,14 @@ case 64:
;
break;}
case 65:
-#line 595 "parser.y"
+#line 600 "parser.y"
{
delete yyvsp[-1].selector;
yyval.selector = 0;
;
break;}
case 66:
-#line 602 "parser.y"
+#line 607 "parser.y"
{
yyval.selector = new CSSSelector();
yyval.selector->match = CSSSelector::Id;
@@ -1487,7 +1492,7 @@ case 66:
;
break;}
case 70:
-#line 614 "parser.y"
+#line 619 "parser.y"
{
yyval.selector = new CSSSelector();
yyval.selector->match = CSSSelector::List;
@@ -1496,7 +1501,7 @@ case 70:
;
break;}
case 71:
-#line 623 "parser.y"
+#line 628 "parser.y"
{
CSSParser *p = static_cast<CSSParser *>(parser);
DOM::DocumentImpl *doc = p->document();
@@ -1520,7 +1525,7 @@ case 71:
;
break;}
case 72:
-#line 647 "parser.y"
+#line 652 "parser.y"
{
yyval.selector = new CSSSelector();
yyval.selector->attr = yyvsp[-1].attribute;
@@ -1528,7 +1533,7 @@ case 72:
;
break;}
case 73:
-#line 652 "parser.y"
+#line 657 "parser.y"
{
yyval.selector = new CSSSelector();
yyval.selector->attr = yyvsp[-5].attribute;
@@ -1537,43 +1542,43 @@ case 73:
;
break;}
case 74:
-#line 661 "parser.y"
+#line 666 "parser.y"
{
yyval.val = CSSSelector::Exact;
;
break;}
case 75:
-#line 664 "parser.y"
+#line 669 "parser.y"
{
yyval.val = CSSSelector::List;
;
break;}
case 76:
-#line 667 "parser.y"
+#line 672 "parser.y"
{
yyval.val = CSSSelector::Hyphen;
;
break;}
case 77:
-#line 670 "parser.y"
+#line 675 "parser.y"
{
yyval.val = CSSSelector::Begin;
;
break;}
case 78:
-#line 673 "parser.y"
+#line 678 "parser.y"
{
yyval.val = CSSSelector::End;
;
break;}
case 79:
-#line 676 "parser.y"
+#line 681 "parser.y"
{
yyval.val = CSSSelector::Contain;
;
break;}
case 82:
-#line 687 "parser.y"
+#line 692 "parser.y"
{
yyval.selector = new CSSSelector();
yyval.selector->match = CSSSelector::Pseudo;
@@ -1581,7 +1586,7 @@ case 82:
;
break;}
case 83:
-#line 693 "parser.y"
+#line 698 "parser.y"
{
yyval.selector = new CSSSelector();
yyval.selector->match = CSSSelector::Pseudo;
@@ -1589,7 +1594,7 @@ case 83:
;
break;}
case 84:
-#line 698 "parser.y"
+#line 703 "parser.y"
{
yyval.selector = new CSSSelector();
yyval.selector->match = CSSSelector::Pseudo;
@@ -1598,13 +1603,13 @@ case 84:
;
break;}
case 85:
-#line 707 "parser.y"
+#line 712 "parser.y"
{
yyval.ok = yyvsp[0].ok;
;
break;}
case 86:
-#line 710 "parser.y"
+#line 715 "parser.y"
{
yyval.ok = yyvsp[-1].ok;
if ( yyvsp[0].ok )
@@ -1612,13 +1617,13 @@ case 86:
;
break;}
case 87:
-#line 715 "parser.y"
+#line 720 "parser.y"
{
yyval.ok = yyvsp[0].ok;
;
break;}
case 88:
-#line 718 "parser.y"
+#line 723 "parser.y"
{
yyval.ok = false;
#ifdef CSS_DEBUG
@@ -1627,7 +1632,7 @@ case 88:
;
break;}
case 89:
-#line 724 "parser.y"
+#line 729 "parser.y"
{
yyval.ok = false;
#ifdef CSS_DEBUG
@@ -1636,13 +1641,13 @@ case 89:
;
break;}
case 90:
-#line 733 "parser.y"
+#line 738 "parser.y"
{
yyval.ok = yyvsp[-2].ok;
;
break;}
case 91:
-#line 736 "parser.y"
+#line 741 "parser.y"
{
yyval.ok = false;
#ifdef CSS_DEBUG
@@ -1651,7 +1656,7 @@ case 91:
;
break;}
case 92:
-#line 742 "parser.y"
+#line 747 "parser.y"
{
yyval.ok = false;
#ifdef CSS_DEBUG
@@ -1660,7 +1665,7 @@ case 92:
;
break;}
case 93:
-#line 748 "parser.y"
+#line 753 "parser.y"
{
yyval.ok = yyvsp[-3].ok;
if ( yyvsp[-2].ok )
@@ -1668,7 +1673,7 @@ case 93:
;
break;}
case 94:
-#line 753 "parser.y"
+#line 758 "parser.y"
{
yyval.ok = yyvsp[-3].ok;
#ifdef CSS_DEBUG
@@ -1677,7 +1682,7 @@ case 94:
;
break;}
case 95:
-#line 759 "parser.y"
+#line 764 "parser.y"
{
yyval.ok = yyvsp[-5].ok;
#ifdef CSS_DEBUG
@@ -1686,7 +1691,7 @@ case 95:
;
break;}
case 96:
-#line 768 "parser.y"
+#line 773 "parser.y"
{
yyval.ok = false;
CSSParser *p = static_cast<CSSParser *>(parser);
@@ -1711,29 +1716,29 @@ case 96:
;
break;}
case 97:
-#line 793 "parser.y"
+#line 798 "parser.y"
{
QString str = qString(yyvsp[-1].string);
yyval.prop_id = getPropertyID( str.lower().latin1(), str.length() );
;
break;}
case 98:
-#line 800 "parser.y"
+#line 805 "parser.y"
{ yyval.b = true; ;
break;}
case 99:
-#line 801 "parser.y"
+#line 806 "parser.y"
{ yyval.b = false; ;
break;}
case 100:
-#line 805 "parser.y"
+#line 810 "parser.y"
{
yyval.valueList = new ValueList;
yyval.valueList->addValue( yyvsp[0].value );
;
break;}
case 101:
-#line 809 "parser.y"
+#line 814 "parser.y"
{
yyval.valueList = yyvsp[-2].valueList;
if ( yyval.valueList ) {
@@ -1749,44 +1754,44 @@ case 101:
;
break;}
case 102:
-#line 822 "parser.y"
+#line 827 "parser.y"
{
delete yyvsp[-1].valueList;
yyval.valueList = 0;
;
break;}
case 103:
-#line 829 "parser.y"
+#line 834 "parser.y"
{
yyval.tok = '/';
;
break;}
case 104:
-#line 832 "parser.y"
+#line 837 "parser.y"
{
yyval.tok = ',';
;
break;}
case 105:
-#line 835 "parser.y"
+#line 840 "parser.y"
{
yyval.tok = 0;
;
break;}
case 106:
-#line 841 "parser.y"
+#line 846 "parser.y"
{ yyval.value = yyvsp[0].value; ;
break;}
case 107:
-#line 842 "parser.y"
+#line 847 "parser.y"
{ yyval.value = yyvsp[0].value; yyval.value.fValue *= yyvsp[-1].val; ;
break;}
case 108:
-#line 843 "parser.y"
+#line 848 "parser.y"
{ yyval.value.id = 0; yyval.value.string = yyvsp[-1].string; yyval.value.unit = CSSPrimitiveValue::CSS_STRING; ;
break;}
case 109:
-#line 844 "parser.y"
+#line 849 "parser.y"
{
QString str = qString( yyvsp[-1].string );
yyval.value.id = getValueID( str.lower().latin1(), str.length() );
@@ -1795,101 +1800,101 @@ case 109:
;
break;}
case 110:
-#line 850 "parser.y"
+#line 855 "parser.y"
{ yyval.value.id = 0; yyval.value.string = yyvsp[-1].string; yyval.value.unit = CSSPrimitiveValue::CSS_URI; ;
break;}
case 111:
-#line 851 "parser.y"
+#line 856 "parser.y"
{ yyval.value.id = 0; yyval.value.iValue = 0; yyval.value.unit = CSSPrimitiveValue::CSS_UNKNOWN;/* ### */ ;
break;}
case 112:
-#line 852 "parser.y"
+#line 857 "parser.y"
{ yyval.value.id = 0; yyval.value.string = yyvsp[0].string; yyval.value.unit = CSSPrimitiveValue::CSS_RGBCOLOR; ;
break;}
case 113:
-#line 854 "parser.y"
+#line 859 "parser.y"
{
yyval.value = yyvsp[0].value;
;
break;}
case 114:
-#line 860 "parser.y"
+#line 865 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_NUMBER; ;
break;}
case 115:
-#line 861 "parser.y"
+#line 866 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PERCENTAGE; ;
break;}
case 116:
-#line 862 "parser.y"
+#line 867 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PX; ;
break;}
case 117:
-#line 863 "parser.y"
+#line 868 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_CM; ;
break;}
case 118:
-#line 864 "parser.y"
+#line 869 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_MM; ;
break;}
case 119:
-#line 865 "parser.y"
+#line 870 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_IN; ;
break;}
case 120:
-#line 866 "parser.y"
+#line 871 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PT; ;
break;}
case 121:
-#line 867 "parser.y"
+#line 872 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PC; ;
break;}
case 122:
-#line 868 "parser.y"
+#line 873 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_DEG; ;
break;}
case 123:
-#line 869 "parser.y"
+#line 874 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_RAD; ;
break;}
case 124:
-#line 870 "parser.y"
+#line 875 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_GRAD; ;
break;}
case 125:
-#line 871 "parser.y"
+#line 876 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_MS; ;
break;}
case 126:
-#line 872 "parser.y"
+#line 877 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_S; ;
break;}
case 127:
-#line 873 "parser.y"
+#line 878 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_HZ; ;
break;}
case 128:
-#line 874 "parser.y"
+#line 879 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_KHZ; ;
break;}
case 129:
-#line 875 "parser.y"
+#line 880 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_EMS; ;
break;}
case 130:
-#line 876 "parser.y"
+#line 881 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = Value::Q_EMS; ;
break;}
case 131:
-#line 877 "parser.y"
+#line 882 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_EXS; ;
break;}
case 132:
-#line 878 "parser.y"
+#line 883 "parser.y"
{ yyval.value.id = 0; yyval.value.string = yyvsp[-1].string; yyval.value.unit = CSSPrimitiveValue::CSS_DIMENSION ;
break;}
case 133:
-#line 883 "parser.y"
+#line 888 "parser.y"
{
Function *f = new Function;
f->name = yyvsp[-4].string;
@@ -1900,11 +1905,11 @@ case 133:
;
break;}
case 134:
-#line 898 "parser.y"
+#line 903 "parser.y"
{ yyval.string = yyvsp[-1].string; ;
break;}
case 135:
-#line 905 "parser.y"
+#line 910 "parser.y"
{
yyval.rule = 0;
#ifdef CSS_DEBUG
@@ -1913,7 +1918,7 @@ case 135:
;
break;}
case 136:
-#line 911 "parser.y"
+#line 916 "parser.y"
{
yyval.rule = 0;
#ifdef CSS_DEBUG
@@ -1922,7 +1927,7 @@ case 136:
;
break;}
case 137:
-#line 920 "parser.y"
+#line 925 "parser.y"
{
yyval.rule = 0;
#ifdef CSS_DEBUG
@@ -2152,6 +2157,6 @@ yyerrhandle:
}
return 1;
}
-#line 955 "parser.y"
+#line 960 "parser.y"
diff --git a/WebCore/khtml/css/parser.y b/WebCore/khtml/css/parser.y
index 08d4f7b..01abd68 100644
--- a/WebCore/khtml/css/parser.y
+++ b/WebCore/khtml/css/parser.y
@@ -47,8 +47,13 @@ using namespace DOM;
//
// with 'props->id' a CSS property in the range from CSS_PROP_MIN to
// (and including) CSS_PROP_TOTAL-1
+
+// turn off inlining to void warning with newer gcc
+#undef __inline
+#define __inline
#include "cssproperties.c"
#include "cssvalues.c"
+#undef __inline
int DOM::getPropertyID(const char *tagStr, int len)
{
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index 4bbe9c7..9d7aa81 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -488,7 +488,8 @@ static void appendRun()
start = 0;
obj = Bidinext( sor.par, obj );
}
- appendRunsForObject(start, eor.pos+1, obj);
+ if (obj)
+ appendRunsForObject(start, eor.pos+1, obj);
++eor;
sor = eor;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list