From da408a1121b102a035146f6a13944a6738b07e0a Mon Sep 17 00:00:00 2001 From: Jose V Beneyto Date: Tue, 21 Aug 2012 08:31:28 +0200 Subject: [PATCH] chromium: updated to 21.0.1180.79. Closes #847 (thanks Thomas) --- chromium/.footprint | 24 +- chromium/.md5sum | 4 +- chromium/Pkgfile | 11 +- chromium/bison.patch | 554 ++++++++++++++++++++++++++++++++++ chromium/fix-svnversion.patch | 11 - 5 files changed, 569 insertions(+), 35 deletions(-) create mode 100644 chromium/bison.patch delete mode 100644 chromium/fix-svnversion.patch diff --git a/chromium/.footprint b/chromium/.footprint index 89dccd97c..05d953449 100644 --- a/chromium/.footprint +++ b/chromium/.footprint @@ -12,6 +12,9 @@ drwxr-xr-x root/root usr/lib/chromium/locales/ -rw-r--r-- root/root usr/lib/chromium/locales/en-US.pak -rw-r--r-- root/root usr/lib/chromium/resources.pak drwxr-xr-x root/root usr/lib/chromium/resources/ +drwxr-xr-x root/root usr/lib/chromium/resources/extension/ +drwxr-xr-x root/root usr/lib/chromium/resources/extension/demo/ +-rw-r--r-- root/root usr/lib/chromium/resources/extension/demo/library.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/DevTools.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/HeapSnapshotWorker.js @@ -46,6 +49,7 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/errorIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/errorMediumIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/errorRedDot.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/fileSystem.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/forward.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/frame.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/glossyHeader.png @@ -59,7 +63,6 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/indexedDBIndex.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/indexedDBObjectStore.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/localStorage.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/navigatorPinButton.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/navigatorShowHideButton.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/paneAddButtons.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/paneBottomGrow.png @@ -131,15 +134,7 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/thumbHoverHoriz.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/thumbHoverVert.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/thumbVert.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineBarBlue.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineBarGray.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineBarGreen.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineBarOrange.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineBarPurple.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineBarRed.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineBarYellow.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineCheckmarks.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineDots.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/tickMark.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineHollowPillBlue.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineHollowPillGray.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineHollowPillGreen.png @@ -181,8 +176,10 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/elementsPanel.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/filteredItemSelectionDialog.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/heapProfiler.css +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/helpScreen.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/indexedDBViews.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/inspectorCommon.css +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/nativeMemoryProfiler.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/navigatorView.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/networkLogView.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/networkPanel.css @@ -190,6 +187,7 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/profilesPanel.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/resourceView.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/resourcesPanel.css +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/revisionHistory.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/scriptsPanel.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/splitView.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/tabbedPane.css @@ -207,9 +205,6 @@ drwxr-xr-x root/root usr/share/icons/hicolor/ drwxr-xr-x root/root usr/share/icons/hicolor/128x128/ drwxr-xr-x root/root usr/share/icons/hicolor/128x128/apps/ -rw-r--r-- root/root usr/share/icons/hicolor/128x128/apps/chromium.png -drwxr-xr-x root/root usr/share/icons/hicolor/16x16/ -drwxr-xr-x root/root usr/share/icons/hicolor/16x16/apps/ --rw-r--r-- root/root usr/share/icons/hicolor/16x16/apps/chromium.png drwxr-xr-x root/root usr/share/icons/hicolor/22x22/ drwxr-xr-x root/root usr/share/icons/hicolor/22x22/apps/ -rw-r--r-- root/root usr/share/icons/hicolor/22x22/apps/chromium.png @@ -219,9 +214,6 @@ drwxr-xr-x root/root usr/share/icons/hicolor/24x24/apps/ drwxr-xr-x root/root usr/share/icons/hicolor/256x256/ drwxr-xr-x root/root usr/share/icons/hicolor/256x256/apps/ -rw-r--r-- root/root usr/share/icons/hicolor/256x256/apps/chromium.png -drwxr-xr-x root/root usr/share/icons/hicolor/32x32/ -drwxr-xr-x root/root usr/share/icons/hicolor/32x32/apps/ --rw-r--r-- root/root usr/share/icons/hicolor/32x32/apps/chromium.png drwxr-xr-x root/root usr/share/icons/hicolor/48x48/ drwxr-xr-x root/root usr/share/icons/hicolor/48x48/apps/ -rw-r--r-- root/root usr/share/icons/hicolor/48x48/apps/chromium.png diff --git a/chromium/.md5sum b/chromium/.md5sum index 8750d1d45..ba8616800 100644 --- a/chromium/.md5sum +++ b/chromium/.md5sum @@ -1,3 +1,3 @@ -3c9e2dcfe55e9caf84d818b90c215318 chromium-20.0.1132.47.tar.bz2 +dab90271e918f48ed215648521d5a8a0 bison.patch +971d28f3db0754be6b5bd44ff42f1304 chromium-21.0.1180.79.tar.bz2 64968626706b07721983ac59fb3babbf chromium.sh -da33607d9287587d8458fb5689c3484b fix-svnversion.patch diff --git a/chromium/Pkgfile b/chromium/Pkgfile index a84b19820..dcd41d998 100644 --- a/chromium/Pkgfile +++ b/chromium/Pkgfile @@ -5,17 +5,16 @@ # Depends on: dbus-glib gtk libevent nss xorg-libxscrnsaver xorg-libxtst libgcrypt xorg-libxdamage yasm xorg-libxt alsa-lib krb5 name=chromium -version=20.0.1132.47 +version=21.0.1180.79 release=1 source=(http://gsdview.appspot.com/chromium-browser-official/$name-$version.tar.bz2 \ - $name.sh fix-svnversion.patch) + $name.sh bison.patch) build() { cd $name-$version - # http://code.google.com/p/chromium/issues/detail?id=126452 - # fix build when subversion is not installed - patch -p0 -i $SRC/fix-svnversion.patch + # https://bugs.webkit.org/show_bug.cgi?id=92264 + patch -d ./third_party/WebKit -p1 -i $SRC/bison.patch find third_party/WebKit/Source ui/base/ime \ -type f -exec sed -e 's|||g' -i {} \; @@ -61,7 +60,7 @@ build() { cp -a out/Release/resources $PKG/usr/lib/chromium install -m 0644 -D out/Release/chrome.1 $PKG/usr/man/man1/chromium.1 - for size in 16 22 24 32 48 128 256; do + for size in 22 24 48 128 256; do install -m 0644 -D chrome/app/theme/chromium/product_logo_${size}.png \ $PKG/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png done diff --git a/chromium/bison.patch b/chromium/bison.patch new file mode 100644 index 000000000..7649f8bb5 --- /dev/null +++ b/chromium/bison.patch @@ -0,0 +1,554 @@ +diff --git a/Source/WebCore/css/CSSGrammar.y b/Source/WebCore/css/CSSGrammar.y +index c7c10b541cd46ad4febc6efe289e81b2cfb0861e..1c604e76b4da4cc65f395bc4a73b112561bd5c84 100644 +--- a/Source/WebCore/css/CSSGrammar.y ++++ b/Source/WebCore/css/CSSGrammar.y +@@ -53,14 +53,13 @@ using namespace HTMLNames; + #define YYMAXDEPTH 10000 + #define YYDEBUG 0 + +-// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x +-#define YYPARSE_PARAM parser +-#define YYLEX_PARAM parser +- + %} + + %pure_parser + ++%parse-param { CSSParser* parser } ++%lex-param { CSSParser* parser } ++ + %union { + bool boolean; + char character; +@@ -89,7 +88,7 @@ using namespace HTMLNames; + + %{ + +-static inline int cssyyerror(const char*) ++static inline int cssyyerror(void*, const char*) + { + return 1; + } +diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp +index 650844060477cfc6ea6fdeaf11ec63b34ac646e7..8369549dbff25537cf93a11237a9bbbac4fe50f2 100644 +--- a/Source/WebCore/css/CSSParser.cpp ++++ b/Source/WebCore/css/CSSParser.cpp +@@ -114,7 +114,7 @@ + extern int cssyydebug; + #endif + +-extern int cssyyparse(void* parser); ++extern int cssyyparse(WebCore::CSSParser*); + + using namespace std; + using namespace WTF; +diff --git a/Source/WebCore/xml/XPathGrammar.y b/Source/WebCore/xml/XPathGrammar.y +index 2eba5b35bd2338272a0f4ec756d137e47d2d59c8..d558211db2d89ea13716762a51397755560f66f3 100644 +--- a/Source/WebCore/xml/XPathGrammar.y ++++ b/Source/WebCore/xml/XPathGrammar.y +@@ -34,6 +34,7 @@ + #include "XPathParser.h" + #include "XPathPath.h" + #include "XPathPredicate.h" ++#include "XPathStep.h" + #include "XPathVariableReference.h" + #include + +@@ -44,8 +45,6 @@ + #define YYLTYPE_IS_TRIVIAL 1 + #define YYDEBUG 0 + #define YYMAXDEPTH 10000 +-#define YYPARSE_PARAM parserParameter +-#define PARSER static_cast(parserParameter) + + using namespace WebCore; + using namespace XPath; +@@ -53,6 +52,7 @@ using namespace XPath; + %} + + %pure_parser ++%parse-param { WebCore::XPath::Parser* parser } + + %union + { +@@ -71,7 +71,7 @@ using namespace XPath; + %{ + + static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); } +-static void xpathyyerror(const char*) { } ++static void xpathyyerror(void*, const char*) { } + + %} + +@@ -118,7 +118,7 @@ static void xpathyyerror(const char*) { } + Expr: + OrExpr + { +- PARSER->m_topExpr = $1; ++ parser->m_topExpr = $1; + } + ; + +@@ -138,7 +138,7 @@ AbsoluteLocationPath: + '/' + { + $$ = new LocationPath; +- PARSER->registerParseNode($$); ++ parser->registerParseNode($$); + } + | + '/' RelativeLocationPath +@@ -150,7 +150,7 @@ AbsoluteLocationPath: + { + $$ = $2; + $$->insertFirstStep($1); +- PARSER->unregisterParseNode($1); ++ parser->unregisterParseNode($1); + } + ; + +@@ -159,22 +159,22 @@ RelativeLocationPath: + { + $$ = new LocationPath; + $$->appendStep($1); +- PARSER->unregisterParseNode($1); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->registerParseNode($$); + } + | + RelativeLocationPath '/' Step + { + $$->appendStep($3); +- PARSER->unregisterParseNode($3); ++ parser->unregisterParseNode($3); + } + | + RelativeLocationPath DescendantOrSelf Step + { + $$->appendStep($2); + $$->appendStep($3); +- PARSER->unregisterParseNode($2); +- PARSER->unregisterParseNode($3); ++ parser->unregisterParseNode($2); ++ parser->unregisterParseNode($3); + } + ; + +@@ -183,58 +183,58 @@ Step: + { + if ($2) { + $$ = new Step(Step::ChildAxis, *$1, *$2); +- PARSER->deletePredicateVector($2); ++ parser->deletePredicateVector($2); + } else + $$ = new Step(Step::ChildAxis, *$1); +- PARSER->deleteNodeTest($1); +- PARSER->registerParseNode($$); ++ parser->deleteNodeTest($1); ++ parser->registerParseNode($$); + } + | + NAMETEST OptionalPredicateList + { + String localName; + String namespaceURI; +- if (!PARSER->expandQName(*$1, localName, namespaceURI)) { +- PARSER->m_gotNamespaceError = true; ++ if (!parser->expandQName(*$1, localName, namespaceURI)) { ++ parser->m_gotNamespaceError = true; + YYABORT; + } + + if ($2) { + $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2); +- PARSER->deletePredicateVector($2); ++ parser->deletePredicateVector($2); + } else + $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); +- PARSER->deleteString($1); +- PARSER->registerParseNode($$); ++ parser->deleteString($1); ++ parser->registerParseNode($$); + } + | + AxisSpecifier NodeTest OptionalPredicateList + { + if ($3) { + $$ = new Step($1, *$2, *$3); +- PARSER->deletePredicateVector($3); ++ parser->deletePredicateVector($3); + } else + $$ = new Step($1, *$2); +- PARSER->deleteNodeTest($2); +- PARSER->registerParseNode($$); ++ parser->deleteNodeTest($2); ++ parser->registerParseNode($$); + } + | + AxisSpecifier NAMETEST OptionalPredicateList + { + String localName; + String namespaceURI; +- if (!PARSER->expandQName(*$2, localName, namespaceURI)) { +- PARSER->m_gotNamespaceError = true; ++ if (!parser->expandQName(*$2, localName, namespaceURI)) { ++ parser->m_gotNamespaceError = true; + YYABORT; + } + + if ($3) { + $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3); +- PARSER->deletePredicateVector($3); ++ parser->deletePredicateVector($3); + } else + $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); +- PARSER->deleteString($2); +- PARSER->registerParseNode($$); ++ parser->deleteString($2); ++ parser->registerParseNode($$); + } + | + AbbreviatedStep +@@ -259,23 +259,23 @@ NodeTest: + else if (*$1 == "comment") + $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest); + +- PARSER->deleteString($1); +- PARSER->registerNodeTest($$); ++ parser->deleteString($1); ++ parser->registerNodeTest($$); + } + | + PI '(' ')' + { + $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest); +- PARSER->deleteString($1); +- PARSER->registerNodeTest($$); ++ parser->deleteString($1); ++ parser->registerNodeTest($$); + } + | + PI '(' LITERAL ')' + { + $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace()); +- PARSER->deleteString($1); +- PARSER->deleteString($3); +- PARSER->registerNodeTest($$); ++ parser->deleteString($1); ++ parser->deleteString($3); ++ parser->registerNodeTest($$); + } + ; + +@@ -293,14 +293,14 @@ PredicateList: + { + $$ = new Vector; + $$->append(new Predicate($1)); +- PARSER->unregisterParseNode($1); +- PARSER->registerPredicateVector($$); ++ parser->unregisterParseNode($1); ++ parser->registerPredicateVector($$); + } + | + PredicateList Predicate + { + $$->append(new Predicate($2)); +- PARSER->unregisterParseNode($2); ++ parser->unregisterParseNode($2); + } + ; + +@@ -315,7 +315,7 @@ DescendantOrSelf: + SLASHSLASH + { + $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); +- PARSER->registerParseNode($$); ++ parser->registerParseNode($$); + } + ; + +@@ -323,13 +323,13 @@ AbbreviatedStep: + '.' + { + $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); +- PARSER->registerParseNode($$); ++ parser->registerParseNode($$); + } + | + DOTDOT + { + $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); +- PARSER->registerParseNode($$); ++ parser->registerParseNode($$); + } + ; + +@@ -337,8 +337,8 @@ PrimaryExpr: + VARIABLEREFERENCE + { + $$ = new VariableReference(*$1); +- PARSER->deleteString($1); +- PARSER->registerParseNode($$); ++ parser->deleteString($1); ++ parser->registerParseNode($$); + } + | + '(' Expr ')' +@@ -349,15 +349,15 @@ PrimaryExpr: + LITERAL + { + $$ = new StringExpression(*$1); +- PARSER->deleteString($1); +- PARSER->registerParseNode($$); ++ parser->deleteString($1); ++ parser->registerParseNode($$); + } + | + NUMBER + { + $$ = new Number($1->toDouble()); +- PARSER->deleteString($1); +- PARSER->registerParseNode($$); ++ parser->deleteString($1); ++ parser->registerParseNode($$); + } + | + FunctionCall +@@ -369,8 +369,8 @@ FunctionCall: + $$ = createFunction(*$1); + if (!$$) + YYABORT; +- PARSER->deleteString($1); +- PARSER->registerParseNode($$); ++ parser->deleteString($1); ++ parser->registerParseNode($$); + } + | + FUNCTIONNAME '(' ArgumentList ')' +@@ -378,9 +378,9 @@ FunctionCall: + $$ = createFunction(*$1, *$3); + if (!$$) + YYABORT; +- PARSER->deleteString($1); +- PARSER->deleteExpressionVector($3); +- PARSER->registerParseNode($$); ++ parser->deleteString($1); ++ parser->deleteExpressionVector($3); ++ parser->registerParseNode($$); + } + ; + +@@ -389,14 +389,14 @@ ArgumentList: + { + $$ = new Vector; + $$->append($1); +- PARSER->unregisterParseNode($1); +- PARSER->registerExpressionVector($$); ++ parser->unregisterParseNode($1); ++ parser->registerExpressionVector($$); + } + | + ArgumentList ',' Argument + { + $$->append($3); +- PARSER->unregisterParseNode($3); ++ parser->unregisterParseNode($3); + } + ; + +@@ -412,9 +412,9 @@ UnionExpr: + $$ = new Union; + $$->addSubExpression($1); + $$->addSubExpression($3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + ; + +@@ -430,9 +430,9 @@ PathExpr: + { + $3->setAbsolute(true); + $$ = new Path(static_cast($1), $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + | + FilterExpr DescendantOrSelf RelativeLocationPath +@@ -440,10 +440,10 @@ PathExpr: + $3->insertFirstStep($2); + $3->setAbsolute(true); + $$ = new Path(static_cast($1), $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($2); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($2); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + ; + +@@ -453,9 +453,9 @@ FilterExpr: + PrimaryExpr PredicateList + { + $$ = new Filter($1, *$2); +- PARSER->unregisterParseNode($1); +- PARSER->deletePredicateVector($2); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->deletePredicateVector($2); ++ parser->registerParseNode($$); + } + ; + +@@ -465,9 +465,9 @@ OrExpr: + OrExpr OR AndExpr + { + $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + ; + +@@ -477,9 +477,9 @@ AndExpr: + AndExpr AND EqualityExpr + { + $$ = new LogicalOp(LogicalOp::OP_And, $1, $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + ; + +@@ -489,9 +489,9 @@ EqualityExpr: + EqualityExpr EQOP RelationalExpr + { + $$ = new EqTestOp($2, $1, $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + ; + +@@ -501,9 +501,9 @@ RelationalExpr: + RelationalExpr RELOP AdditiveExpr + { + $$ = new EqTestOp($2, $1, $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + ; + +@@ -513,17 +513,17 @@ AdditiveExpr: + AdditiveExpr PLUS MultiplicativeExpr + { + $$ = new NumericOp(NumericOp::OP_Add, $1, $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + | + AdditiveExpr MINUS MultiplicativeExpr + { + $$ = new NumericOp(NumericOp::OP_Sub, $1, $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + ; + +@@ -533,9 +533,9 @@ MultiplicativeExpr: + MultiplicativeExpr MULOP UnaryExpr + { + $$ = new NumericOp($2, $1, $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + ; + +@@ -546,8 +546,8 @@ UnaryExpr: + { + $$ = new Negative; + $$->addSubExpression($2); +- PARSER->unregisterParseNode($2); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($2); ++ parser->registerParseNode($$); + } + ; + +diff --git a/Source/WebCore/xml/XPathParser.cpp b/Source/WebCore/xml/XPathParser.cpp +index 62d8ee37fd6ebb74a580a00c59beb6cd40c5a8b7..b5e6a9237593b4aaa2a243f2ff9d86e57f930a97 100644 +--- a/Source/WebCore/xml/XPathParser.cpp ++++ b/Source/WebCore/xml/XPathParser.cpp +@@ -32,24 +32,21 @@ + #include "XPathEvaluator.h" + #include "XPathException.h" + #include "XPathNSResolver.h" ++#include "XPathPath.h" + #include "XPathStep.h" + #include + #include + +-int xpathyyparse(void*); +- ++using namespace WebCore; + using namespace WTF; + using namespace Unicode; ++using namespace XPath; + +-namespace WebCore { +-namespace XPath { +- +-class LocationPath; +- +-#include "XPathGrammar.h" ++extern int xpathyyparse(WebCore::XPath::Parser*); ++#include "XPathGrammar.h" + + Parser* Parser::currentParser = 0; +- ++ + enum XMLCat { NameStart, NameCont, NotPartOfName }; + + typedef HashMap AxisNamesMap; +@@ -630,5 +627,3 @@ void Parser::deleteNodeTest(Step::NodeTest* t) + delete t; + } + +-} +-} diff --git a/chromium/fix-svnversion.patch b/chromium/fix-svnversion.patch deleted file mode 100644 index 992dec61d..000000000 --- a/chromium/fix-svnversion.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/webrtc/build/common.gypi.orig 2012-05-04 18:32:52.126703414 +0200 -+++ third_party/webrtc/build/common.gypi 2012-05-04 18:35:14.186709933 +0200 -@@ -98,7 +98,7 @@ - 'defines': [ - # TODO(leozwang): Most of team use git-svn, need to add - # git-svn support as well. -- 'WEBRTC_SVNREVISION="/dev/null || echo -n 0)"', - ], - 'conditions': [ - ['build_with_chromium==1', {