diff -r 000000000000 -r 6474c204b198 gfx/2d/SourceSurfaceSkia.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gfx/2d/SourceSurfaceSkia.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,62 @@
+/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef MOZILLA_GFX_SOURCESURFACESKIA_H_
+#define MOZILLA_GFX_SOURCESURFACESKIA_H_
+
+#include "2D.h"
+#include <vector>
+#include "skia/SkCanvas.h"
+#include "skia/SkBitmap.h"
+
+namespace mozilla {
+namespace gfx {
+
+class DrawTargetSkia;
+
+class SourceSurfaceSkia : public DataSourceSurface
+{
+public:
+  MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(DataSourceSurfaceSkia)
+  SourceSurfaceSkia();
+  ~SourceSurfaceSkia();
+
+  virtual SurfaceType GetType() const { return SurfaceType::SKIA; }
+  virtual IntSize GetSize() const;
+  virtual SurfaceFormat GetFormat() const;
+
+  SkBitmap& GetBitmap() { return mBitmap; }
+
+  bool InitFromData(unsigned char* aData,
+                    const IntSize &aSize,
+                    int32_t aStride,
+                    SurfaceFormat aFormat);
+
+  bool InitFromCanvas(SkCanvas* aCanvas,
+                      SurfaceFormat aFormat,
+                      DrawTargetSkia* aOwner);
+
+  virtual unsigned char *GetData();
+
+  virtual int32_t Stride() { return mStride; }
+
+private:
+  friend class DrawTargetSkia;
+
+  void DrawTargetWillChange();
+  void MaybeUnlock();
+
+  SkBitmap mBitmap;
+  SurfaceFormat mFormat;
+  IntSize mSize;
+  int32_t mStride;
+  RefPtr<DrawTargetSkia> mDrawTarget;
+  bool mLocked;
+};
+
+}
+}
+
+#endif /* MOZILLA_GFX_SOURCESURFACESKIA_H_ */