diff -r 000000000000 -r 6474c204b198 gfx/skia/trunk/src/utils/SkPDFRasterizer.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gfx/skia/trunk/src/utils/SkPDFRasterizer.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,86 @@
+
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifdef SK_BUILD_FOR_WIN32
+#pragma warning(push)
+#pragma warning(disable : 4530)
+#endif
+
+#include "SkPDFRasterizer.h"
+#include "SkColorPriv.h"
+
+#ifdef SK_BUILD_NATIVE_PDF_RENDERER
+#include "SkPdfRenderer.h"
+#endif  // SK_BUILD_NATIVE_PDF_RENDERER
+
+#ifdef SK_BUILD_POPPLER
+#include <poppler-document.h>
+#include <poppler-image.h>
+#include <poppler-page.h>
+#include <poppler-page-renderer.h>
+#endif  // SK_BUILD_POPPLER
+
+#ifdef SK_BUILD_POPPLER
+bool SkPopplerRasterizePDF(SkStream* pdf, SkBitmap* output) {
+  size_t size = pdf->getLength();
+  SkAutoFree buffer(sk_malloc_throw(size));
+  pdf->read(buffer.get(), size);
+
+  SkAutoTDelete<poppler::document> doc(
+      poppler::document::load_from_raw_data((const char*)buffer.get(), size));
+  if (!doc.get() || doc->is_locked()) {
+    return false;
+  }
+
+  SkAutoTDelete<poppler::page> page(doc->create_page(0));
+  poppler::page_renderer renderer;
+  poppler::image image = renderer.render_page(page.get());
+
+  if (!image.is_valid() || image.format() != poppler::image::format_argb32) {
+    return false;
+  }
+
+  int width = image.width(), height = image.height();
+  size_t rowSize = image.bytes_per_row();
+  char *imgData = image.data();
+
+  SkBitmap bitmap;
+  if (!bitmap.allocPixels(SkImageInfo::MakeN32Premul(width, height))) {
+    return false;
+  }
+  bitmap.eraseColor(SK_ColorWHITE);
+  SkPMColor* bitmapPixels = (SkPMColor*)bitmap.getPixels();
+
+  // do pixel-by-pixel copy to deal with RGBA ordering conversions
+  for (int y = 0; y < height; y++) {
+    char *rowData = imgData;
+    for (int x = 0; x < width; x++) {
+      uint8_t a = rowData[3];
+      uint8_t r = rowData[2];
+      uint8_t g = rowData[1];
+      uint8_t b = rowData[0];
+
+      *bitmapPixels = SkPreMultiplyARGB(a, r, g, b);
+
+      bitmapPixels++;
+      rowData += 4;
+    }
+    imgData += rowSize;
+  }
+
+  output->swap(bitmap);
+
+  return true;
+}
+#endif  // SK_BUILD_POPPLER
+
+#ifdef SK_BUILD_NATIVE_PDF_RENDERER
+bool SkNativeRasterizePDF(SkStream* pdf, SkBitmap* output) {
+    return SkPDFNativeRenderToBitmap(pdf, output);
+}
+#endif  // SK_BUILD_NATIVE_PDF_RENDERER