Merge 93441 - REGRESSION(r91628): 3 canvas tests crash on Chromium Linux and one test fail on Chr...

Source/WebCore/platform/graphics/skia/BitmapImageSingleFrameSkia.h

 /*
  * Copyright (c) 2006,2007,2008, Google Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 35 matching lines @@
 // is that NativeImagePtr = NativeImageSkia, yet callers have SkBitmap.
 class BitmapImageSingleFrameSkia : public Image {
 public:
     // Creates a new Image from the given SkBitmap.  If "copyPixels" is true, a
     // deep copy is done.  Otherwise, a shallow copy is done (pixel data is
     // ref'ed).
     static PassRefPtr<BitmapImageSingleFrameSkia> create(const SkBitmap&, bool copyPixels);
 
     virtual bool isBitmapImage() const { return true; }
 
+    virtual bool currentFrameHasAlpha() { return !m_nativeImage.isOpaque(); }
+
     virtual IntSize size() const
     {
         return IntSize(m_nativeImage.width(), m_nativeImage.height());
     }
 
     // Do nothing, as we only have the one representation of data (decoded).
     virtual void destroyDecodedData(bool destroyAll = true) { }
 
     virtual unsigned decodedSize() const
     {
         return m_nativeImage.decodedSize();
     }
 
     // We only have a single frame.
     virtual NativeImagePtr nativeImageForCurrentFrame()
     {
         return &m_nativeImage;
     }
 
+#if !ASSERT_DISABLED
+    virtual bool notSolidColor()
+    {
+        return m_nativeImage.width() != 1 || m_nativeImage.height() != 1;
+    }
+#endif
+
 protected:
     virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator);
 
 private:
     NativeImageSkia m_nativeImage;
 
     // Creates a new Image from the given SkBitmap, using a shallow copy.
     explicit BitmapImageSingleFrameSkia(const SkBitmap&);
 };
 
 FloatRect normalizeRect(const FloatRect&);
 
 } // namespace WebCore
 
 #endif  // BitmapImageSingleFrameSkia_h