Update WebKit to 45111 and Skia to 239

app/gfx/canvas.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 "app/gfx/canvas.h"
 
 #include <limits>
 
 #include "app/gfx/font.h"
 #include "app/l10n_util.h"
@@ skipping 35 matching lines @@
 }
 
 void Canvas::ScaleInt(int x, int y) {
   scale(SkIntToScalar(x), SkIntToScalar(y));
 }
 
 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);
 }
 
 void Canvas::FillRectInt(int x, int y, int w, int h, const SkPaint& paint) {
   SkIRect rc = {x, y, x + w, y + h};
   drawIRect(rc, 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);
   // Set a stroke width of 0, which will put us down the stroke rect path.  If
   // 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);
 }
 
 void Canvas::DrawLineInt(const SkColor& color, int x1, int y1, int x2, int y2) {
   SkPaint paint;
   paint.setColor(color);
   paint.setStrokeWidth(SkIntToScalar(1));
   drawLine(SkIntToScalar(x1), SkIntToScalar(y1), SkIntToScalar(x2),
@@ skipping 140 matching lines @@
                           int dest_x, int dest_y, int w, int h) {
   if (!IntersectsClipRectInt(dest_x, dest_y, w, h))
     return;
 
   SkPaint paint;
 
   SkShader* shader = SkShader::CreateBitmapShader(bitmap,
                                                   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.
   shader->unref();
   save();
   translate(SkIntToScalar(dest_x - src_x), SkIntToScalar(dest_y - src_y));
   ClipRectInt(src_x, src_y, w, h);
   drawPaint(paint);
   restore();
 }
 
 SkBitmap Canvas::ExtractBitmap() {
   const SkBitmap& device_bitmap = getDevice()->accessBitmap(false);
 
   // Make a bitmap to return, and a canvas to draw into it. We don't just want
   // to call extractSubset or the copy constuctor, since we want an actual copy
   // of the bitmap.
   SkBitmap result;
   device_bitmap.copyTo(&result, SkBitmap::kARGB_8888_Config);
   return result;
 }
 
 }  // namespace gfx