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

Side by Side Diff: Source/core/rendering/HitTestLocation.cpp

Issue 815933006: Change all uses of the RoundedRect class to use FloatRoundedRect instead. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 12 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/HitTestLocation.h ('k') | Source/core/rendering/RenderBlock.cpp » ('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) 2006, 2008, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2008, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Library General Public License for more details. 13 * Library General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU Library General Public License 15 * You should have received a copy of the GNU Library General Public License
16 * along with this library; see the file COPYING.LIB. If not, write to 16 * along with this library; see the file COPYING.LIB. If not, write to
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 * Boston, MA 02110-1301, USA. 18 * Boston, MA 02110-1301, USA.
19 * 19 *
20 */ 20 */
21 21
22 #include "config.h" 22 #include "config.h"
23 #include "core/rendering/HitTestLocation.h" 23 #include "core/rendering/HitTestLocation.h"
24 24
25 #include "platform/geometry/FloatRoundedRect.h"
26
25 namespace blink { 27 namespace blink {
26 28
27 HitTestLocation::HitTestLocation() 29 HitTestLocation::HitTestLocation()
28 : m_isRectBased(false) 30 : m_isRectBased(false)
29 , m_isRectilinear(true) 31 , m_isRectilinear(true)
30 { 32 {
31 } 33 }
32 34
33 HitTestLocation::HitTestLocation(const LayoutPoint& point) 35 HitTestLocation::HitTestLocation(const LayoutPoint& point)
34 : m_point(point) 36 : m_point(point)
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 bool HitTestLocation::intersects(const LayoutRect& rect) const 142 bool HitTestLocation::intersects(const LayoutRect& rect) const
141 { 143 {
142 return intersectsRect(rect); 144 return intersectsRect(rect);
143 } 145 }
144 146
145 bool HitTestLocation::intersects(const FloatRect& rect) const 147 bool HitTestLocation::intersects(const FloatRect& rect) const
146 { 148 {
147 return intersectsRect(rect); 149 return intersectsRect(rect);
148 } 150 }
149 151
150 bool HitTestLocation::intersects(const RoundedRect& rect) const 152 bool HitTestLocation::intersects(const FloatRoundedRect& rect) const
151 { 153 {
152 return rect.intersectsQuad(m_transformedRect); 154 return rect.intersectsQuad(m_transformedRect);
153 } 155 }
154 156
155 bool HitTestLocation::containsPoint(const FloatPoint& point) const 157 bool HitTestLocation::containsPoint(const FloatPoint& point) const
156 { 158 {
157 return m_transformedRect.containsPoint(point); 159 return m_transformedRect.containsPoint(point);
158 } 160 }
159 161
160 IntRect HitTestLocation::rectForPoint(const LayoutPoint& point, unsigned topPadd ing, unsigned rightPadding, unsigned bottomPadding, unsigned leftPadding) 162 IntRect HitTestLocation::rectForPoint(const LayoutPoint& point, unsigned topPadd ing, unsigned rightPadding, unsigned bottomPadding, unsigned leftPadding)
161 { 163 {
162 IntPoint actualPoint(flooredIntPoint(point)); 164 IntPoint actualPoint(flooredIntPoint(point));
163 actualPoint -= IntSize(leftPadding, topPadding); 165 actualPoint -= IntSize(leftPadding, topPadding);
164 166
165 IntSize actualPadding(leftPadding + rightPadding, topPadding + bottomPadding ); 167 IntSize actualPadding(leftPadding + rightPadding, topPadding + bottomPadding );
166 // As IntRect is left inclusive and right exclusive (seeing IntRect::contain s(x, y)), adding "1". 168 // As IntRect is left inclusive and right exclusive (seeing IntRect::contain s(x, y)), adding "1".
167 // FIXME: Remove this once non-rect based hit-detection stops using IntRect: intersects. 169 // FIXME: Remove this once non-rect based hit-detection stops using IntRect: intersects.
168 actualPadding += IntSize(1, 1); 170 actualPadding += IntSize(1, 1);
169 171
170 return IntRect(actualPoint, actualPadding); 172 return IntRect(actualPoint, actualPadding);
171 } 173 }
172 174
173 } // namespace blink 175 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/HitTestLocation.h ('k') | Source/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698