Revert "Straighten out zoom and border-image"

third_party/WebKit/Source/core/paint/NinePieceImagePainter.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/NinePieceImagePainter.h"
 
 #include "core/layout/ImageQualityController.h"
 #include "core/layout/LayoutBoxModelObject.h"
 #include "core/paint/BoxPainter.h"
 #include "core/paint/NinePieceImageGrid.h"
@@ skipping 24 matching lines @@
         return false;
 
     // FIXME: border-image is broken with full page zooming when tiling has to happen, since the tiling function
     // doesn't have any understanding of the zoom that is in effect on the tile.
     LayoutRect rectWithOutsets = rect;
     rectWithOutsets.expand(style.imageOutsets(ninePieceImage));
     LayoutRect borderImageRect = rectWithOutsets;
 
     // NinePieceImage returns the image slices without effective zoom applied and thus we compute
     // the nine piece grid on top of the image in unzoomed coordinates.
-    LayoutSize defaultObjectSize = borderImageRect.size();
-    defaultObjectSize.scale(1 / style.effectiveZoom());
-    IntSize imageSize = roundedIntSize(styleImage->imageSize(m_layoutObject, 1, defaultObjectSize));
+    //
+    // FIXME: The default object size passed to imageSize() should be scaled by the zoom factor
+    // passed in. In this case it means that borderImageRect should be passed in compensated by
+    // effective zoom, since the scale factor is one. For generated images, the actual image data
+    // (gradient stops, etc.) are scaled to effective zoom instead so we must take care not to cause
+    // scale of them again.
+    IntSize imageSize = roundedIntSize(styleImage->imageSize(m_layoutObject, 1, borderImageRect.size()));
 
     IntRectOutsets borderWidths(style.borderTopWidth(), style.borderRightWidth(),
         style.borderBottomWidth(), style.borderLeftWidth());
     NinePieceImageGrid grid(ninePieceImage, imageSize, pixelSnappedIntRect(borderImageRect), borderWidths);
 
-    RefPtr<Image> image = styleImage->image(m_layoutObject, imageSize, 1);
+    RefPtr<Image> image = styleImage->image(m_layoutObject, imageSize, style.effectiveZoom());
 
     InterpolationQuality interpolationQuality = BoxPainter::chooseInterpolationQuality(m_layoutObject, image.get(), 0, rectWithOutsets.size());
     InterpolationQuality previousInterpolationQuality = graphicsContext.imageInterpolationQuality();
     graphicsContext.setImageInterpolationQuality(interpolationQuality);
 
     TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "PaintImage", "data",
         InspectorPaintImageEvent::data(m_layoutObject, *styleImage));
 
     for (NinePiece piece = MinPiece; piece < MaxPiece; ++piece) {
         NinePieceImageGrid::NinePieceDrawInfo drawInfo = grid.getNinePieceDrawInfo(piece, styleImage->imageScaleFactor());
 
         if (drawInfo.isDrawable) {
             if (drawInfo.isCornerPiece) {
                 graphicsContext.drawImage(image.get(), drawInfo.destination, drawInfo.source, op);
             } else {
                 graphicsContext.drawTiledImage(image.get(), drawInfo.destination,
                     drawInfo.source, drawInfo.tileScale, drawInfo.tileRule.horizontal,
                     drawInfo.tileRule.vertical, op);
             }
         }
     }
 
     graphicsContext.setImageInterpolationQuality(previousInterpolationQuality);
     return true;
 }
 
 } // namespace blink