diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-25 06:09:03 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-25 06:09:03 +0000 |
| commit | 510ea77c92ad9b9c8b897b412254ccdede2b635f (patch) | |
| tree | c50a05586d1f08f16816742bfed6008b6ac30580 /ui | |
| parent | d4a0e2c7445cec440e8ff542cdefaa7555c94f16 (diff) | |
| download | chromium_src-510ea77c92ad9b9c8b897b412254ccdede2b635f.zip chromium_src-510ea77c92ad9b9c8b897b412254ccdede2b635f.tar.gz chromium_src-510ea77c92ad9b9c8b897b412254ccdede2b635f.tar.bz2 | |
Revert 119018 - Draw new tab button with tab background
Currently the new tab button is drawn with a semi-transparent image blended with the window background color.
This CL changes the drawing code so that we now use the inactive tab background image as the button's background. I've removed the fill from the newtab button images so that they just contain the border and shadow.
The main benefit of this approach is that the button now matches the look of inactive tabs.
Note, I'm only implementing this on views for now. Once this is implemented on all platforms we can remove the old button images.
Screenshots: http://imgur.com/a/iez8r
BUG=100775
TEST=
Review URL: https://chromiumcodereview.appspot.com/9252026
TBR=sail@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9288015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119020 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gfx/skbitmap_operations.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ui/gfx/skbitmap_operations.cc b/ui/gfx/skbitmap_operations.cc index 3af3948..760bd60 100644 --- a/ui/gfx/skbitmap_operations.cc +++ b/ui/gfx/skbitmap_operations.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -149,8 +149,7 @@ SkBitmap SkBitmapOperations::CreateMaskedBitmap(const SkBitmap& rgb, for (int x = 0; x < masked.width(); ++x) { SkColor rgb_pixel = SkUnPreMultiply::PMColorToColor(rgb_row[x]); - SkColor alpha_pixel = SkUnPreMultiply::PMColorToColor(alpha_row[x]); - int alpha = SkAlphaMul(SkColorGetA(rgb_pixel), SkColorGetA(alpha_pixel)); + int alpha = SkAlphaMul(SkColorGetA(rgb_pixel), SkColorGetA(alpha_row[x])); dst_row[x] = SkColorSetARGB(alpha, SkAlphaMul(SkColorGetR(rgb_pixel), alpha), SkAlphaMul(SkColorGetG(rgb_pixel), alpha), |