Take NativeImageSkia out behind the woodshed.

Source/platform/graphics/Image.h

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2004, 2005, 2006 Apple Computer, 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 15 matching lines @@
 
 #ifndef Image_h
 #define Image_h
 
 #include "platform/PlatformExport.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/graphics/Color.h"
 #include "platform/graphics/GraphicsTypes.h"
 #include "platform/graphics/ImageAnimationPolicy.h"
 #include "platform/graphics/ImageOrientation.h"
-#include "platform/graphics/skia/NativeImageSkia.h"
+#include "third_party/skia/include/core/SkBitmap.h"

[f(malita), 2015/03/15 00:32:45]

Could this be a fwdecl if we move bitmapForCurrentFrame's impl to the cpp file?

[Stephen White, 2015/03/15 16:49:31]

Sadly no, since SkBitmap is returned by value. Out-of-lined it anyway, since
inline
virtuals are usually silly.

[f(malita), 2015/03/16 03:05:06]

I think incomplete return types are allowed in declarations (ran into it just
the other day and thought it was surprising).

 #include "third_party/skia/include/core/SkXfermode.h"
 #include "wtf/Assertions.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
 #include "wtf/RetainPtr.h"
 #include "wtf/text/WTFString.h"
 
 class SkImage;
 
@@ skipping 72 matching lines @@
     // Set animationPolicy
     virtual void setAnimationPolicy(ImageAnimationPolicy) { }
     virtual ImageAnimationPolicy animationPolicy() { return ImageAnimationPolicyAllowed; }
 
     // Typically the ImageResource that owns us.
     ImageObserver* imageObserver() const { return m_imageObserver; }
     void setImageObserver(ImageObserver* observer) { m_imageObserver = observer; }
 
     enum TileRule { StretchTile, RoundTile, SpaceTile, RepeatTile };
 
-    virtual PassRefPtr<NativeImageSkia> nativeImageForCurrentFrame() { return nullptr; }
+    virtual SkBitmap bitmapForCurrentFrame() { return SkBitmap(); }
 
     virtual PassRefPtr<Image> imageForDefaultFrame();
 
     virtual void drawPattern(GraphicsContext*, const FloatRect&,
         const FloatSize&, const FloatPoint& phase, SkXfermode::Mode,
         const FloatRect&, const IntSize& repeatSpacing = IntSize());
 
 #if ENABLE(ASSERT)
     virtual bool notSolidColor() { return true; }
 #endif
 
 protected:
     Image(ImageObserver* = 0);
 
     static void fillWithSolidColor(GraphicsContext*, const FloatRect& dstRect, const Color&, SkXfermode::Mode);
     static FloatRect adjustForNegativeSize(const FloatRect&); // A helper method for translating negative width and height values.
 
     virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, SkXfermode::Mode, RespectImageOrientationEnum) = 0;
     void drawTiled(GraphicsContext*, const FloatRect& dstRect, const FloatPoint& srcPoint, const FloatSize& tileSize,
         SkXfermode::Mode, const IntSize& repeatSpacing);
     void drawTiled(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, const FloatSize& tileScaleFactor, TileRule hRule, TileRule vRule, SkXfermode::Mode);
+    static void drawBitmap(GraphicsContext*, const SkBitmap&, const SkRect& srcRect, const SkRect& destRect, SkXfermode::Mode);
+    static void drawBitmapPattern(GraphicsContext*, const SkBitmap&, const FloatRect& srcRect, const FloatSize& scale, const FloatPoint& phase, SkXfermode::Mode, const FloatRect& destRect, const IntSize& repeatSpacing);
 
     // Supporting tiled drawing
     virtual bool mayFillWithSolidColor() { return false; }
     virtual Color solidColor() const { return Color(); }
 
 private:
     RefPtr<SharedBuffer> m_encodedImageData;
     ImageObserver* m_imageObserver;
 };
 
 #define DEFINE_IMAGE_TYPE_CASTS(typeName) \
     DEFINE_TYPE_CASTS(typeName, Image, image, image->is##typeName(), image.is##typeName())
 
 } // namespace blink
 
 #endif