summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoramanda@chromium.org <amanda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-25 01:48:04 +0000
committeramanda@chromium.org <amanda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-25 01:48:04 +0000
commit57978991e90d577b5117e42e60881f8e56f849d6 (patch)
treed45c8279e41dc320684c77f1d3ffa3785871b569
parent6733c68fcff3a44c67f4497c1446ab860dec682f (diff)
downloadchromium_src-57978991e90d577b5117e42e60881f8e56f849d6.zip
chromium_src-57978991e90d577b5117e42e60881f8e56f849d6.tar.gz
chromium_src-57978991e90d577b5117e42e60881f8e56f849d6.tar.bz2
Update Skia transfer mode names in browser/* to Skia r239
TBR=levin Review URL: http://codereview.chromium.org/147131 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19218 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/autocomplete/autocomplete_popup_view_win.cc2
-rw-r--r--chrome/browser/views/bookmark_manager_view.cc2
-rw-r--r--chrome/browser/views/download_item_view.cc4
-rw-r--r--chrome/browser/views/tabs/tab_renderer.cc2
-rw-r--r--chrome/browser/views/tabs/tab_strip.cc2
5 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_win.cc b/chrome/browser/autocomplete/autocomplete_popup_view_win.cc
index 99da7ca..7a0c9f6 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view_win.cc
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_win.cc
@@ -672,7 +672,7 @@ void AutocompletePopupViewWin::DrawEntry(HDC dc,
void AutocompletePopupViewWin::DrawStar(HDC dc, int x, int y) const {
gfx::Canvas canvas(star_->width(), star_->height(), false);
// Make the background completely transparent.
- canvas.drawColor(SK_ColorBLACK, SkPorterDuff::kClear_Mode);
+ canvas.drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode);
canvas.DrawBitmapInt(*star_, 0, 0);
canvas.getTopPlatformDevice().drawToHDC(
dc, mirroring_context_->GetLeft(x, x + star_->width()), y, NULL);
diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc
index e85c8a2..3582b86 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -325,7 +325,7 @@ std::vector<BookmarkNode*> BookmarkManagerView::GetSelectedTableNodes() {
}
void BookmarkManagerView::PaintBackground(gfx::Canvas* canvas) {
- canvas->drawColor(kBackgroundColorBottom, SkPorterDuff::kSrc_Mode);
+ canvas->drawColor(kBackgroundColorBottom, SkXfermode::kSrc_Mode);
SkPaint paint;
paint.setShader(skia::CreateGradientShader(0, kBackgroundGradientHeight,
diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc
index 5640b18..95dc81b 100644
--- a/chrome/browser/views/download_item_view.cc
+++ b/chrome/browser/views/download_item_view.cc
@@ -505,7 +505,7 @@ void DownloadItemView::Paint(gfx::Canvas* canvas) {
canvas->saveLayerAlpha(NULL,
static_cast<int>(body_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);
int x = kLeftPadding;
PaintBitmaps(canvas,
@@ -547,7 +547,7 @@ void DownloadItemView::Paint(gfx::Canvas* canvas) {
canvas->saveLayerAlpha(NULL,
static_cast<int>(drop_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);
PaintBitmaps(canvas,
drop_down_image_set->top, drop_down_image_set->center,
diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc
index a65662f..5481387 100644
--- a/chrome/browser/views/tabs/tab_renderer.cc
+++ b/chrome/browser/views/tabs/tab_renderer.cc
@@ -571,7 +571,7 @@ void TabRenderer::PaintTabBackground(gfx::Canvas* canvas) {
canvas->saveLayerAlpha(&bounds,
static_cast<int>(animation->GetCurrentValue() * kHoverOpacity * 0xff),
SkCanvas::kARGB_ClipLayer_SaveFlag);
- canvas->drawARGB(0, 255, 255, 255, SkPorterDuff::kClear_Mode);
+ canvas->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
PaintActiveTabBackground(canvas);
canvas->restore();
}
diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc
index 5bc1b0f..dea00aa 100644
--- a/chrome/browser/views/tabs/tab_strip.cc
+++ b/chrome/browser/views/tabs/tab_strip.cc
@@ -617,7 +617,7 @@ void TabStrip::PaintChildren(gfx::Canvas* canvas) {
// Make sure unselected tabs are somewhat transparent.
SkPaint paint;
paint.setColor(SkColorSetARGB(200, 255, 255, 255));
- paint.setXfermode(SkXfermode::kDstIn_Mode);
+ paint.setXfermodeMode(SkXfermode::kDstIn_Mode);
paint.setStyle(SkPaint::kFill_Style);
canvas->FillRectInt(
0, 0, width(),