Changeset 136147 in webkit

Timestamp:

Nov 29, 2012, 12:12:54 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

Be consistent in handling of frameAtIndex (and related) returns.
​https://bugs.webkit.org/show_bug.cgi?id=103207

Patch by Brent Fulgham <​bfulgham@gmail.com> on 2012-11-29
Reviewed by David Hyatt.

Under various conditions, frameAtIndex (and therefore,
nativeImageForCurrentFrame) returns null. A series of bugs over
the years has ensured null returns are handled in some cases,
but there are a handful of remaining cases where this is still a
problem.

No new tests, as these low-level functions are covered by
numerous existing test cases.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cairo/GraphicsContext3DCairo.cpp (modified) (1 diff)
• platform/graphics/filters/skia/FEBlendSkia.cpp (modified) (1 diff)
• platform/graphics/filters/skia/FEComponentTransferSkia.cpp (modified) (2 diffs)
• platform/graphics/filters/skia/FELightingSkia.cpp (modified) (1 diff)
• platform/graphics/qt/GraphicsContext3DQt.cpp (modified) (1 diff)
• platform/graphics/win/ImageCGWin.cpp (modified) (1 diff)
• platform/graphics/wince/ImageWinCE.cpp (modified) (1 diff)
• platform/win/DragImageCGWin.cpp (modified) (1 diff)
• platform/win/DragImageCairoWin.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-29  Brent Fulgham  <bfulgham@gmail.com>
+
+        Be consistent in handling of frameAtIndex (and related) returns.
+        https://bugs.webkit.org/show_bug.cgi?id=103207
+
+        Reviewed by David Hyatt.
+
+        Under various conditions, frameAtIndex (and therefore,
+        nativeImageForCurrentFrame) returns null. A series of bugs over
+        the years has ensured null returns are handled in some cases,
+        but there are a handful of remaining cases where this is still a
+        problem. 
+
+        No new tests, as these low-level functions are covered by
+        numerous existing test cases.
+
 2012-11-29  David Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp

@@ -180 +180 @@
         imageSurface = nativeImage->surface();
     } else {
-        imageSurface = image->nativeImageForCurrentFrame()->surface();
+        NativeImageCairo* nativeImage = image->nativeImageForCurrentFrame();
+        imageSurface = (nativeImage) ? nativeImage->surface() : 0;
         if (!premultiplyAlpha)
             alphaOp = AlphaDoUnmultiply;

trunk/Source/WebCore/platform/graphics/filters/skia/FEBlendSkia.cpp

@@ -73 +73 @@
     RefPtr<Image> background = in2->asImageBuffer()->copyImage(DontCopyBackingStore);
 
-    SkBitmap foregroundBitmap = foreground->nativeImageForCurrentFrame()->bitmap();
-    SkBitmap backgroundBitmap = background->nativeImageForCurrentFrame()->bitmap();
+    NativeImageSkia* foregroundNativeImage = foreground->nativeImageForCurrentFrame();
+    NativeImageSkia* backgroundNativeImage = background->nativeImageForCurrentFrame();
+
+    if (!foregroundNativeImage || !backgroundNativeImage)
+        return false;
+
+    SkBitmap foregroundBitmap = foregroundNativeImage->bitmap();
+    SkBitmap backgroundBitmap = backgroundNativeImage->bitmap();
 
     SkAutoTUnref<SkImageFilter> backgroundSource(new SkBitmapSource(backgroundBitmap));

trunk/Source/WebCore/platform/graphics/filters/skia/FEComponentTransferSkia.cpp

@@ -44 +44 @@
 
     RefPtr<Image> image = in->asImageBuffer()->copyImage(DontCopyBackingStore);
-    SkBitmap bitmap = image->nativeImageForCurrentFrame()->bitmap();
+    NativeImageSkia* nativeImage = image->nativeImageForCurrentFrame();
+    if (!nativeImage)
+        return false;
 
     unsigned char rValues[256], gValues[256], bValues[256], aValues[256];
@@ -52 +54 @@
     paint.setColorFilter(SkTableColorFilter::CreateARGB(aValues, rValues, gValues, bValues))->unref();
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
-    resultImage->context()->platformContext()->drawBitmap(bitmap, 0, 0, &paint);
+    resultImage->context()->platformContext()->drawBitmap(nativeImage->bitmap(), 0, 0, &paint);
 
     return true;

trunk/Source/WebCore/platform/graphics/filters/skia/FELightingSkia.cpp

@@ -99 +99 @@
     RefPtr<Image> image = in->asImageBuffer()->copyImage(DontCopyBackingStore);
     NativeImageSkia* nativeImage = image->nativeImageForCurrentFrame();
+    if (!nativeImage)
+        return false;
 
     GraphicsContext* dstContext = resultImage->context();

trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp

@@ -504 +504 @@
     else {
         QPixmap* nativePixmap = image->nativeImageForCurrentFrame();
+        if (!nativePixmap)
+            return false;
+
         // With QPA, we can avoid a deep copy.
         qtImage = *nativePixmap->handle()->buffer();

trunk/Source/WebCore/platform/graphics/win/ImageCGWin.cpp

@@ -92 +92 @@
     for (size_t i = 0; i < frames; ++i) {
         CGImageRef image = frameAtIndex(i);
-        if (CGImageGetHeight(image) == static_cast<size_t>(srcSize.height()) && CGImageGetWidth(image) == static_cast<size_t>(srcSize.width())) {
+        if (image && CGImageGetHeight(image) == static_cast<size_t>(srcSize.height()) && CGImageGetWidth(image) == static_cast<size_t>(srcSize.width())) {
             size_t currentFrame = m_currentFrame;
             m_currentFrame = i;

trunk/Source/WebCore/platform/graphics/wince/ImageWinCE.cpp

@@ -119 +119 @@
         IntRect intSrcRect(srcRectIn);
         RefPtr<SharedBitmap> bmp = frameAtIndex(m_currentFrame);
+        if (bmp) {
+            if (bmp->width() != m_source.size().width()) {
+                double scaleFactor = static_cast<double>(bmp->width()) / m_source.size().width();
 
-        if (bmp->width() != m_source.size().width()) {
-            double scaleFactor = static_cast<double>(bmp->width()) / m_source.size().width();
-
-            intSrcRect.setX(stableRound(srcRectIn.x() * scaleFactor));
-            intSrcRect.setWidth(stableRound(srcRectIn.width() * scaleFactor));
-            intSrcRect.setY(stableRound(srcRectIn.y() * scaleFactor));
-            intSrcRect.setHeight(stableRound(srcRectIn.height() * scaleFactor));
+                intSrcRect.setX(stableRound(srcRectIn.x() * scaleFactor));
+                intSrcRect.setWidth(stableRound(srcRectIn.width() * scaleFactor));
+                intSrcRect.setY(stableRound(srcRectIn.y() * scaleFactor));
+                intSrcRect.setHeight(stableRound(srcRectIn.height() * scaleFactor));
+            }
+            bmp->draw(ctxt, enclosingIntRect(dstRect), intSrcRect, styleColorSpace, compositeOp);
         }
-        bmp->draw(ctxt, enclosingIntRect(dstRect), intSrcRect, styleColorSpace, compositeOp);
     }
 

trunk/Source/WebCore/platform/win/DragImageCGWin.cpp

@@ -149 +149 @@
     CGContextSetFillColor(drawContext, white);
     CGContextFillRect(drawContext, rect);
-    CGContextSetBlendMode(drawContext, kCGBlendModeNormal);
-    CGContextDrawImage(drawContext, rect, srcImage);
+    if (srcImage) {
+        CGContextSetBlendMode(drawContext, kCGBlendModeNormal);
+        CGContextDrawImage(drawContext, rect, srcImage);
+    }
     CGContextRelease(drawContext);
 

trunk/Source/WebCore/platform/win/DragImageCairoWin.cpp

@@ -174 +174 @@
     cairo_fill_preserve(cr);
 
-    cairo_surface_t* srcImage = img->nativeImageForCurrentFrame()->surface();
+    NativeImageCairo* srcNativeImage = img->nativeImageForCurrentFrame();
+    cairo_surface_t* srcImage = (srcNativeImage) ? srcNativeImage->surface() : 0;
 
-    // Draw the image.
-    cairo_set_source_surface(cr, srcImage, 0.0, 0.0);
-    cairo_paint(cr);
+    if (srcImage) {
+        // Draw the image.
+        cairo_set_source_surface(cr, srcImage, 0.0, 0.0);
+        cairo_paint(cr);
+    }
 
     deallocContext(drawContext);