Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1052)

Unified Diff: Source/core/xml/XPathPredicate.h

Issue 637483002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/xml (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/xml/XPathPath.h ('k') | Source/core/xml/XPathResult.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/xml/XPathPredicate.h
diff --git a/Source/core/xml/XPathPredicate.h b/Source/core/xml/XPathPredicate.h
index 9bae3474ed1ac74377aa5ed4f2272807a9737807..2faa9913f86c01e8f0be860c3ab9744f87c4ef38 100644
--- a/Source/core/xml/XPathPredicate.h
+++ b/Source/core/xml/XPathPredicate.h
@@ -34,37 +34,37 @@ namespace blink {
namespace XPath {
-class Number FINAL : public Expression {
+class Number final : public Expression {
public:
explicit Number(double);
- virtual void trace(Visitor*) OVERRIDE;
+ virtual void trace(Visitor*) override;
private:
- virtual Value evaluate(EvaluationContext&) const OVERRIDE;
- virtual Value::Type resultType() const OVERRIDE { return Value::NumberValue; }
+ virtual Value evaluate(EvaluationContext&) const override;
+ virtual Value::Type resultType() const override { return Value::NumberValue; }
Value m_value;
};
-class StringExpression FINAL : public Expression {
+class StringExpression final : public Expression {
public:
explicit StringExpression(const String&);
- virtual void trace(Visitor*) OVERRIDE;
+ virtual void trace(Visitor*) override;
private:
- virtual Value evaluate(EvaluationContext&) const OVERRIDE;
- virtual Value::Type resultType() const OVERRIDE { return Value::StringValue; }
+ virtual Value evaluate(EvaluationContext&) const override;
+ virtual Value::Type resultType() const override { return Value::StringValue; }
Value m_value;
};
-class Negative FINAL : public Expression {
+class Negative final : public Expression {
private:
- virtual Value evaluate(EvaluationContext&) const OVERRIDE;
- virtual Value::Type resultType() const OVERRIDE { return Value::NumberValue; }
+ virtual Value evaluate(EvaluationContext&) const override;
+ virtual Value::Type resultType() const override { return Value::NumberValue; }
};
-class NumericOp FINAL : public Expression {
+class NumericOp final : public Expression {
public:
enum Opcode {
OP_Add, OP_Sub, OP_Mul, OP_Div, OP_Mod
@@ -72,45 +72,45 @@ public:
NumericOp(Opcode, PassOwnPtrWillBeRawPtr<Expression> lhs, PassOwnPtrWillBeRawPtr<Expression> rhs);
private:
- virtual Value evaluate(EvaluationContext&) const OVERRIDE;
- virtual Value::Type resultType() const OVERRIDE { return Value::NumberValue; }
+ virtual Value evaluate(EvaluationContext&) const override;
+ virtual Value::Type resultType() const override { return Value::NumberValue; }
Opcode m_opcode;
};
-class EqTestOp FINAL : public Expression {
+class EqTestOp final : public Expression {
public:
enum Opcode { OpcodeEqual, OpcodeNotEqual, OpcodeGreaterThan, OpcodeLessThan, OpcodeGreaterOrEqual, OpcodeLessOrEqual };
EqTestOp(Opcode, PassOwnPtrWillBeRawPtr<Expression> lhs, PassOwnPtrWillBeRawPtr<Expression> rhs);
- virtual Value evaluate(EvaluationContext&) const OVERRIDE;
+ virtual Value evaluate(EvaluationContext&) const override;
private:
- virtual Value::Type resultType() const OVERRIDE { return Value::BooleanValue; }
+ virtual Value::Type resultType() const override { return Value::BooleanValue; }
bool compare(EvaluationContext&, const Value&, const Value&) const;
Opcode m_opcode;
};
-class LogicalOp FINAL : public Expression {
+class LogicalOp final : public Expression {
public:
enum Opcode { OP_And, OP_Or };
LogicalOp(Opcode, PassOwnPtrWillBeRawPtr<Expression> lhs, PassOwnPtrWillBeRawPtr<Expression> rhs);
private:
- virtual Value::Type resultType() const OVERRIDE { return Value::BooleanValue; }
+ virtual Value::Type resultType() const override { return Value::BooleanValue; }
bool shortCircuitOn() const;
- virtual Value evaluate(EvaluationContext&) const OVERRIDE;
+ virtual Value evaluate(EvaluationContext&) const override;
Opcode m_opcode;
};
-class Union FINAL : public Expression {
+class Union final : public Expression {
private:
- virtual Value evaluate(EvaluationContext&) const OVERRIDE;
- virtual Value::Type resultType() const OVERRIDE { return Value::NodeSetValue; }
+ virtual Value evaluate(EvaluationContext&) const override;
+ virtual Value::Type resultType() const override { return Value::NodeSetValue; }
};
-class Predicate FINAL : public NoBaseWillBeGarbageCollected<Predicate> {
+class Predicate final : public NoBaseWillBeGarbageCollected<Predicate> {
WTF_MAKE_NONCOPYABLE(Predicate); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(Predicate);
public:
« no previous file with comments | « Source/core/xml/XPathPath.h ('k') | Source/core/xml/XPathResult.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698