Update WebKit to 45111 and Skia to 239

Review URL: http://codereview.chromium.org/147121

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

2 files changed, 10 insertions, 10 deletions

diff --git a/app/gfx/canvas.cc b/app/gfx/canvas.cc
index 8df6b39..2cef3de 100644
--- a/app/gfx/canvas.cc
+++ b/app/gfx/canvas.cc
@@ -53,7 +53,7 @@ void Canvas::FillRectInt(const SkColor& color, int x, int y, int w, int h) {
   SkPaint paint;
   paint.setColor(color);
   paint.setStyle(SkPaint::kFill_Style);
-  paint.setPorterDuffXfermode(SkPorterDuff::kSrcOver_Mode);
+  paint.setXfermodeMode(SkXfermode::kSrcOver_Mode);
   FillRectInt(x, y, w, h, paint);
 }
 
@@ -63,11 +63,11 @@ void Canvas::FillRectInt(int x, int y, int w, int h, const SkPaint& paint) {
 }
 
 void Canvas::DrawRectInt(const SkColor& color, int x, int y, int w, int h) {
-  DrawRectInt(color, x, y, w, h, SkPorterDuff::kSrcOver_Mode);
+  DrawRectInt(color, x, y, w, h, SkXfermode::kSrcOver_Mode);
 }
 
 void Canvas::DrawRectInt(const SkColor& color, int x, int y, int w, int h,
-                         SkPorterDuff::Mode mode) {
+                         SkXfermode::Mode mode) {
   SkPaint paint;
   paint.setColor(color);
   paint.setStyle(SkPaint::kStroke_Style);
@@ -75,7 +75,7 @@ void Canvas::DrawRectInt(const SkColor& color, int x, int y, int w, int h,
   // we set a stroke width of 1, for example, this will internally create a
   // path and fill it, which causes problems near the edge of the canvas.
   paint.setStrokeWidth(SkIntToScalar(0));
-  paint.setPorterDuffXfermode(mode);
+  paint.setXfermodeMode(mode);
 
   SkIRect rc = {x, y, x + w, y + h};
   drawIRect(rc, paint);
@@ -236,7 +236,7 @@ void Canvas::TileImageInt(const SkBitmap& bitmap, int src_x, int src_y,
                                                   SkShader::kRepeat_TileMode,
                                                   SkShader::kRepeat_TileMode);
   paint.setShader(shader);
-  paint.setPorterDuffXfermode(SkPorterDuff::kSrcOver_Mode);
+  paint.setXfermodeMode(SkXfermode::kSrcOver_Mode);
 
   // CreateBitmapShader returns a Shader with a reference count of one, we
   // need to unref after paint takes ownership of the shader.
diff --git a/app/gfx/canvas.h b/app/gfx/canvas.h
index 0fe258a..4b5f575 100755
--- a/app/gfx/canvas.h
+++ b/app/gfx/canvas.h
@@ -33,9 +33,9 @@ class Rect;
 // SkScalarRound.
 //
 // A handful of methods in this class are overloaded providing an additional
-// argument of type SkPorterDuff::Mode. SkPorterDuff::Mode specifies how the
+// argument of type SkXfermode::Mode. SkXfermode::Mode specifies how the
 // source and destination colors are combined. Unless otherwise specified,
-// the variant that does not take a SkPorterDuff::Mode uses a transfer mode
+// the variant that does not take a SkXfermode::Mode uses a transfer mode
 // of kSrcOver_Mode.
 class Canvas : public skia::PlatformCanvas {
  public:
@@ -99,11 +99,11 @@ class Canvas : public skia::PlatformCanvas {
   void FillRectInt(int x, int y, int w, int h, const SkPaint& paint);
 
   // Fills the specified region with the specified color using a transfer
-  // mode of SkPorterDuff::kSrcOver_Mode.
+  // mode of SkXfermode::kSrcOver_Mode.
   void FillRectInt(const SkColor& color, int x, int y, int w, int h);
 
   // Draws a single pixel rect in the specified region with the specified
-  // color, using a transfer mode of SkPorterDuff::kSrcOver_Mode.
+  // color, using a transfer mode of SkXfermode::kSrcOver_Mode.
   //
   // NOTE: if you need a single pixel line, use DraLineInt.
   void DrawRectInt(const SkColor& color, int x, int y, int w, int h);
@@ -113,7 +113,7 @@ class Canvas : public skia::PlatformCanvas {
   //
   // NOTE: if you need a single pixel line, use DraLineInt.
   void DrawRectInt(const SkColor& color, int x, int y, int w, int h,
-                   SkPorterDuff::Mode mode);
+                   SkXfermode::Mode mode);
 
   // Draws a single pixel line with the specified color.
   void DrawLineInt(const SkColor& color, int x1, int y1, int x2, int y2);