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

Side by Side Diff: third_party/WebKit/Source/core/paint/NinePieceImageGrid.cpp

Issue 1660863002: Force all LayoutUnit construction to be explicit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Also fix LayoutRectTest.cpp Created 4 years, 10 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 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/paint/NinePieceImageGrid.h" 5 #include "core/paint/NinePieceImageGrid.h"
6 6
7 #include "core/style/ComputedStyle.h" 7 #include "core/style/ComputedStyle.h"
8 #include "core/style/NinePieceImage.h" 8 #include "core/style/NinePieceImage.h"
9 #include "platform/LengthFunctions.h" 9 #include "platform/LengthFunctions.h"
10 #include "platform/geometry/FloatSize.h" 10 #include "platform/geometry/FloatSize.h"
11 #include "platform/geometry/IntSize.h" 11 #include "platform/geometry/IntSize.h"
12 12
13 namespace blink { 13 namespace blink {
14 14
15 static int computeEdgeWidth(const BorderImageLength& borderSlice, int borderSide , const LayoutUnit& imageSide, 15 static int computeEdgeWidth(const BorderImageLength& borderSlice, int borderSide , int imageSide,
16 const LayoutUnit& boxExtent) 16 int boxExtent)
17 { 17 {
18 if (borderSlice.isNumber()) 18 if (borderSlice.isNumber())
19 return borderSlice.number() * borderSide; 19 return borderSlice.number() * borderSide;
20 if (borderSlice.length().isAuto()) 20 if (borderSlice.length().isAuto())
21 return imageSide; 21 return imageSide;
22 return valueForLength(borderSlice.length(), boxExtent); 22 return valueForLength(borderSlice.length(), LayoutUnit(boxExtent));
23 } 23 }
24 24
25 static int computeEdgeSlice(const Length& slice, LayoutUnit maximum) 25 static int computeEdgeSlice(const Length& slice, int maximum)
26 { 26 {
27 return std::min<int>(maximum, valueForLength(slice, maximum)); 27 return std::min<int>(maximum, valueForLength(slice, LayoutUnit(maximum)));
28 } 28 }
29 29
30 NinePieceImageGrid::NinePieceImageGrid(const NinePieceImage& ninePieceImage, Int Size imageSize, IntRect borderImageArea, 30 NinePieceImageGrid::NinePieceImageGrid(const NinePieceImage& ninePieceImage, Int Size imageSize, IntRect borderImageArea,
31 const IntRectOutsets& borderWidths) 31 const IntRectOutsets& borderWidths)
32 : m_borderImageArea(borderImageArea) 32 : m_borderImageArea(borderImageArea)
33 , m_imageSize(imageSize) 33 , m_imageSize(imageSize)
34 , m_horizontalTileRule((Image::TileRule)ninePieceImage.horizontalRule()) 34 , m_horizontalTileRule((Image::TileRule)ninePieceImage.horizontalRule())
35 , m_verticalTileRule((Image::TileRule)ninePieceImage.verticalRule()) 35 , m_verticalTileRule((Image::TileRule)ninePieceImage.verticalRule())
36 , m_fill(ninePieceImage.fill()) 36 , m_fill(ninePieceImage.fill())
37 { 37 {
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 setDrawInfoCorner(drawInfo, piece); 240 setDrawInfoCorner(drawInfo, piece);
241 else if (piece != MiddlePiece) 241 else if (piece != MiddlePiece)
242 setDrawInfoEdge(drawInfo, piece); 242 setDrawInfoEdge(drawInfo, piece);
243 else 243 else
244 setDrawInfoMiddle(drawInfo); 244 setDrawInfoMiddle(drawInfo);
245 245
246 return drawInfo; 246 return drawInfo;
247 } 247 }
248 248
249 } // namespace blink 249 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698