Log:
Update Skia transfer modes to match changes in Skia as of r239
Review URL: http://codereview.chromium.org/146131

Modified:
   trunk/src/views/controls/button/text_button.cc
   trunk/src/views/controls/menu/menu_win.cc
   trunk/src/views/controls/menu/native_menu_win.cc
   trunk/src/views/controls/table/table_view.cc
   trunk/src/views/widget/root_view.cc

Modified: trunk/src/views/controls/button/text_button.cc
=========================================================================== ===
--- trunk/src/views/controls/button/text_button.cc      (original)
+++ trunk/src/views/controls/button/text_button.cc      Wed Jun 24 18:24:40 2009
@@ -209,7 +209,7 @@
       canvas->saveLayerAlpha(NULL,
           static_cast<int>(hover_animation_->GetCurrentValue() * 255),
           SkCanvas::kARGB_NoClipLayer_SaveFlag);
-      canvas->drawARGB(0, 255, 255, 255, SkPorterDuff::kClear_Mode);
+      canvas->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
       PaintBorder(canvas);
       canvas->restore();
     } else if (state_ == BS_HOT || state_ == BS_PUSHED) {

Modified: trunk/src/views/controls/menu/menu_win.cc
=========================================================================== ===
--- trunk/src/views/controls/menu/menu_win.cc   (original)
+++ trunk/src/views/controls/menu/menu_win.cc   Wed Jun 24 18:24:40 2009
@@ -189,7 +189,7 @@
       // by the label.
       if (data->icon.width() != 0 && data->icon.height() != 0) {
         gfx::Canvas canvas(data->icon.width(), data->icon.height(), false);
-        canvas.drawColor(SK_ColorBLACK, SkPorterDuff::kClear_Mode);
+        canvas.drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode);
         canvas.DrawBitmapInt(data->icon, 0, 0);
         canvas.getTopPlatformDevice().drawToHDC(hDC, lpdis->rcItem.left +
             kItemLeftMargin, lpdis->rcItem.top + (lpdis->rcItem.bottom -

Modified: trunk/src/views/controls/menu/native_menu_win.cc
=========================================================================== ===
--- trunk/src/views/controls/menu/native_menu_win.cc    (original)
+++ trunk/src/views/controls/menu/native_menu_win.cc    Wed Jun 24 18:24:40 2009
@@ -222,7 +222,7 @@
       SkBitmap icon;
       if (data->native_menu_win->model_->GetIconAt(data->model_index, &icon)) {
         gfx::Canvas canvas(icon.width(), icon.height(), false);
-        canvas.drawColor(SK_ColorBLACK, SkPorterDuff::kClear_Mode);
+        canvas.drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode);
         canvas.DrawBitmapInt(icon, 0, 0);
         canvas.getTopPlatformDevice().drawToHDC(dc,
             draw_item_struct->rcItem.left + kItemLeftMargin,

Modified: trunk/src/views/controls/table/table_view.cc
=========================================================================== ===
--- trunk/src/views/controls/table/table_view.cc        (original)
+++ trunk/src/views/controls/table/table_view.cc        Wed Jun 24 18:24:40 2009
@@ -840,7 +840,7 @@
     // rect does not include the icon).
     gfx::Canvas canvas(kImageSize, kImageSize, false);
     // Make the background completely transparent.
-    canvas.drawColor(SK_ColorBLACK, SkPorterDuff::kClear_Mode);
+    canvas.drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode);
     HICON empty_icon =
         IconUtil::CreateHICONFromSkBitmap(canvas.ExtractBitmap());
     ImageList_AddIcon(image_list, empty_icon);
@@ -1234,7 +1234,7 @@
               // this twice). As such, we always fill in the background.
               canvas.drawColor(
                   skia::COLORREFToSkColor(GetSysColor(bg_color_index)),
-                  SkPorterDuff::kSrc_Mode);
+                  SkXfermode::kSrc_Mode);
               // + 1 for padding (we declared the image as 18x18 in the list-
               // view when they are 16x16 so we get an extra pixel of padding).
               canvas.DrawBitmapInt(image, 0, 0,

Modified: trunk/src/views/widget/root_view.cc
=========================================================================== ===
--- trunk/src/views/widget/root_view.cc (original)
+++ trunk/src/views/widget/root_view.cc Wed Jun 24 18:24:40 2009
@@ -159,7 +159,7 @@
     return;

   // Clear the background.
-  canvas->drawColor(SK_ColorBLACK, SkPorterDuff::kClear_Mode);
+  canvas->drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode);

   // Save the current transforms.
   canvas->save();