Fix incorrect pattern offsets, and rebaseline associated test results.

webkit/port/platform/graphics/skia/ImageSkia.cpp

 // Copyright (c) 2008, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 15 matching lines @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "config.h"
 
 #include "AffineTransform.h"
 #include "BitmapImage.h"
 #include "BitmapImageSingleFrameSkia.h"
 #include "ChromiumBridge.h"
+#include "FloatConversion.h"
 #include "FloatRect.h"
 #include "GraphicsContext.h"
 #include "Logging.h"
 #include "NativeImageSkia.h"
 #include "NotImplemented.h"
 #include "PlatformContextSkia.h"
 #include "PlatformString.h"
 #include "SkiaUtils.h"
 #include "SkShader.h"
 
@@ skipping 318 matching lines @@
     } else {
         // No need to do nice resampling.
         shader = SkShader::CreateBitmapShader(
             src_subset, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode);
     }
 
     // We also need to translate it such that the origin of the pattern is the
     // origin of the destination rect, which is what WebKit expects. Skia uses
     // the coordinate system origin as the base for the patter. If WebKit wants
     // a shifted image, it will shift it from there using the patternTransform.
-    matrix.postTranslate(SkFloatToScalar(phase.x()),
-                         SkFloatToScalar(phase.y()));
+    float adjustedX = phase.x() + floatSrcRect.x() *
+                      narrowPrecisionToFloat(patternTransform.a());
+    float adjustedY = phase.y() + floatSrcRect.y() *
+                      narrowPrecisionToFloat(patternTransform.d());
+    matrix.postTranslate(SkFloatToScalar(adjustedX),
+                         SkFloatToScalar(adjustedY));
     shader->setLocalMatrix(matrix);
 
     SkPaint paint;
     paint.setShader(shader)->unref();
     paint.setPorterDuffXfermode(WebCoreCompositeToSkiaComposite(compositeOp));
     paint.setFilterBitmap(resampling == RESAMPLE_LINEAR);
 
     context->platformContext()->paintSkPaint(destRect, paint);
 }
 
@@ skipping 61 matching lines @@
 PassRefPtr<BitmapImageSingleFrameSkia> BitmapImageSingleFrameSkia::create(
     const SkBitmap& bitmap)
 {
     RefPtr<BitmapImageSingleFrameSkia> image(new BitmapImageSingleFrameSkia());
     if (!bitmap.copyTo(&image->m_nativeImage, bitmap.config()))
         return 0;
     return image.release();
 }
 
 }  // namespace WebCore