Revert "roll skia 636:673"

This reverts "roll skia 636:673", it broke webkit tests. I will re-checkin with suppressions later, and then update baselines after that.

TBR=jar

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70700 0039d316-1c4b-4281-b951-d872f2087c98

14 files changed, 28 insertions, 57 deletions

diff --git a/skia/ext/bitmap_platform_device_linux.cc b/skia/ext/bitmap_platform_device_linux.cc
index 4164d93..034d6bd 100644
--- a/skia/ext/bitmap_platform_device_linux.cc
+++ b/skia/ext/bitmap_platform_device_linux.cc
@@ -37,8 +37,7 @@ void LoadClipToContext(cairo_t* context, const SkRegion& clip) {
 
 }  // namespace
 
-SkDevice* BitmapPlatformDeviceFactory::newDevice(SkCanvas* ignored,
-                                                 SkBitmap::Config config,
+SkDevice* BitmapPlatformDeviceFactory::newDevice(SkBitmap::Config config,
                                                  int width, int height,
                                                  bool isOpaque,
                                                  bool isForLayer) {
diff --git a/skia/ext/bitmap_platform_device_linux.h b/skia/ext/bitmap_platform_device_linux.h
index 7eda357..27109e3 100644
--- a/skia/ext/bitmap_platform_device_linux.h
+++ b/skia/ext/bitmap_platform_device_linux.h
@@ -45,8 +45,7 @@ namespace skia {
 
 class BitmapPlatformDeviceFactory : public SkDeviceFactory {
  public:
-  virtual SkDevice* newDevice(SkCanvas* ignored, SkBitmap::Config config,
-                              int width, int height,
+  virtual SkDevice* newDevice(SkBitmap::Config config, int width, int height,
                               bool isOpaque, bool isForLayer);
 };
 
diff --git a/skia/ext/bitmap_platform_device_mac.cc b/skia/ext/bitmap_platform_device_mac.cc
index 8435dbe..bb7edc6 100644
--- a/skia/ext/bitmap_platform_device_mac.cc
+++ b/skia/ext/bitmap_platform_device_mac.cc
@@ -49,8 +49,7 @@ static CGContextRef CGContextForData(void* data, int width, int height) {
 
 }  // namespace
 
-SkDevice* BitmapPlatformDeviceFactory::newDevice(SkCanvas* ignored,
-                                                 SkBitmap::Config config,
+SkDevice* BitmapPlatformDeviceFactory::newDevice(SkBitmap::Config config,
                                                  int width, int height,
                                                  bool isOpaque,
                                                  bool isForLayer) {
diff --git a/skia/ext/bitmap_platform_device_mac.h b/skia/ext/bitmap_platform_device_mac.h
index 20d8918..484d923 100644
--- a/skia/ext/bitmap_platform_device_mac.h
+++ b/skia/ext/bitmap_platform_device_mac.h
@@ -12,8 +12,7 @@ namespace skia {
 
 class BitmapPlatformDeviceFactory : public SkDeviceFactory {
  public:
-  virtual SkDevice* newDevice(SkCanvas* ignored, SkBitmap::Config config,
-                              int width, int height,
+  virtual SkDevice* newDevice(SkBitmap::Config config, int width, int height,
                               bool isOpaque, bool isForLayer);
 };
 
diff --git a/skia/ext/bitmap_platform_device_win.cc b/skia/ext/bitmap_platform_device_win.cc
index 3d407f0f..b7ad13f 100644
--- a/skia/ext/bitmap_platform_device_win.cc
+++ b/skia/ext/bitmap_platform_device_win.cc
@@ -15,8 +15,7 @@
 
 namespace skia {
 
-SkDevice* BitmapPlatformDeviceFactory::newDevice(SkCanvas* ignored,
-                                                 SkBitmap::Config config,
+SkDevice* BitmapPlatformDeviceFactory::newDevice(SkBitmap::Config config,
                                                  int width, int height,
                                                  bool isOpaque,
                                                  bool isForLayer) {
diff --git a/skia/ext/bitmap_platform_device_win.h b/skia/ext/bitmap_platform_device_win.h
index ffaad81..af402f4 100644
--- a/skia/ext/bitmap_platform_device_win.h
+++ b/skia/ext/bitmap_platform_device_win.h
@@ -12,8 +12,7 @@ namespace skia {
 
 class BitmapPlatformDeviceFactory : public SkDeviceFactory {
  public:
-  virtual SkDevice* newDevice(SkCanvas* ignored, SkBitmap::Config config, 
-                              int width, int height,
+  virtual SkDevice* newDevice(SkBitmap::Config config, int width, int height,
                               bool isOpaque, bool isForLayer);
 };
 
diff --git a/skia/ext/platform_device_linux.cc b/skia/ext/platform_device_linux.cc
index 46b5350..3cdf6e88 100644
--- a/skia/ext/platform_device_linux.cc
+++ b/skia/ext/platform_device_linux.cc
@@ -6,8 +6,7 @@
 
 namespace skia {
 
-PlatformDevice::PlatformDevice(const SkBitmap& bitmap)
-    : SkDevice(NULL, bitmap, /*isForLayer=*/false) {
+PlatformDevice::PlatformDevice(const SkBitmap& bitmap) : SkDevice(bitmap) {
 }
 
 }  // namespace skia
diff --git a/skia/ext/platform_device_mac.cc b/skia/ext/platform_device_mac.cc
index 31f0d19..42927cc 100644
--- a/skia/ext/platform_device_mac.cc
+++ b/skia/ext/platform_device_mac.cc
@@ -32,8 +32,7 @@ bool constrain(int available_size, int* position, int *size) {
 
 } // namespace
 
-PlatformDevice::PlatformDevice(const SkBitmap& bitmap)
-    : SkDevice(NULL, bitmap, /*isForLayer=*/false) {
+PlatformDevice::PlatformDevice(const SkBitmap& bitmap) : SkDevice(bitmap) {
 }
 
 // Set up the CGContextRef for peaceful coexistence with Skia
diff --git a/skia/ext/platform_device_win.cc b/skia/ext/platform_device_win.cc
index 039de33..7bb5bd9 100644
--- a/skia/ext/platform_device_win.cc
+++ b/skia/ext/platform_device_win.cc
@@ -13,7 +13,7 @@
 namespace skia {
 
 PlatformDevice::PlatformDevice(const SkBitmap& bitmap)
-    : SkDevice(NULL, bitmap, /*isForLayer=*/false) {
+    : SkDevice(bitmap) {
 }
 
 // static
diff --git a/skia/ext/vector_platform_device_linux.cc b/skia/ext/vector_platform_device_linux.cc
index 39dca8b..8f5be43 100644
--- a/skia/ext/vector_platform_device_linux.cc
+++ b/skia/ext/vector_platform_device_linux.cc
@@ -68,8 +68,7 @@ bool IsContextValid(cairo_t* context) {
 
 namespace skia {
 
-SkDevice* VectorPlatformDeviceFactory::newDevice(SkCanvas* ignored,
-                                                 SkBitmap::Config config,
+SkDevice* VectorPlatformDeviceFactory::newDevice(SkBitmap::Config config,
                                                  int width, int height,
                                                  bool isOpaque,
                                                  bool isForLayer) {
@@ -140,7 +139,6 @@ PlatformDevice::PlatformSurface VectorPlatformDevice::beginPlatformPaint() {
 
 void VectorPlatformDevice::drawBitmap(const SkDraw& draw,
                                       const SkBitmap& bitmap,
-                                      const SkIRect* srcRectOrNull,
                                       const SkMatrix& matrix,
                                       const SkPaint& paint) {
   SkASSERT(bitmap.getConfig() == SkBitmap::kARGB_8888_Config);
@@ -187,9 +185,7 @@ void VectorPlatformDevice::drawPaint(const SkDraw& draw,
 
 void VectorPlatformDevice::drawPath(const SkDraw& draw,
                                     const SkPath& path,
-                                    const SkPaint& paint,
-                                    const SkMatrix* prePathMatrix,
-                                    bool pathIsMutable) {
+                                    const SkPaint& paint) {
   if (paint.getPathEffect()) {
     // Apply the path effect forehand.
     SkPath path_modified;
diff --git a/skia/ext/vector_platform_device_linux.h b/skia/ext/vector_platform_device_linux.h
index 6bed270..1cf8a0c 100644
--- a/skia/ext/vector_platform_device_linux.h
+++ b/skia/ext/vector_platform_device_linux.h
@@ -14,8 +14,7 @@ namespace skia {
 
 class VectorPlatformDeviceFactory : public SkDeviceFactory {
  public:
-  virtual SkDevice* newDevice(SkCanvas* ignored, SkBitmap::Config config,
-                              int width, int height,
+  virtual SkDevice* newDevice(SkBitmap::Config config, int width, int height,
                               bool isOpaque, bool isForLayer);
 
   static SkDevice* CreateDevice(cairo_t* context, int width, int height,
@@ -41,15 +40,12 @@ class VectorPlatformDevice : public PlatformDevice {
 
   // We translate following skia APIs into corresponding Cairo APIs.
   virtual void drawBitmap(const SkDraw& draw, const SkBitmap& bitmap,
-                          const SkIRect* srcRectOrNull,
                           const SkMatrix& matrix, const SkPaint& paint);
   virtual void drawDevice(const SkDraw& draw, SkDevice*, int x, int y,
                           const SkPaint&);
   virtual void drawPaint(const SkDraw& draw, const SkPaint& paint);
   virtual void drawPath(const SkDraw& draw, const SkPath& path,
-                        const SkPaint& paint,
-                        const SkMatrix* prePathMatrix = NULL,
-                        bool pathIsMutable = false);
+                        const SkPaint& paint);
   virtual void drawPoints(const SkDraw& draw, SkCanvas::PointMode mode,
                           size_t count, const SkPoint[], const SkPaint& paint);
   virtual void drawPosText(const SkDraw& draw, const void* text, size_t len,
diff --git a/skia/ext/vector_platform_device_win.cc b/skia/ext/vector_platform_device_win.cc
index 31ac722..d9bb8b4 100644
--- a/skia/ext/vector_platform_device_win.cc
+++ b/skia/ext/vector_platform_device_win.cc
@@ -12,8 +12,7 @@
 
 namespace skia {
 
-SkDevice* VectorPlatformDeviceFactory::newDevice(SkCanvas* unused,
-                                                 SkBitmap::Config config,
+SkDevice* VectorPlatformDeviceFactory::newDevice(SkBitmap::Config config,
                                                  int width, int height,
                                                  bool isOpaque,
                                                  bool isForLayer) {
@@ -203,9 +202,7 @@ void VectorPlatformDevice::drawRect(const SkDraw& draw,
 
 void VectorPlatformDevice::drawPath(const SkDraw& draw,
                                     const SkPath& path,
-                                    const SkPaint& paint,
-                                    const SkMatrix* prePathMatrix,
-                                    bool pathIsMutable) {
+                                    const SkPaint& paint) {
   if (paint.getPathEffect()) {
     // Apply the path effect forehand.
     SkPath path_modified;
@@ -250,7 +247,6 @@ void VectorPlatformDevice::drawPath(const SkDraw& draw,
 
 void VectorPlatformDevice::drawBitmap(const SkDraw& draw,
                                       const SkBitmap& bitmap,
-                                      const SkIRect* srcRectOrNull,
                                       const SkMatrix& matrix,
                                       const SkPaint& paint) {
   // Load the temporary matrix. This is what will translate, rotate and resize
diff --git a/skia/ext/vector_platform_device_win.h b/skia/ext/vector_platform_device_win.h
index 2a5057e..14b33e5 100644
--- a/skia/ext/vector_platform_device_win.h
+++ b/skia/ext/vector_platform_device_win.h
@@ -6,7 +6,6 @@
 #define SKIA_EXT_VECTOR_PLATFORM_DEVICE_WIN_H_
 #pragma once
 
-#include "base/compiler_specific.h"
 #include "skia/ext/platform_device.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkRegion.h"
@@ -15,9 +14,8 @@ namespace skia {
 
 class VectorPlatformDeviceFactory : public SkDeviceFactory {
  public:
-  virtual SkDevice* newDevice(SkCanvas* ignored, SkBitmap::Config config,
-                              int width, int height,
-                              bool isOpaque, bool isForLayer) OVERRIDE;
+  virtual SkDevice* newDevice(SkBitmap::Config config, int width, int height,
+                              bool isOpaque, bool isForLayer);
   static SkDevice* CreateDevice(int width, int height, bool isOpaque,
                                 HANDLE shared_section);
 };
@@ -42,38 +40,33 @@ class VectorPlatformDevice : public PlatformDevice {
     return hdc_;
   }
 
-  virtual void drawPaint(const SkDraw& draw, const SkPaint& paint) OVERRIDE;
+  virtual void drawPaint(const SkDraw& draw, const SkPaint& paint);
   virtual void drawPoints(const SkDraw& draw, SkCanvas::PointMode mode,
-                          size_t count, const SkPoint[],
-                          const SkPaint& paint) OVERRIDE;
+                          size_t count, const SkPoint[], const SkPaint& paint);
   virtual void drawRect(const SkDraw& draw, const SkRect& r,
-                        const SkPaint& paint) OVERRIDE;
+                        const SkPaint& paint);
   virtual void drawPath(const SkDraw& draw, const SkPath& path,
-                        const SkPaint& paint,
-                        const SkMatrix* prePathMatrix = NULL,
-                        bool pathIsMutable = false) OVERRIDE;
+                        const SkPaint& paint);
   virtual void drawBitmap(const SkDraw& draw, const SkBitmap& bitmap,
-                          const SkIRect* srcRectOrNull,
-                          const SkMatrix& matrix,
-                          const SkPaint& paint) OVERRIDE;
+                          const SkMatrix& matrix, const SkPaint& paint);
   virtual void drawSprite(const SkDraw& draw, const SkBitmap& bitmap,
-                          int x, int y, const SkPaint& paint) OVERRIDE;
+                          int x, int y, const SkPaint& paint);
   virtual void drawText(const SkDraw& draw, const void* text, size_t len,
-                        SkScalar x, SkScalar y, const SkPaint& paint) OVERRIDE;
+                        SkScalar x, SkScalar y, const SkPaint& paint);
   virtual void drawPosText(const SkDraw& draw, const void* text, size_t len,
                            const SkScalar pos[], SkScalar constY,
-                           int scalarsPerPos, const SkPaint& paint) OVERRIDE;
+                           int scalarsPerPos, const SkPaint& paint);
   virtual void drawTextOnPath(const SkDraw& draw, const void* text, size_t len,
                               const SkPath& path, const SkMatrix* matrix,
-                              const SkPaint& paint) OVERRIDE;
+                              const SkPaint& paint);
   virtual void drawVertices(const SkDraw& draw, SkCanvas::VertexMode,
                             int vertexCount,
                             const SkPoint verts[], const SkPoint texs[],
                             const SkColor colors[], SkXfermode* xmode,
                             const uint16_t indices[], int indexCount,
-                            const SkPaint& paint) OVERRIDE;
+                            const SkPaint& paint);
   virtual void drawDevice(const SkDraw& draw, SkDevice*, int x, int y,
-                          const SkPaint&) OVERRIDE;
+                          const SkPaint&);
 
 
   virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region);
diff --git a/skia/skia.gyp b/skia/skia.gyp
index c08f405..d5382d1 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -302,8 +302,6 @@
         '../third_party/skia/src/effects/Sk1DPathEffect.cpp',
         '../third_party/skia/src/effects/Sk2DPathEffect.cpp',
         '../third_party/skia/src/effects/SkAvoidXfermode.cpp',
-        '../third_party/skia/src/effects/SkBitmapCache.cpp',
-        '../third_party/skia/src/effects/SkBitmapCache.h',
         '../third_party/skia/src/effects/SkBlurDrawLooper.cpp',
         '../third_party/skia/src/effects/SkBlurMask.cpp',
         '../third_party/skia/src/effects/SkBlurMask.h',