Update webkit to r44571

skia/ext/vector_canvas_unittest.cc

 // Copyright (c) 2006-2008 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 "build/build_config.h"
 
 #include "webkit/tools/test_shell/image_decoder_unittest.h"
 
 #if !defined(OS_WIN)
 #include <unistd.h>
@@ skipping 299 matching lines @@
         *pixel_addr = SkColorSetARGB(
             SkColorGetA(color),
             (SkColorGetR(color) * 255 + alpha_offset) / alpha,
             (SkColorGetG(color) * 255 + alpha_offset) / alpha,
             (SkColorGetB(color) * 255 + alpha_offset) / alpha);
       }
     }
   }
 }
 
-void LoadPngFileToSkBitmap(const std::wstring& filename, SkBitmap* bitmap) {
+void LoadPngFileToSkBitmap(const std::wstring& filename,
+                           SkBitmap* bitmap,
+                           bool is_opaque) {
   Vector<char> compressed;
   ReadFileToVector(filename, &compressed);
   EXPECT_TRUE(compressed.size());
   WebCore::PNGImageDecoder decoder;
   decoder.setData(WebCore::SharedBuffer::adoptVector(compressed).get(), true);
   *bitmap = decoder.frameBufferAtIndex(0)->bitmap();
-  EXPECT_FALSE(bitmap->isOpaque());
+  EXPECT_EQ(is_opaque, bitmap->isOpaque());
   Premultiply(*bitmap);
 }
 
 }  // namespace
 
 // Streams an image.
 inline std::ostream& operator<<(std::ostream& out, const Image& image) {
   return out << "Image(" << image.width() << ", "
              << image.height() << ", " << image.row_length() << ")";
 }
@@ skipping 448 matching lines @@
     path.addCircle(50, 75, 10);
     vcanvas_->drawPath(path, paint);
     pcanvas_->drawPath(path, paint);
     EXPECT_EQ(0., ProcessImage(L"circle"));
   }
 }
 
 TEST_F(VectorCanvasTest, Bitmaps) {
   {
     SkBitmap bitmap;
-    LoadPngFileToSkBitmap(test_file(L"bitmap_opaque.png"), &bitmap);
+    LoadPngFileToSkBitmap(test_file(L"bitmap_opaque.png"), &bitmap, true);
     vcanvas_->drawBitmap(bitmap, 13, 3, NULL);
     pcanvas_->drawBitmap(bitmap, 13, 3, NULL);
     EXPECT_EQ(0., ProcessImage(L"opaque"));
   }
 
   {
     SkBitmap bitmap;
-    LoadPngFileToSkBitmap(test_file(L"bitmap_alpha.png"), &bitmap);
+    LoadPngFileToSkBitmap(test_file(L"bitmap_alpha.png"), &bitmap, false);
     vcanvas_->drawBitmap(bitmap, 5, 15, NULL);
     pcanvas_->drawBitmap(bitmap, 5, 15, NULL);
     EXPECT_EQ(0., ProcessImage(L"alpha"));
   }
 }
 
 TEST_F(VectorCanvasTest, ClippingRect) {
   SkBitmap bitmap;
-  LoadPngFileToSkBitmap(test_file(L"..\\bitmaps\\bitmap_opaque.png"), &bitmap);
+  LoadPngFileToSkBitmap(test_file(L"..\\bitmaps\\bitmap_opaque.png"), &bitmap,
+                        true);
   SkRect rect;
   rect.fLeft = 2;
   rect.fTop = 2;
   rect.fRight = 30.5f;
   rect.fBottom = 30.5f;
   vcanvas_->clipRect(rect);
   pcanvas_->clipRect(rect);
 
   vcanvas_->drawBitmap(bitmap, 13, 3, NULL);
   pcanvas_->drawBitmap(bitmap, 13, 3, NULL);
   EXPECT_EQ(0., ProcessImage(L"rect"));
 }
 
 TEST_F(VectorCanvasTest, ClippingPath) {
   SkBitmap bitmap;
-  LoadPngFileToSkBitmap(test_file(L"..\\bitmaps\\bitmap_opaque.png"), &bitmap);
+  LoadPngFileToSkBitmap(test_file(L"..\\bitmaps\\bitmap_opaque.png"), &bitmap,
+                        true);
   SkPath path;
   path.addCircle(20, 20, 10);
   vcanvas_->clipPath(path);
   pcanvas_->clipPath(path);
 
   vcanvas_->drawBitmap(bitmap, 14, 3, NULL);
   pcanvas_->drawBitmap(bitmap, 14, 3, NULL);
   EXPECT_EQ(0., ProcessImage(L"path"));
 }
 
 TEST_F(VectorCanvasTest, ClippingCombined) {
   SkBitmap bitmap;
-  LoadPngFileToSkBitmap(test_file(L"..\\bitmaps\\bitmap_opaque.png"), &bitmap);
+  LoadPngFileToSkBitmap(test_file(L"..\\bitmaps\\bitmap_opaque.png"), &bitmap,
+                        true);
 
   SkRect rect;
   rect.fLeft = 2;
   rect.fTop = 2;
   rect.fRight = 30.5f;
   rect.fBottom = 30.5f;
   vcanvas_->clipRect(rect);
   pcanvas_->clipRect(rect);
   SkPath path;
   path.addCircle(20, 20, 10);
   vcanvas_->clipPath(path, SkRegion::kUnion_Op);
   pcanvas_->clipPath(path, SkRegion::kUnion_Op);
 
   vcanvas_->drawBitmap(bitmap, 15, 3, NULL);
   pcanvas_->drawBitmap(bitmap, 15, 3, NULL);
   EXPECT_EQ(0., ProcessImage(L"combined"));
 }
 
 TEST_F(VectorCanvasTest, ClippingIntersect) {
   SkBitmap bitmap;
-  LoadPngFileToSkBitmap(test_file(L"..\\bitmaps\\bitmap_opaque.png"), &bitmap);
+  LoadPngFileToSkBitmap(test_file(L"..\\bitmaps\\bitmap_opaque.png"), &bitmap,
+                        true);
 
   SkRect rect;
   rect.fLeft = 2;
   rect.fTop = 2;
   rect.fRight = 30.5f;
   rect.fBottom = 30.5f;
   vcanvas_->clipRect(rect);
   pcanvas_->clipRect(rect);
   SkPath path;
   path.addCircle(23, 23, 15);
   vcanvas_->clipPath(path);
   pcanvas_->clipPath(path);
 
   vcanvas_->drawBitmap(bitmap, 15, 3, NULL);
   pcanvas_->drawBitmap(bitmap, 15, 3, NULL);
   EXPECT_EQ(0., ProcessImage(L"intersect"));
 }
 
 TEST_F(VectorCanvasTest, ClippingClean) {
   SkBitmap bitmap;
-  LoadPngFileToSkBitmap(test_file(L"..\\bitmaps\\bitmap_opaque.png"), &bitmap);
+  LoadPngFileToSkBitmap(test_file(L"..\\bitmaps\\bitmap_opaque.png"), &bitmap,
+                        true);
   {
     SkRegion old_region(pcanvas_->getTotalClip());
     SkRect rect;
     rect.fLeft = 2;
     rect.fTop = 2;
     rect.fRight = 30.5f;
     rect.fBottom = 30.5f;
     vcanvas_->clipRect(rect);
     pcanvas_->clipRect(rect);
 
     vcanvas_->drawBitmap(bitmap, 15, 3, NULL);
     pcanvas_->drawBitmap(bitmap, 15, 3, NULL);
     EXPECT_EQ(0., ProcessImage(L"clipped"));
     vcanvas_->clipRegion(old_region, SkRegion::kReplace_Op);
     pcanvas_->clipRegion(old_region, SkRegion::kReplace_Op);
   }
   {
     // Verify that the clipping region has been fixed back.
     vcanvas_->drawBitmap(bitmap, 55, 3, NULL);
     pcanvas_->drawBitmap(bitmap, 55, 3, NULL);
     EXPECT_EQ(0., ProcessImage(L"unclipped"));
   }
 }
 
 TEST_F(VectorCanvasTest, DISABLED_Matrix) {
   SkBitmap bitmap;
-  LoadPngFileToSkBitmap(test_file(L"..\\bitmaps\\bitmap_opaque.png"), &bitmap);
+  LoadPngFileToSkBitmap(test_file(L"..\\bitmaps\\bitmap_opaque.png"), &bitmap,
+                        true);
   {
     vcanvas_->translate(15, 3);
     pcanvas_->translate(15, 3);
     vcanvas_->drawBitmap(bitmap, 0, 0, NULL);
     pcanvas_->drawBitmap(bitmap, 0, 0, NULL);
     EXPECT_EQ(0., ProcessImage(L"translate1"));
   }
   {
     vcanvas_->translate(-30, -23);
     pcanvas_->translate(-30, -23);
@@ skipping 22 matching lines @@
   {
     vcanvas_->rotate(67);
     pcanvas_->rotate(67);
     vcanvas_->drawBitmap(bitmap, 20, -50, NULL);
     pcanvas_->drawBitmap(bitmap, 20, -50, NULL);
     EXPECT_EQ(0., ProcessImage(L"rotate"));
   }
 }
 
 }  // namespace skia