diff -r 000000000000 -r 6474c204b198 gfx/2d/SourceSurfaceSkia.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gfx/2d/SourceSurfaceSkia.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,120 @@
+/* -*- 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/. */
+
+
+#include "Logging.h"
+#include "SourceSurfaceSkia.h"
+#include "skia/SkBitmap.h"
+#include "skia/SkDevice.h"
+#include "HelpersSkia.h"
+#include "DrawTargetSkia.h"
+#include "DataSurfaceHelpers.h"
+
+namespace mozilla {
+namespace gfx {
+
+SourceSurfaceSkia::SourceSurfaceSkia()
+  : mDrawTarget(nullptr), mLocked(false)
+{
+}
+
+SourceSurfaceSkia::~SourceSurfaceSkia()
+{
+  MaybeUnlock();
+  if (mDrawTarget) {
+    mDrawTarget->SnapshotDestroyed();
+    mDrawTarget = nullptr;
+  }
+}
+
+IntSize
+SourceSurfaceSkia::GetSize() const
+{
+  return mSize;
+}
+
+SurfaceFormat
+SourceSurfaceSkia::GetFormat() const
+{
+  return mFormat;
+}
+
+bool
+SourceSurfaceSkia::InitFromCanvas(SkCanvas* aCanvas,
+                                  SurfaceFormat aFormat,
+                                  DrawTargetSkia* aOwner)
+{
+  SkISize size = aCanvas->getDeviceSize();
+
+  mBitmap = (SkBitmap)aCanvas->getDevice()->accessBitmap(false);
+  mFormat = aFormat;
+
+  mSize = IntSize(size.fWidth, size.fHeight);
+  mStride = mBitmap.rowBytes();
+  mDrawTarget = aOwner;
+
+  return true;
+}
+
+bool 
+SourceSurfaceSkia::InitFromData(unsigned char* aData,
+                                const IntSize &aSize,
+                                int32_t aStride,
+                                SurfaceFormat aFormat)
+{
+  SkBitmap temp;
+  temp.setConfig(GfxFormatToSkiaConfig(aFormat), aSize.width, aSize.height, aStride);
+  temp.setPixels(aData);
+
+  if (!temp.copyTo(&mBitmap, GfxFormatToSkiaColorType(aFormat))) {
+    return false;
+  }
+
+  if (aFormat == SurfaceFormat::B8G8R8X8) {
+    mBitmap.setAlphaType(kIgnore_SkAlphaType);
+  }
+
+  mSize = aSize;
+  mFormat = aFormat;
+  mStride = mBitmap.rowBytes();
+  return true;
+}
+
+unsigned char*
+SourceSurfaceSkia::GetData()
+{
+  if (!mLocked) {
+    mBitmap.lockPixels();
+    mLocked = true;
+  }
+
+  unsigned char *pixels = (unsigned char *)mBitmap.getPixels();
+  return pixels;
+}
+
+void
+SourceSurfaceSkia::DrawTargetWillChange()
+{
+  if (mDrawTarget) {
+    MaybeUnlock();
+
+    mDrawTarget = nullptr;
+    SkBitmap temp = mBitmap;
+    mBitmap.reset();
+    temp.copyTo(&mBitmap, temp.colorType());
+  }
+}
+
+void
+SourceSurfaceSkia::MaybeUnlock()
+{
+  if (mLocked) {
+    mBitmap.unlockPixels();
+    mLocked = false;
+  }
+}
+
+}
+}