Update WebKit to 45111 and Skia to 239

app/gfx/canvas.h

 // 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.
 
 #ifndef APP_GFX_CANVAS_H_
 #define APP_GFX_CANVAS_H_
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
@@ skipping 15 matching lines @@
 // Canvas is a SkCanvas subclass that provides a number of methods for common
 // operations used throughout an application built using base/gfx and app/gfx.
 //
 // All methods that take integer arguments (as is used throughout views)
 // end with Int. If you need to use methods provided by the superclass
 // you'll need to do a conversion. In particular you'll need to use
 // macro SkIntToScalar(xxx), or if converting from a scalar to an integer
 // 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:
   // Specifies the alignment for text rendered with the DrawStringInt method.
   enum {
     TEXT_ALIGN_LEFT = 1,
     TEXT_ALIGN_CENTER = 2,
     TEXT_ALIGN_RIGHT = 4,
     TEXT_VALIGN_TOP = 8,
     TEXT_VALIGN_MIDDLE = 16,
@@ skipping 43 matching lines @@
   void TranslateInt(int x, int y);
 
   // Wrapper function that takes integer arguments.
   // See scale() for specifics.
   void ScaleInt(int x, int y);
 
   // Fills the given rectangle with the given paint's parameters.
   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);
 
   // Draws a single pixel rect in the specified region with the specified
   // color and transfer mode.
   //
   // 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);
 
   // Draws a bitmap with the origin at the specified location. The upper left
   // corner of the bitmap is rendered at the specified location.
   void DrawBitmapInt(const SkBitmap& bitmap, int x, int y);
 
   // Draws a bitmap with the origin at the specified location, using the
   // specified paint. The upper left corner of the bitmap is rendered at the
@@ skipping 77 matching lines @@
                      const SkColor& color, int x, int y, int w, int h,
                      int flags);
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(Canvas);
 };
 
 }  // namespace gfx;
 
 #endif  // #ifndef APP_GFX_CANVAS_H_