Pull WebKit deps to get transparency fixes, and rebaseline affected layout tests.

Add a helper class to manage Windows' transparency issues. It will create layers
and manage transforms in such a way that most effects can be achieved with
fonts and form controls on Windows while looking nice.

This removes the magic transparency color and associated infrastructure since
it is no longer needed.

This fixes semitransparent ClearType antialiasing and pngs with alpha channels
with opacity applied.

BUG=559,2791,3229,6372
Review URL: http://codereview.chromium.org/21201

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

1 files changed, 0 insertions, 16 deletions

diff --git a/skia/ext/bitmap_platform_device_win.h b/skia/ext/bitmap_platform_device_win.h
index f6e456d..428441d 100644
--- a/skia/ext/bitmap_platform_device_win.h
+++ b/skia/ext/bitmap_platform_device_win.h
@@ -61,10 +61,7 @@ class BitmapPlatformDeviceWin : public PlatformDeviceWin {
   virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region);
 
   virtual void drawToHDC(HDC dc, int x, int y, const RECT* src_rect);
-  virtual void prepareForGDI(int x, int y, int width, int height);
-  virtual void postProcessGDI(int x, int y, int width, int height);
   virtual void makeOpaque(int x, int y, int width, int height);
-  virtual void fixupAlphaBeforeCompositing();
   virtual bool IsVectorial() { return false; }
 
   // Returns the color value at the specified location. This does not
@@ -78,10 +75,6 @@ class BitmapPlatformDeviceWin : public PlatformDeviceWin {
   virtual void onAccessBitmap(SkBitmap* bitmap);
 
  private:
-  // Function pointer used by the processPixels method for setting the alpha
-  // value of a particular pixel.
-  typedef void (*adjustAlpha)(uint32_t* pixel);
-
   // Reference counted data that can be shared between multiple devices. This
   // allows copy constructors and operator= for devices to work properly. The
   // bitmaps used by the base device class are already refcounted and copyable.
@@ -91,15 +84,6 @@ class BitmapPlatformDeviceWin : public PlatformDeviceWin {
   BitmapPlatformDeviceWin(BitmapPlatformDeviceWinData* data,
                           const SkBitmap& bitmap);
 
-  // Loops through each of the pixels in the specified range, invoking
-  // adjustor for the alpha value of each pixel. If |width| or |height| are -1,
-  // the available width/height is used.
-  template<adjustAlpha adjustor>
-  void processPixels(int x,
-                     int y,
-                     int width,
-                     int height);
-
   // Data associated with this device, guaranteed non-null. We hold a reference
   // to this object.
   BitmapPlatformDeviceWinData* data_;