Title: [283635] trunk/Source/WebCore
- Revision
- 283635
- Author
- [email protected]
- Date
- 2021-10-06 11:00:02 -0700 (Wed, 06 Oct 2021)
Log Message
Don't use namespace WebCore::XPath at global scope
https://bugs.webkit.org/show_bug.cgi?id=231186
Patch by Alex Christensen <[email protected]> on 2021-10-06
Reviewed by Sam Weinig.
It causes problems with unified builds, which get confused between WebCore::XPath::Function and WTF::Function.
* xml/XPathGrammar.cpp:
* xml/XPathGrammar.h:
* xml/XPathGrammar.y:
* xml/XPathParser.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (283634 => 283635)
--- trunk/Source/WebCore/ChangeLog 2021-10-06 17:54:58 UTC (rev 283634)
+++ trunk/Source/WebCore/ChangeLog 2021-10-06 18:00:02 UTC (rev 283635)
@@ -1,3 +1,17 @@
+2021-10-06 Alex Christensen <[email protected]>
+
+ Don't use namespace WebCore::XPath at global scope
+ https://bugs.webkit.org/show_bug.cgi?id=231186
+
+ Reviewed by Sam Weinig.
+
+ It causes problems with unified builds, which get confused between WebCore::XPath::Function and WTF::Function.
+
+ * xml/XPathGrammar.cpp:
+ * xml/XPathGrammar.h:
+ * xml/XPathGrammar.y:
+ * xml/XPathParser.cpp:
+
2021-10-06 Alan Bujtas <[email protected]>
Ensure that the top layer is always anchored to the RenderView
Modified: trunk/Source/WebCore/xml/XPathGrammar.cpp (283634 => 283635)
--- trunk/Source/WebCore/xml/XPathGrammar.cpp 2021-10-06 17:54:58 UTC (rev 283634)
+++ trunk/Source/WebCore/xml/XPathGrammar.cpp 2021-10-06 18:00:02 UTC (rev 283635)
@@ -178,15 +178,15 @@
typedef union YYSTYPE
#line 60 "WebCore/xml/XPathGrammar.y"
{
- NumericOp::Opcode numericOpcode;
- EqTestOp::Opcode equalityTestOpcode;
+ WebCore::XPath::NumericOp::Opcode numericOpcode;
+ WebCore::XPath::EqTestOp::Opcode equalityTestOpcode;
StringImpl* string;
- Step::Axis axis;
- LocationPath* locationPath;
- Step::NodeTest* nodeTest;
- Vector<std::unique_ptr<_expression_>>* expressionVector;
- Step* step;
- _expression_* _expression_;
+ WebCore::XPath::Step::Axis axis;
+ WebCore::XPath::LocationPath* locationPath;
+ WebCore::XPath::Step::NodeTest* nodeTest;
+ Vector<std::unique_ptr<WebCore::XPath::_expression_>>* expressionVector;
+ WebCore::XPath::Step* step;
+ WebCore::XPath::_expression_* _expression_;
}
/* Line 193 of yacc.c. */
#line 190 "./XPathGrammar.cpp"
Modified: trunk/Source/WebCore/xml/XPathGrammar.h (283634 => 283635)
--- trunk/Source/WebCore/xml/XPathGrammar.h 2021-10-06 17:54:58 UTC (rev 283634)
+++ trunk/Source/WebCore/xml/XPathGrammar.h 2021-10-06 18:00:02 UTC (rev 283635)
@@ -94,15 +94,15 @@
typedef union YYSTYPE
#line 60 "WebCore/xml/XPathGrammar.y"
{
- NumericOp::Opcode numericOpcode;
- EqTestOp::Opcode equalityTestOpcode;
+ WebCore::XPath::NumericOp::Opcode numericOpcode;
+ WebCore::XPath::EqTestOp::Opcode equalityTestOpcode;
StringImpl* string;
- Step::Axis axis;
- LocationPath* locationPath;
- Step::NodeTest* nodeTest;
- Vector<std::unique_ptr<_expression_>>* expressionVector;
- Step* step;
- _expression_* _expression_;
+ WebCore::XPath::Step::Axis axis;
+ WebCore::XPath::LocationPath* locationPath;
+ WebCore::XPath::Step::NodeTest* nodeTest;
+ Vector<std::unique_ptr<WebCore::XPath::_expression_>>* expressionVector;
+ WebCore::XPath::Step* step;
+ WebCore::XPath::_expression_* _expression_;
}
/* Line 1529 of yacc.c. */
#line 107 "./XPathGrammar.hpp"
Modified: trunk/Source/WebCore/xml/XPathGrammar.y (283634 => 283635)
--- trunk/Source/WebCore/xml/XPathGrammar.y 2021-10-06 17:54:58 UTC (rev 283634)
+++ trunk/Source/WebCore/xml/XPathGrammar.y 2021-10-06 18:00:02 UTC (rev 283635)
@@ -58,15 +58,15 @@
%parse-param { Parser& parser }
%union {
- NumericOp::Opcode numericOpcode;
- EqTestOp::Opcode equalityTestOpcode;
+ WebCore::XPath::NumericOp::Opcode numericOpcode;
+ WebCore::XPath::EqTestOp::Opcode equalityTestOpcode;
StringImpl* string;
- Step::Axis axis;
- LocationPath* locationPath;
- Step::NodeTest* nodeTest;
- Vector<std::unique_ptr<_expression_>>* expressionVector;
- Step* step;
- _expression_* _expression_;
+ WebCore::XPath::Step::Axis axis;
+ WebCore::XPath::LocationPath* locationPath;
+ WebCore::XPath::Step::NodeTest* nodeTest;
+ Vector<std::unique_ptr<WebCore::XPath::_expression_>>* expressionVector;
+ WebCore::XPath::Step* step;
+ WebCore::XPath::_expression_* _expression_;
}
%left <numericOpcode> MULOP
Modified: trunk/Source/WebCore/xml/XPathParser.cpp (283634 => 283635)
--- trunk/Source/WebCore/xml/XPathParser.cpp 2021-10-06 17:54:58 UTC (rev 283634)
+++ trunk/Source/WebCore/xml/XPathParser.cpp 2021-10-06 18:00:02 UTC (rev 283635)
@@ -37,8 +37,6 @@
#include <wtf/StdLibExtras.h>
#include <wtf/text/StringHash.h>
-using namespace WebCore::XPath;
-
extern int xpathyyparse(WebCore::XPath::Parser&);
#include "XPathGrammar.h"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
