Merge image sizing algorithms

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

Index: third_party/WebKit/Source/core/paint/NinePieceImageGrid.cpp
diff --git a/third_party/WebKit/Source/core/paint/NinePieceImageGrid.cpp b/third_party/WebKit/Source/core/paint/NinePieceImageGrid.cpp
index 2feb67c701d9ea1aeaf2046580b1114798abac6b..16c1dadda9d6cbaab9c559e9835eeb250d7c2f19 100644
--- a/third_party/WebKit/Source/core/paint/NinePieceImageGrid.cpp
+++ b/third_party/WebKit/Source/core/paint/NinePieceImageGrid.cpp
@@ -35,14 +35,10 @@ NinePieceImageGrid::NinePieceImageGrid(const NinePieceImage& ninePieceImage, Int
     , 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());