From 8860e4f513e757810afecfb62a2bd282cd731ed9 Mon Sep 17 00:00:00 2001 From: "amanda@chromium.org" Date: Thu, 25 Jun 2009 01:01:52 +0000 Subject: 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 --- chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc | 2 +- chrome/browser/views/tabs/tab_overview_container.cc | 2 +- chrome/browser/views/tabs/tab_strip.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'chrome/browser/views') diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc index 37be9f1..512a299 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc @@ -873,7 +873,7 @@ void AutocompletePopupContentsView::MakeCanvasTransparent( SkColor transparency = GetThemeProvider()->ShouldUseNativeFrame() ? kGlassPopupTransparency : kOpaquePopupTransparency; paint.setColor(SkColorSetARGB(transparency, 255, 255, 255)); - paint.setPorterDuffXfermode(SkPorterDuff::kDstIn_Mode); + paint.setXfermodeMode(SkXfermode::kDstIn_Mode); paint.setStyle(SkPaint::kFill_Style); canvas->FillRectInt(0, 0, canvas->getDevice()->width(), canvas->getDevice()->height(), paint); diff --git a/chrome/browser/views/tabs/tab_overview_container.cc b/chrome/browser/views/tabs/tab_overview_container.cc index c69345f..09b5f9b 100644 --- a/chrome/browser/views/tabs/tab_overview_container.cc +++ b/chrome/browser/views/tabs/tab_overview_container.cc @@ -90,7 +90,7 @@ void TabOverviewContainer::Paint(gfx::Canvas* canvas) { paint.setShader(shader); shader = NULL; paint.setStyle(SkPaint::kFill_Style); - paint.setPorterDuffXfermode(SkPorterDuff::kSrcOver_Mode); + paint.setXfermodeMode(SkXfermode::kSrcOver_Mode); canvas->drawPaint(paint); // Restore the canvas (resetting the clip). diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index d669be3..5bc1b0f 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.setPorterDuffXfermode(SkPorterDuff::kDstIn_Mode); + paint.setXfermode(SkXfermode::kDstIn_Mode); paint.setStyle(SkPaint::kFill_Style); canvas->FillRectInt( 0, 0, width(), -- cgit v1.1