Merge image sizing algorithms

third_party/WebKit/Source/core/paint/NinePieceImageGrid.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/paint/NinePieceImageGrid.h"
 
 #include "core/style/ComputedStyle.h"
 #include "core/style/NinePieceImage.h"
 #include "platform/LengthFunctions.h"
 #include "platform/geometry/FloatSize.h"
@@ skipping 17 matching lines @@
 }
 
 NinePieceImageGrid::NinePieceImageGrid(const NinePieceImage& ninePieceImage, IntSize imageSize, IntRect borderImageArea,
     const IntRectOutsets& borderWidths)
     : m_borderImageArea(borderImageArea)
     , m_imageSize(imageSize)
     , m_horizontalTileRule((Image::TileRule)ninePieceImage.horizontalRule())
     , m_verticalTileRule((Image::TileRule)ninePieceImage.verticalRule())
     , m_fill(ninePieceImage.fill())
 {
-    StyleImage* styleImage = ninePieceImage.image();
-    ASSERT(styleImage);
-
-    float imageScaleFactor = styleImage->imageScaleFactor();
-    m_top.slice = computeEdgeSlice(ninePieceImage.imageSlices().top(), imageSize.height()) * imageScaleFactor;
-    m_right.slice = computeEdgeSlice(ninePieceImage.imageSlices().right(), imageSize.width()) * imageScaleFactor;
-    m_bottom.slice = computeEdgeSlice(ninePieceImage.imageSlices().bottom(), imageSize.height()) * imageScaleFactor;
-    m_left.slice = computeEdgeSlice(ninePieceImage.imageSlices().left(), imageSize.width()) * imageScaleFactor;
+    m_top.slice = computeEdgeSlice(ninePieceImage.imageSlices().top(), imageSize.height());
+    m_right.slice = computeEdgeSlice(ninePieceImage.imageSlices().right(), imageSize.width());
+    m_bottom.slice = computeEdgeSlice(ninePieceImage.imageSlices().bottom(), imageSize.height());
+    m_left.slice = computeEdgeSlice(ninePieceImage.imageSlices().left(), imageSize.width());
 
     m_top.width = computeEdgeWidth(ninePieceImage.borderSlices().top(), borderWidths.top(), m_top.slice,
         borderImageArea.height());
     m_right.width = computeEdgeWidth(ninePieceImage.borderSlices().right(), borderWidths.right(), m_right.slice,
         borderImageArea.width());
     m_bottom.width = computeEdgeWidth(ninePieceImage.borderSlices().bottom(), borderWidths.bottom(), m_bottom.slice,
         borderImageArea.height());
     m_left.width = computeEdgeWidth(ninePieceImage.borderSlices().left(), borderWidths.left(), m_left.slice,
         borderImageArea.width());
 
@@ skipping 184 matching lines @@
         setDrawInfoCorner(drawInfo, piece);
     else if (piece != MiddlePiece)
         setDrawInfoEdge(drawInfo, piece);
     else
         setDrawInfoMiddle(drawInfo);
 
     return drawInfo;
 }
 
 } // namespace blink