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

Side by Side Diff: Source/core/xml/XPathPath.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/XPathFunctions.cpp ('k') | Source/core/xml/XPathPredicate.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 (C) 2005 Frerich Raabe <raabe@kde.org> 2 * Copyright (C) 2005 Frerich Raabe <raabe@kde.org>
3 * Copyright (C) 2006, 2009 Apple Inc. 3 * Copyright (C) 2006, 2009 Apple 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 19 matching lines...) Expand all
30 #include "core/xml/XPathExpressionNode.h" 30 #include "core/xml/XPathExpressionNode.h"
31 #include "core/xml/XPathNodeSet.h" 31 #include "core/xml/XPathNodeSet.h"
32 32
33 namespace blink { 33 namespace blink {
34 34
35 namespace XPath { 35 namespace XPath {
36 36
37 class Predicate; 37 class Predicate;
38 class Step; 38 class Step;
39 39
40 class Filter FINAL : public Expression { 40 class Filter final : public Expression {
41 public: 41 public:
42 Filter(PassOwnPtrWillBeRawPtr<Expression>, WillBeHeapVector<OwnPtrWillBeMemb er<Predicate> >&); 42 Filter(PassOwnPtrWillBeRawPtr<Expression>, WillBeHeapVector<OwnPtrWillBeMemb er<Predicate> >&);
43 virtual ~Filter(); 43 virtual ~Filter();
44 virtual void trace(Visitor*) OVERRIDE; 44 virtual void trace(Visitor*) override;
45 45
46 virtual Value evaluate(EvaluationContext&) const OVERRIDE; 46 virtual Value evaluate(EvaluationContext&) const override;
47 47
48 private: 48 private:
49 virtual Value::Type resultType() const OVERRIDE { return Value::NodeSetValue ; } 49 virtual Value::Type resultType() const override { return Value::NodeSetValue ; }
50 50
51 OwnPtrWillBeMember<Expression> m_expr; 51 OwnPtrWillBeMember<Expression> m_expr;
52 WillBeHeapVector<OwnPtrWillBeMember<Predicate> > m_predicates; 52 WillBeHeapVector<OwnPtrWillBeMember<Predicate> > m_predicates;
53 }; 53 };
54 54
55 class LocationPath FINAL : public Expression { 55 class LocationPath final : public Expression {
56 public: 56 public:
57 LocationPath(); 57 LocationPath();
58 virtual ~LocationPath(); 58 virtual ~LocationPath();
59 virtual void trace(Visitor*) OVERRIDE; 59 virtual void trace(Visitor*) override;
60 60
61 virtual Value evaluate(EvaluationContext&) const OVERRIDE; 61 virtual Value evaluate(EvaluationContext&) const override;
62 void setAbsolute(bool value) { m_absolute = value; setIsContextNodeSensitive (!m_absolute); } 62 void setAbsolute(bool value) { m_absolute = value; setIsContextNodeSensitive (!m_absolute); }
63 void evaluate(EvaluationContext&, NodeSet&) const; // nodes is an input/outp ut parameter 63 void evaluate(EvaluationContext&, NodeSet&) const; // nodes is an input/outp ut parameter
64 void appendStep(Step*); 64 void appendStep(Step*);
65 void insertFirstStep(Step*); 65 void insertFirstStep(Step*);
66 66
67 private: 67 private:
68 virtual Value::Type resultType() const OVERRIDE { return Value::NodeSetValue ; } 68 virtual Value::Type resultType() const override { return Value::NodeSetValue ; }
69 69
70 WillBeHeapVector<RawPtrWillBeMember<Step> > m_steps; 70 WillBeHeapVector<RawPtrWillBeMember<Step> > m_steps;
71 bool m_absolute; 71 bool m_absolute;
72 }; 72 };
73 73
74 class Path FINAL : public Expression { 74 class Path final : public Expression {
75 public: 75 public:
76 Path(Expression*, LocationPath*); 76 Path(Expression*, LocationPath*);
77 virtual ~Path(); 77 virtual ~Path();
78 virtual void trace(Visitor*) OVERRIDE; 78 virtual void trace(Visitor*) override;
79 79
80 virtual Value evaluate(EvaluationContext&) const OVERRIDE; 80 virtual Value evaluate(EvaluationContext&) const override;
81 81
82 private: 82 private:
83 virtual Value::Type resultType() const OVERRIDE { return Value::NodeSetValue ; } 83 virtual Value::Type resultType() const override { return Value::NodeSetValue ; }
84 84
85 OwnPtrWillBeMember<Expression> m_filter; 85 OwnPtrWillBeMember<Expression> m_filter;
86 OwnPtrWillBeMember<LocationPath> m_path; 86 OwnPtrWillBeMember<LocationPath> m_path;
87 }; 87 };
88 88
89 } 89 }
90 90
91 } 91 }
92 #endif // XPathPath_h 92 #endif // XPathPath_h
OLDNEW
« no previous file with comments | « Source/core/xml/XPathFunctions.cpp ('k') | Source/core/xml/XPathPredicate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698