diff options
-rw-r--r-- | DEPS | 4 | ||||
-rw-r--r-- | app/gfx/canvas.cc | 10 | ||||
-rwxr-xr-x | app/gfx/canvas.h | 10 | ||||
-rw-r--r-- | chrome/browser/cocoa/cocoa_utils.mm | 66 | ||||
-rw-r--r-- | chrome/browser/cocoa/cocoa_utils_unittest.mm | 17 | ||||
-rw-r--r-- | chrome/browser/download/download_util.cc | 2 | ||||
-rwxr-xr-x | chrome/browser/gtk/tabs/tab_renderer_gtk.cc | 2 | ||||
-rw-r--r-- | chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc | 2 | ||||
-rw-r--r-- | chrome/browser/views/tabs/tab_overview_container.cc | 2 | ||||
-rw-r--r-- | chrome/browser/views/tabs/tab_strip.cc | 2 | ||||
-rw-r--r-- | chrome/renderer/render_widget.cc | 2 | ||||
-rw-r--r-- | skia/config/SkUserConfig.h | 10 | ||||
-rw-r--r-- | skia/ext/bitmap_platform_device_mac.cc | 9 | ||||
-rw-r--r-- | skia/ext/skia_utils_mac.mm | 9 | ||||
-rwxr-xr-x | skia/skia.gyp | 1 | ||||
-rw-r--r-- | webkit/port/bindings/scripts/CodeGeneratorV8.pm | 1 | ||||
-rw-r--r-- | webkit/port/bindings/v8/v8_index.cpp | 2 | ||||
-rw-r--r-- | webkit/port/bindings/v8/v8_index.h | 2 | ||||
-rw-r--r-- | webkit/webkit.gyp | 6 |
19 files changed, 62 insertions, 97 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "45086", + "webkit_revision": "45111", } @@ -35,7 +35,7 @@ deps = { "http://v8.googlecode.com/svn/trunk@2249", "src/third_party/skia": - "http://skia.googlecode.com/svn/trunk@224", + "http://skia.googlecode.com/svn/trunk@239", "src/webkit/data/layout_tests/LayoutTests": Var("webkit_trunk") + "/LayoutTests@" + Var("webkit_revision"), diff --git a/app/gfx/canvas.cc b/app/gfx/canvas.cc index 8df6b39..2cef3de 100644 --- a/app/gfx/canvas.cc +++ b/app/gfx/canvas.cc @@ -53,7 +53,7 @@ void Canvas::FillRectInt(const SkColor& color, int x, int y, int w, int h) { SkPaint paint; paint.setColor(color); paint.setStyle(SkPaint::kFill_Style); - paint.setPorterDuffXfermode(SkPorterDuff::kSrcOver_Mode); + paint.setXfermodeMode(SkXfermode::kSrcOver_Mode); FillRectInt(x, y, w, h, paint); } @@ -63,11 +63,11 @@ void Canvas::FillRectInt(int x, int y, int w, int h, const SkPaint& paint) { } void Canvas::DrawRectInt(const SkColor& color, int x, int y, int w, int h) { - DrawRectInt(color, x, y, w, h, SkPorterDuff::kSrcOver_Mode); + DrawRectInt(color, x, y, w, h, SkXfermode::kSrcOver_Mode); } void Canvas::DrawRectInt(const SkColor& color, int x, int y, int w, int h, - SkPorterDuff::Mode mode) { + SkXfermode::Mode mode) { SkPaint paint; paint.setColor(color); paint.setStyle(SkPaint::kStroke_Style); @@ -75,7 +75,7 @@ void Canvas::DrawRectInt(const SkColor& color, int x, int y, int w, int h, // we set a stroke width of 1, for example, this will internally create a // path and fill it, which causes problems near the edge of the canvas. paint.setStrokeWidth(SkIntToScalar(0)); - paint.setPorterDuffXfermode(mode); + paint.setXfermodeMode(mode); SkIRect rc = {x, y, x + w, y + h}; drawIRect(rc, paint); @@ -236,7 +236,7 @@ void Canvas::TileImageInt(const SkBitmap& bitmap, int src_x, int src_y, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode); paint.setShader(shader); - paint.setPorterDuffXfermode(SkPorterDuff::kSrcOver_Mode); + paint.setXfermodeMode(SkXfermode::kSrcOver_Mode); // CreateBitmapShader returns a Shader with a reference count of one, we // need to unref after paint takes ownership of the shader. diff --git a/app/gfx/canvas.h b/app/gfx/canvas.h index 0fe258a..4b5f575 100755 --- a/app/gfx/canvas.h +++ b/app/gfx/canvas.h @@ -33,9 +33,9 @@ class Rect; // SkScalarRound. // // A handful of methods in this class are overloaded providing an additional -// argument of type SkPorterDuff::Mode. SkPorterDuff::Mode specifies how the +// argument of type SkXfermode::Mode. SkXfermode::Mode specifies how the // source and destination colors are combined. Unless otherwise specified, -// the variant that does not take a SkPorterDuff::Mode uses a transfer mode +// the variant that does not take a SkXfermode::Mode uses a transfer mode // of kSrcOver_Mode. class Canvas : public skia::PlatformCanvas { public: @@ -99,11 +99,11 @@ class Canvas : public skia::PlatformCanvas { void FillRectInt(int x, int y, int w, int h, const SkPaint& paint); // Fills the specified region with the specified color using a transfer - // mode of SkPorterDuff::kSrcOver_Mode. + // mode of SkXfermode::kSrcOver_Mode. void FillRectInt(const SkColor& color, int x, int y, int w, int h); // Draws a single pixel rect in the specified region with the specified - // color, using a transfer mode of SkPorterDuff::kSrcOver_Mode. + // color, using a transfer mode of SkXfermode::kSrcOver_Mode. // // NOTE: if you need a single pixel line, use DraLineInt. void DrawRectInt(const SkColor& color, int x, int y, int w, int h); @@ -113,7 +113,7 @@ class Canvas : public skia::PlatformCanvas { // // NOTE: if you need a single pixel line, use DraLineInt. void DrawRectInt(const SkColor& color, int x, int y, int w, int h, - SkPorterDuff::Mode mode); + SkXfermode::Mode mode); // Draws a single pixel line with the specified color. void DrawLineInt(const SkColor& color, int x1, int y1, int x2, int y2); 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); } diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h index f9ba042..09c99f0 100644 --- a/skia/config/SkUserConfig.h +++ b/skia/config/SkUserConfig.h @@ -166,11 +166,15 @@ typedef unsigned uint32_t; #define SK_CPU_LENDIAN #undef SK_CPU_BENDIAN -// we want (memory order) RGBA +// we want (memory order) BGRA, because that's what core image uses with +// kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host, which is what +// Apple recommends for best performance (ARGB becomes BGRA in memory on +// little-endian) -- and we want skia and coregraphic to have matching memory +// layouts, so that we don't have to spend time converting between them. #define SK_A32_SHIFT 24 -#define SK_R32_SHIFT 0 +#define SK_R32_SHIFT 16 #define SK_G32_SHIFT 8 -#define SK_B32_SHIFT 16 +#define SK_B32_SHIFT 0 #elif defined(SK_BUILD_FOR_UNIX) diff --git a/skia/ext/bitmap_platform_device_mac.cc b/skia/ext/bitmap_platform_device_mac.cc index fd8a3a8..60293d8 100644 --- a/skia/ext/bitmap_platform_device_mac.cc +++ b/skia/ext/bitmap_platform_device_mac.cc @@ -47,6 +47,10 @@ bool Constrain(int available_size, int* position, int *size) { static CGContextRef CGContextForData(void* data, int width, int height) { CGColorSpaceRef color_space = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB); +#define HAS_ARGB_SHIFTS(a, r, g, b) \ + (SK_A32_SHIFT == (a) && SK_R32_SHIFT == (r) \ + && SK_G32_SHIFT == (g) && SK_B32_SHIFT == (b)) +#if defined(SK_CPU_LENDIAN) && HAS_ARGB_SHIFTS(24, 16, 8, 0) // Allocate a bitmap context with 4 components per pixel (BGRA). Apple // recommends these flags for improved CG performance. CGContextRef context = @@ -54,6 +58,11 @@ static CGContextRef CGContextForData(void* data, int width, int height) { color_space, kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host); +#else +#error We require that Skia's and CoreGraphics's recommended \ + image memory layout match. +#endif +#undef HAS_ARGB_SHIFTS CGColorSpaceRelease(color_space); if (!context) diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm index 6880ea8..463fd52 100644 --- a/skia/ext/skia_utils_mac.mm +++ b/skia/ext/skia_utils_mac.mm @@ -127,11 +127,20 @@ SkBitmap NSImageToSkBitmap(NSImage* image, NSSize size, bool is_opaque) { // Allocate a bitmap context with 4 components per pixel (BGRA). Apple // recommends these flags for improved CG performance. +#define HAS_ARGB_SHIFTS(a, r, g, b) \ + (SK_A32_SHIFT == (a) && SK_R32_SHIFT == (r) \ + && SK_G32_SHIFT == (g) && SK_B32_SHIFT == (b)) +#if defined(SK_CPU_LENDIAN) && HAS_ARGB_SHIFTS(24, 16, 8, 0) scoped_cftyperef<CGContextRef> context( CGBitmapContextCreate(data, size.width, size.height, 8, size.width*4, color_space, kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host)); +#else +#error We require that Skia's and CoreGraphics's recommended \ + image memory layout match. +#endif +#undef HAS_ARGB_SHIFTS // Something went really wrong. Best guess is that the bitmap data is invalid. DCHECK(context != NULL); diff --git a/skia/skia.gyp b/skia/skia.gyp index 0d911eb..6402147 100755 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -321,6 +321,7 @@ '../third_party/skia/src/effects/SkLayerRasterizer.cpp', '../third_party/skia/src/effects/SkNWayCanvas.cpp', '../third_party/skia/src/effects/SkPaintFlagsDrawFilter.cpp', + '../third_party/skia/src/effects/SkPorterDuff.cpp', '../third_party/skia/src/effects/SkPixelXorXfermode.cpp', '../third_party/skia/src/effects/SkRadialGradient_Table.h', '../third_party/skia/src/effects/SkTransparentShader.cpp', diff --git a/webkit/port/bindings/scripts/CodeGeneratorV8.pm b/webkit/port/bindings/scripts/CodeGeneratorV8.pm index 19ced9d..bcd29e8 100644 --- a/webkit/port/bindings/scripts/CodeGeneratorV8.pm +++ b/webkit/port/bindings/scripts/CodeGeneratorV8.pm @@ -1713,6 +1713,7 @@ my %typeCanFailConversion = ( "AtomicString" => 0, "Attr" => 1, "CompareHow" => 0, + "DataGridColumn" => 0, "DOMString" => 0, "DOMWindow" => 0, "DocumentType" => 0, diff --git a/webkit/port/bindings/v8/v8_index.cpp b/webkit/port/bindings/v8/v8_index.cpp index ed2497a..d00e491 100644 --- a/webkit/port/bindings/v8/v8_index.cpp +++ b/webkit/port/bindings/v8/v8_index.cpp @@ -62,6 +62,8 @@ #include "V8CSSStyleSheet.h" #include "V8CSSVariablesDeclaration.h" #include "V8CSSVariablesRule.h" +#include "V8DataGridColumn.h" +#include "V8DataGridColumnList.h" #include "V8Database.h" #include "V8Document.h" #include "V8DocumentFragment.h" diff --git a/webkit/port/bindings/v8/v8_index.h b/webkit/port/bindings/v8/v8_index.h index 0b5f0e2b..9768d56 100644 --- a/webkit/port/bindings/v8/v8_index.h +++ b/webkit/port/bindings/v8/v8_index.h @@ -45,6 +45,8 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)(); V(CDATASECTION, CDATASection) \ V(COMMENT, Comment) \ V(DOCUMENT, Document) \ + V(DATAGRIDCOLUMN, DataGridColumn) \ + V(DATAGRIDCOLUMNLIST, DataGridColumnList) \ V(DOCUMENTFRAGMENT, DocumentFragment) \ V(DOCUMENTTYPE, DocumentType) \ V(ELEMENT, Element) \ diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index b87edea..7da230e 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -734,6 +734,8 @@ '../third_party/WebKit/WebCore/html/CanvasPattern.idl', '../third_party/WebKit/WebCore/html/CanvasPixelArray.idl', '../third_party/WebKit/WebCore/html/CanvasRenderingContext2D.idl', + '../third_party/WebKit/WebCore/html/DataGridColumn.idl', + '../third_party/WebKit/WebCore/html/DataGridColumnList.idl', '../third_party/WebKit/WebCore/html/File.idl', '../third_party/WebKit/WebCore/html/FileList.idl', '../third_party/WebKit/WebCore/html/HTMLAnchorElement.idl', @@ -1660,6 +1662,10 @@ '../third_party/WebKit/WebCore/html/CollectionCache.cpp', '../third_party/WebKit/WebCore/html/CollectionCache.h', '../third_party/WebKit/WebCore/html/CollectionType.h', + '../third_party/WebKit/WebCore/html/DataGridColumn.cpp', + '../third_party/WebKit/WebCore/html/DataGridColumn.h', + '../third_party/WebKit/WebCore/html/DataGridColumnList.cpp', + '../third_party/WebKit/WebCore/html/DataGridColumnList.h', '../third_party/WebKit/WebCore/html/File.cpp', '../third_party/WebKit/WebCore/html/File.h', '../third_party/WebKit/WebCore/html/FileList.cpp', |