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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « Source/core/xml/XPathPath.h ('k') | Source/core/xml/XPathResult.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2005 Frerich Raabe <raabe@kde.org> 2 * Copyright 2005 Frerich Raabe <raabe@kde.org>
3 * Copyright (C) 2006 Apple Computer, Inc. 3 * Copyright (C) 2006 Apple Computer, Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 16 matching lines...) Expand all
27 #ifndef XPathPredicate_h 27 #ifndef XPathPredicate_h
28 #define XPathPredicate_h 28 #define XPathPredicate_h
29 29
30 #include "core/xml/XPathExpressionNode.h" 30 #include "core/xml/XPathExpressionNode.h"
31 #include "core/xml/XPathValue.h" 31 #include "core/xml/XPathValue.h"
32 32
33 namespace blink { 33 namespace blink {
34 34
35 namespace XPath { 35 namespace XPath {
36 36
37 class Number FINAL : public Expression { 37 class Number final : public Expression {
38 public: 38 public:
39 explicit Number(double); 39 explicit Number(double);
40 virtual void trace(Visitor*) OVERRIDE; 40 virtual void trace(Visitor*) override;
41 41
42 private: 42 private:
43 virtual Value evaluate(EvaluationContext&) const OVERRIDE; 43 virtual Value evaluate(EvaluationContext&) const override;
44 virtual Value::Type resultType() const OVERRIDE { return Value::NumberValue; } 44 virtual Value::Type resultType() const override { return Value::NumberValue; }
45 45
46 Value m_value; 46 Value m_value;
47 }; 47 };
48 48
49 class StringExpression FINAL : public Expression { 49 class StringExpression final : public Expression {
50 public: 50 public:
51 explicit StringExpression(const String&); 51 explicit StringExpression(const String&);
52 virtual void trace(Visitor*) OVERRIDE; 52 virtual void trace(Visitor*) override;
53 53
54 private: 54 private:
55 virtual Value evaluate(EvaluationContext&) const OVERRIDE; 55 virtual Value evaluate(EvaluationContext&) const override;
56 virtual Value::Type resultType() const OVERRIDE { return Value::StringValue; } 56 virtual Value::Type resultType() const override { return Value::StringValue; }
57 57
58 Value m_value; 58 Value m_value;
59 }; 59 };
60 60
61 class Negative FINAL : public Expression { 61 class Negative final : public Expression {
62 private: 62 private:
63 virtual Value evaluate(EvaluationContext&) const OVERRIDE; 63 virtual Value evaluate(EvaluationContext&) const override;
64 virtual Value::Type resultType() const OVERRIDE { return Value::NumberValue; } 64 virtual Value::Type resultType() const override { return Value::NumberValue; }
65 }; 65 };
66 66
67 class NumericOp FINAL : public Expression { 67 class NumericOp final : public Expression {
68 public: 68 public:
69 enum Opcode { 69 enum Opcode {
70 OP_Add, OP_Sub, OP_Mul, OP_Div, OP_Mod 70 OP_Add, OP_Sub, OP_Mul, OP_Div, OP_Mod
71 }; 71 };
72 NumericOp(Opcode, PassOwnPtrWillBeRawPtr<Expression> lhs, PassOwnPtrWillBeRa wPtr<Expression> rhs); 72 NumericOp(Opcode, PassOwnPtrWillBeRawPtr<Expression> lhs, PassOwnPtrWillBeRa wPtr<Expression> rhs);
73 73
74 private: 74 private:
75 virtual Value evaluate(EvaluationContext&) const OVERRIDE; 75 virtual Value evaluate(EvaluationContext&) const override;
76 virtual Value::Type resultType() const OVERRIDE { return Value::NumberValue; } 76 virtual Value::Type resultType() const override { return Value::NumberValue; }
77 77
78 Opcode m_opcode; 78 Opcode m_opcode;
79 }; 79 };
80 80
81 class EqTestOp FINAL : public Expression { 81 class EqTestOp final : public Expression {
82 public: 82 public:
83 enum Opcode { OpcodeEqual, OpcodeNotEqual, OpcodeGreaterThan, OpcodeLessThan , OpcodeGreaterOrEqual, OpcodeLessOrEqual }; 83 enum Opcode { OpcodeEqual, OpcodeNotEqual, OpcodeGreaterThan, OpcodeLessThan , OpcodeGreaterOrEqual, OpcodeLessOrEqual };
84 EqTestOp(Opcode, PassOwnPtrWillBeRawPtr<Expression> lhs, PassOwnPtrWillBeRaw Ptr<Expression> rhs); 84 EqTestOp(Opcode, PassOwnPtrWillBeRawPtr<Expression> lhs, PassOwnPtrWillBeRaw Ptr<Expression> rhs);
85 virtual Value evaluate(EvaluationContext&) const OVERRIDE; 85 virtual Value evaluate(EvaluationContext&) const override;
86 86
87 private: 87 private:
88 virtual Value::Type resultType() const OVERRIDE { return Value::BooleanValue ; } 88 virtual Value::Type resultType() const override { return Value::BooleanValue ; }
89 bool compare(EvaluationContext&, const Value&, const Value&) const; 89 bool compare(EvaluationContext&, const Value&, const Value&) const;
90 90
91 Opcode m_opcode; 91 Opcode m_opcode;
92 }; 92 };
93 93
94 class LogicalOp FINAL : public Expression { 94 class LogicalOp final : public Expression {
95 public: 95 public:
96 enum Opcode { OP_And, OP_Or }; 96 enum Opcode { OP_And, OP_Or };
97 LogicalOp(Opcode, PassOwnPtrWillBeRawPtr<Expression> lhs, PassOwnPtrWillBeRa wPtr<Expression> rhs); 97 LogicalOp(Opcode, PassOwnPtrWillBeRawPtr<Expression> lhs, PassOwnPtrWillBeRa wPtr<Expression> rhs);
98 98
99 private: 99 private:
100 virtual Value::Type resultType() const OVERRIDE { return Value::BooleanValue ; } 100 virtual Value::Type resultType() const override { return Value::BooleanValue ; }
101 bool shortCircuitOn() const; 101 bool shortCircuitOn() const;
102 virtual Value evaluate(EvaluationContext&) const OVERRIDE; 102 virtual Value evaluate(EvaluationContext&) const override;
103 103
104 Opcode m_opcode; 104 Opcode m_opcode;
105 }; 105 };
106 106
107 class Union FINAL : public Expression { 107 class Union final : public Expression {
108 private: 108 private:
109 virtual Value evaluate(EvaluationContext&) const OVERRIDE; 109 virtual Value evaluate(EvaluationContext&) const override;
110 virtual Value::Type resultType() const OVERRIDE { return Value::NodeSetValue ; } 110 virtual Value::Type resultType() const override { return Value::NodeSetValue ; }
111 }; 111 };
112 112
113 class Predicate FINAL : public NoBaseWillBeGarbageCollected<Predicate> { 113 class Predicate final : public NoBaseWillBeGarbageCollected<Predicate> {
114 WTF_MAKE_NONCOPYABLE(Predicate); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED; 114 WTF_MAKE_NONCOPYABLE(Predicate); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
115 DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(Predicate); 115 DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(Predicate);
116 public: 116 public:
117 explicit Predicate(PassOwnPtrWillBeRawPtr<Expression>); 117 explicit Predicate(PassOwnPtrWillBeRawPtr<Expression>);
118 void trace(Visitor*); 118 void trace(Visitor*);
119 119
120 bool evaluate(EvaluationContext&) const; 120 bool evaluate(EvaluationContext&) const;
121 bool isContextPositionSensitive() const { return m_expr->isContextPositionSe nsitive() || m_expr->resultType() == Value::NumberValue; } 121 bool isContextPositionSensitive() const { return m_expr->isContextPositionSe nsitive() || m_expr->resultType() == Value::NumberValue; }
122 bool isContextSizeSensitive() const { return m_expr->isContextSizeSensitive( ); } 122 bool isContextSizeSensitive() const { return m_expr->isContextSizeSensitive( ); }
123 123
124 private: 124 private:
125 OwnPtrWillBeMember<Expression> m_expr; 125 OwnPtrWillBeMember<Expression> m_expr;
126 }; 126 };
127 127
128 } 128 }
129 129
130 } 130 }
131 #endif // XPathPredicate_h 131 #endif // XPathPredicate_h
OLDNEW
« 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