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

Side by Side Diff: Source/platform/geometry/FloatPolygon.h

Issue 630853002: Replacing the OVERRIDE with override in third_party/WebKit/Source/platform (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase build fix 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/platform/fonts/SimpleFontData.h ('k') | Source/platform/graphics/BitmapImage.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) 2012 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 float minY() const { return std::min(vertex1().y(), vertex2().y()); } 91 float minY() const { return std::min(vertex1().y(), vertex2().y()); }
92 float maxX() const { return std::max(vertex1().x(), vertex2().x()); } 92 float maxX() const { return std::max(vertex1().x(), vertex2().x()); }
93 float maxY() const { return std::max(vertex1().y(), vertex2().y()); } 93 float maxY() const { return std::max(vertex1().y(), vertex2().y()); }
94 94
95 bool intersection(const VertexPair&, FloatPoint&) const; 95 bool intersection(const VertexPair&, FloatPoint&) const;
96 }; 96 };
97 97
98 class PLATFORM_EXPORT FloatPolygonEdge : public VertexPair { 98 class PLATFORM_EXPORT FloatPolygonEdge : public VertexPair {
99 friend class FloatPolygon; 99 friend class FloatPolygon;
100 public: 100 public:
101 virtual const FloatPoint& vertex1() const OVERRIDE 101 virtual const FloatPoint& vertex1() const override
102 { 102 {
103 ASSERT(m_polygon); 103 ASSERT(m_polygon);
104 return m_polygon->vertexAt(m_vertexIndex1); 104 return m_polygon->vertexAt(m_vertexIndex1);
105 } 105 }
106 106
107 virtual const FloatPoint& vertex2() const OVERRIDE 107 virtual const FloatPoint& vertex2() const override
108 { 108 {
109 ASSERT(m_polygon); 109 ASSERT(m_polygon);
110 return m_polygon->vertexAt(m_vertexIndex2); 110 return m_polygon->vertexAt(m_vertexIndex2);
111 } 111 }
112 112
113 const FloatPolygonEdge& previousEdge() const 113 const FloatPolygonEdge& previousEdge() const
114 { 114 {
115 ASSERT(m_polygon && m_polygon->numberOfEdges() > 1); 115 ASSERT(m_polygon && m_polygon->numberOfEdges() > 1);
116 return m_polygon->edgeAt((m_edgeIndex + m_polygon->numberOfEdges() - 1) % m_polygon->numberOfEdges()); 116 return m_polygon->edgeAt((m_edgeIndex + m_polygon->numberOfEdges() - 1) % m_polygon->numberOfEdges());
117 } 117 }
(...skipping 25 matching lines...) Expand all
143 }; 143 };
144 144
145 template<> struct ValueToString<FloatPolygonEdge*> { 145 template<> struct ValueToString<FloatPolygonEdge*> {
146 static String string(const FloatPolygonEdge* edge) { return String::format(" %p (%f,%f %f,%f)", edge, edge->vertex1().x(), edge->vertex1().y(), edge->vertex2 ().x(), edge->vertex2().y()); } 146 static String string(const FloatPolygonEdge* edge) { return String::format(" %p (%f,%f %f,%f)", edge, edge->vertex1().x(), edge->vertex1().y(), edge->vertex2 ().x(), edge->vertex2().y()); }
147 }; 147 };
148 #endif 148 #endif
149 149
150 } // namespace blink 150 } // namespace blink
151 151
152 #endif // FloatPolygon_h 152 #endif // FloatPolygon_h
OLDNEW
« no previous file with comments | « Source/platform/fonts/SimpleFontData.h ('k') | Source/platform/graphics/BitmapImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698