summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authoramanda@chromium.org <amanda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-25 01:01:52 +0000
committeramanda@chromium.org <amanda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-25 01:01:52 +0000
commit8860e4f513e757810afecfb62a2bd282cd731ed9 (patch)
treea1905994c55ee794c1e4d3e450ba009f8d5f65f1 /chrome
parent2d896aedfc2630ee7a7c973e84d69f5099104767 (diff)
downloadchromium_src-8860e4f513e757810afecfb62a2bd282cd731ed9.zip
chromium_src-8860e4f513e757810afecfb62a2bd282cd731ed9.tar.gz
chromium_src-8860e4f513e757810afecfb62a2bd282cd731ed9.tar.bz2
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
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/cocoa/cocoa_utils.mm66
-rw-r--r--chrome/browser/cocoa/cocoa_utils_unittest.mm17
-rw-r--r--chrome/browser/download/download_util.cc2
-rwxr-xr-xchrome/browser/gtk/tabs/tab_renderer_gtk.cc2
-rw-r--r--chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc2
-rw-r--r--chrome/browser/views/tabs/tab_overview_container.cc2
-rw-r--r--chrome/browser/views/tabs/tab_strip.cc2
-rw-r--r--chrome/renderer/render_widget.cc2
8 files changed, 13 insertions, 82 deletions
diff --git a/chrome/browser/cocoa/cocoa_utils.mm b/chrome/browser/cocoa/cocoa_utils.mm
index 4bc65a3..9c7584d 100644
--- a/chrome/browser/cocoa/cocoa_utils.mm
+++ b/chrome/browser/cocoa/cocoa_utils.mm
@@ -21,71 +21,9 @@ void ReleaseData(void* info, const void* pixelData, size_t size) {
namespace CocoaUtils {
-NSImage* SkBitmapToNSImage(const SkBitmap& icon) {
+NSImage* SkBitmapToNSImage(const SkBitmap& skiaBitmap) {
// First convert SkBitmap to CGImageRef.
- CGImageRef cgimage;
- if (icon.config() != SkBitmap::kARGB_8888_Config) {
- cgimage = SkCreateCGImageRef(icon);
- } else {
- // The above code returns a valid NSImage even in the
- // kARGB_8888_Config case. As an example, the unit test which
- // draws a blue SkBitmap can lockPixels, NSReadPixel, and pull out
- // a single pixel from the NSImage and see it blue. However, the
- // NSImage returned will be in ABGR format. Although Cocoa is
- // otherwise happy with that format (as seen in simple tests
- // outside Chromium), Chromium is NOT happy. In Chromium, B and R
- // are swapped.
- //
- // As a hint, CIImage supports a few formats, such as ARGB.
- // Interestingly, it does NOT support ABGR. I speculate there is
- // some way we set up our drawing context which has the format
- // specified wrong (in skia/ext/bitmap_platform_device_mac.cc),
- // but I have not been able to solve this yet.
- //
- // TODO(jrg): track down the disconnect.
- // TODO(jrg): Remove byte conversion.
- // TODO(jrg): Fix unit tests to NOT swap bytes.
- // http://crbug.com/14020
- CGBitmapInfo info = (kCGImageAlphaPremultipliedFirst |
- kCGBitmapByteOrder32Host);
- int width = icon.width();
- int height = icon.height();
- int rowbytes = icon.rowBytes();
- int rowwords = rowbytes/4;
- unsigned length = rowbytes * height;
- DCHECK(length > 0);
- uint32_t* rawptr = static_cast<uint32_t*>(malloc(length));
- DCHECK(rawptr);
- if (!rawptr || !length)
- return nil;
-
- // Convert ABGR to ARGB
- icon.lockPixels();
- uint32_t* rawbitmap = static_cast<uint32_t*>(icon.getPixels());
- uint32_t rawbit;
- int offset;
- for (int y = 0; y < height; y++) {
- for (int x = 0; x < width; x++) {
- offset = x + y*rowwords;
- rawbit = rawbitmap[offset];
- rawptr[offset] = SkPackARGB32(SkGetPackedA32(rawbit),
- SkGetPackedR32(rawbit),
- SkGetPackedG32(rawbit),
- SkGetPackedB32(rawbit));
- }
- }
- icon.unlockPixels();
-
- CGDataProviderRef dataRef =
- CGDataProviderCreateWithData(rawptr, rawptr, length, ReleaseData);
- CGColorSpaceRef space = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
- cgimage = CGImageCreate(width, height, 8,
- icon.bytesPerPixel() * 8,
- rowbytes, space, info, dataRef,
- NULL, false, kCGRenderingIntentDefault);
- CGColorSpaceRelease(space);
- CGDataProviderRelease(dataRef);
- }
+ CGImageRef cgimage = SkCreateCGImageRef(skiaBitmap);
// Now convert to NSImage.
NSBitmapImageRep* bitmap = [[[NSBitmapImageRep alloc]
diff --git a/chrome/browser/cocoa/cocoa_utils_unittest.mm b/chrome/browser/cocoa/cocoa_utils_unittest.mm
index 7812f2c..41e188f 100644
--- a/chrome/browser/cocoa/cocoa_utils_unittest.mm
+++ b/chrome/browser/cocoa/cocoa_utils_unittest.mm
@@ -14,12 +14,11 @@ class CocoaUtilsTest : public testing::Test {
// If not red, is blue.
// If not tfbit (twenty-four-bit), is 444.
- // If swap, swap R and B before testing (see TODOs in cocoa_utils.mm)
- void ShapeHelper(int width, int height, bool isred, bool tfbit, bool swap);
+ void ShapeHelper(int width, int height, bool isred, bool tfbit);
};
void CocoaUtilsTest::ShapeHelper(int width, int height,
- bool isred, bool tfbit, bool swap) {
+ bool isred, bool tfbit) {
SkBitmap thing;
if (tfbit)
@@ -48,12 +47,6 @@ void CocoaUtilsTest::ShapeHelper(int width, int height,
[image unlockFocus];
[color getRed:&red green:&green blue:&blue alpha:&alpha];
- if (swap) {
- CGFloat tmp = red;
- red = blue;
- blue = tmp;
- }
-
// Be tolerant of floating point rounding, gamma, etc.
if (isred) {
EXPECT_GT(red, 0.8);
@@ -68,15 +61,15 @@ void CocoaUtilsTest::ShapeHelper(int width, int height,
TEST_F(CocoaUtilsTest, BitmapToNSImage_RedSquare64x64) {
- ShapeHelper(64, 64, true, true, true);
+ ShapeHelper(64, 64, true, true);
}
TEST_F(CocoaUtilsTest, BitmapToNSImage_BlueRectangle199x19) {
- ShapeHelper(199, 19, false, true, true);
+ ShapeHelper(199, 19, false, true);
}
TEST_F(CocoaUtilsTest, BitmapToNSImage_BlueRectangle444) {
- ShapeHelper(200, 200, false, false, false);
+ ShapeHelper(200, 200, false, false);
}
diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc
index 417d40c..af6ca99 100644
--- a/chrome/browser/download/download_util.cc
+++ b/chrome/browser/download/download_util.cc
@@ -207,7 +207,7 @@ void PaintDownloadComplete(gfx::Canvas* canvas,
canvas->saveLayerAlpha(&bounds,
static_cast<int>(255.0 * opacity),
SkCanvas::kARGB_ClipLayer_SaveFlag);
- canvas->drawARGB(0, 255, 255, 255, SkPorterDuff::kClear_Mode);
+ canvas->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
canvas->DrawBitmapInt(*complete, complete_bounds.x(), complete_bounds.y());
canvas->restore();
}
diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
index 5f83620..1a045ba 100755
--- a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
+++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
@@ -545,7 +545,7 @@ void TabRendererGtk::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/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(),
diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc
index 6d43982..5b9e0c3 100644
--- a/chrome/renderer/render_widget.cc
+++ b/chrome/renderer/render_widget.cc
@@ -328,7 +328,7 @@ void RenderWidget::PaintRect(const gfx::Rect& rect,
SkShader::kRepeat_TileMode,
SkShader::kRepeat_TileMode);
paint.setShader(shader)->unref();
- paint.setPorterDuffXfermode(SkPorterDuff::kSrcOver_Mode);
+ paint.setXfermodeMode(SkXfermode::kSrcOver_Mode);
canvas->drawPaint(paint);
}