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

Side by Side Diff: third_party/WebKit/Source/core/layout/svg/SVGTextQuery.cpp

Issue 2342913003: Replace narrowPrecisionToFloat with clampTo<float> (Closed)
Patch Set: Created 4 years, 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved. 2 * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Library General Public License for more details. 12 * Library General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU Library General Public License 14 * You should have received a copy of the GNU Library General Public License
15 * along with this library; see the file COPYING.LIB. If not, write to 15 * along with this library; see the file COPYING.LIB. If not, write to
16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17 * Boston, MA 02110-1301, USA. 17 * Boston, MA 02110-1301, USA.
18 */ 18 */
19 19
20 #include "core/layout/svg/SVGTextQuery.h" 20 #include "core/layout/svg/SVGTextQuery.h"
21 21
22 #include "core/layout/LayoutBlockFlow.h" 22 #include "core/layout/LayoutBlockFlow.h"
23 #include "core/layout/LayoutInline.h" 23 #include "core/layout/LayoutInline.h"
24 #include "core/layout/api/LineLayoutSVGInlineText.h" 24 #include "core/layout/api/LineLayoutSVGInlineText.h"
25 #include "core/layout/line/InlineFlowBox.h" 25 #include "core/layout/line/InlineFlowBox.h"
26 #include "core/layout/svg/LayoutSVGInlineText.h" 26 #include "core/layout/svg/LayoutSVGInlineText.h"
27 #include "core/layout/svg/SVGTextFragment.h" 27 #include "core/layout/svg/SVGTextFragment.h"
28 #include "core/layout/svg/SVGTextMetrics.h" 28 #include "core/layout/svg/SVGTextMetrics.h"
29 #include "core/layout/svg/line/SVGInlineTextBox.h" 29 #include "core/layout/svg/line/SVGInlineTextBox.h"
30 #include "platform/FloatConversion.h"
31 #include "wtf/MathExtras.h" 30 #include "wtf/MathExtras.h"
32 #include "wtf/Vector.h" 31 #include "wtf/Vector.h"
33 #include <algorithm> 32 #include <algorithm>
34 33
35 namespace blink { 34 namespace blink {
36 35
37 // Base structure for callback user data 36 // Base structure for callback user data
38 struct QueryData { 37 struct QueryData {
39 QueryData() 38 QueryData()
40 : isVerticalText(false) 39 : isVerticalText(false)
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 int startPosition = data->position; 390 int startPosition = data->position;
392 int endPosition = startPosition + 1; 391 int endPosition = startPosition + 1;
393 if (!mapStartEndPositionsIntoFragmentCoordinates(queryData, fragment, startP osition, endPosition)) 392 if (!mapStartEndPositionsIntoFragmentCoordinates(queryData, fragment, startP osition, endPosition))
394 return false; 393 return false;
395 394
396 if (!fragment.isTransformed()) { 395 if (!fragment.isTransformed()) {
397 data->rotation = 0; 396 data->rotation = 0;
398 } else { 397 } else {
399 AffineTransform fragmentTransform = fragment.buildFragmentTransform(SVGT extFragment::TransformIgnoringTextLength); 398 AffineTransform fragmentTransform = fragment.buildFragmentTransform(SVGT extFragment::TransformIgnoringTextLength);
400 fragmentTransform.scale(1 / fragmentTransform.xScale(), 1 / fragmentTran sform.yScale()); 399 fragmentTransform.scale(1 / fragmentTransform.xScale(), 1 / fragmentTran sform.yScale());
401 data->rotation = narrowPrecisionToFloat(rad2deg(atan2(fragmentTransform. b(), fragmentTransform.a()))); 400 data->rotation = clampTo<float>(rad2deg(atan2(fragmentTransform.b(), fra gmentTransform.a())));
402 } 401 }
403 return true; 402 return true;
404 } 403 }
405 404
406 float SVGTextQuery::rotationOfCharacter(unsigned position) const 405 float SVGTextQuery::rotationOfCharacter(unsigned position) const
407 { 406 {
408 RotationOfCharacterData data(position); 407 RotationOfCharacterData data(position);
409 logicalQuery(m_queryRootLayoutObject, &data, rotationOfCharacterCallback); 408 logicalQuery(m_queryRootLayoutObject, &data, rotationOfCharacterCallback);
410 return data.rotation; 409 return data.rotation;
411 } 410 }
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 } 573 }
575 574
576 int SVGTextQuery::characterNumberAtPosition(const FloatPoint& position) const 575 int SVGTextQuery::characterNumberAtPosition(const FloatPoint& position) const
577 { 576 {
578 CharacterNumberAtPositionData data(position); 577 CharacterNumberAtPositionData data(position);
579 spatialQuery(m_queryRootLayoutObject, &data, characterNumberAtPositionCallba ck); 578 spatialQuery(m_queryRootLayoutObject, &data, characterNumberAtPositionCallba ck);
580 return data.characterNumberWithin(m_queryRootLayoutObject); 579 return data.characterNumberWithin(m_queryRootLayoutObject);
581 } 580 }
582 581
583 } // namespace blink 582 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698