Bug 1141979 - part6 - implement ImageBitmapFormatUtils; r=jrmuizel

MozReview-Commit-ID: 1RyJBjP9W9Q

--HG--
extra : transplant_source : %09S%C1%15%5D%0F%8D%AD%D5h%912y%CB%D2%A1%DF%00%7B%AE

dom/canvas/ImageBitmapColorUtils.h

@@ -0,0 +1,501 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* 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_dom_ImageBitmapColorUtils_h
+#define mozilla_dom_ImageBitmapColorUtils_h
+
+#include "mozilla/UniquePtr.h"
+#include "nsTArrayForwardDeclare.h"
+
+namespace mozilla {
+namespace dom {
+
+/*
+ * RGB family -> RGBA family.
+ */
+int
+RGB24ToRGBA32(const uint8_t* aSrcBuffer, int aSrcStride,
+              uint8_t* aDstBuffer, int aDstStride,
+              int aWidth, int aHeight);
+
+int
+BGR24ToRGBA32(const uint8_t* aSrcBuffer, int aSrcStride,
+              uint8_t* aDstBuffer, int aDstStride,
+              int aWidth, int aHeight);
+int
+RGB24ToBGRA32(const uint8_t* aSrcBuffer, int aSrcStride,
+              uint8_t* aDstBuffer, int aDstStride,
+              int aWidth, int aHeight);
+
+int
+BGR24ToBGRA32(const uint8_t* aSrcBuffer, int aSrcStride,
+              uint8_t* aDstBuffer, int aDstStride,
+              int aWidth, int aHeight);
+
+/*
+ * RGBA family -> RGB family.
+ */
+int
+RGBA32ToRGB24(const uint8_t* aSrcBuffer, int aSrcStride,
+              uint8_t* aDstBuffer, int aDstStride,
+              int aWidth, int aHeight);
+
+int
+BGRA32ToRGB24(const uint8_t* aSrcBuffer, int aSrcStride,
+              uint8_t* aDstBuffer, int aDstStride,
+              int aWidth, int aHeight);
+int
+RGBA32ToBGR24(const uint8_t* aSrcBuffer, int aSrcStride,
+              uint8_t* aDstBuffer, int aDstStride,
+              int aWidth, int aHeight);
+
+int
+BGRA32ToBGR24(const uint8_t* aSrcBuffer, int aSrcStride,
+              uint8_t* aDstBuffer, int aDstStride,
+              int aWidth, int aHeight);
+
+/*
+ * Among RGB family.
+ */
+int
+RGB24Copy(const uint8_t* aSrcBuffer, int aSrcStride,
+          uint8_t* aDstBuffer, int aDstStride,
+          int aWidth, int aHeight);
+
+#define BGR24Copy RGB24Copy
+#define RGB24ToRGB24 RGB24Copy
+#define BGR24ToBGR24 BGR24Copy
+
+int
+RGB24ToBGR24(const uint8_t* aSrcBuffer, int aSrcStride,
+             uint8_t* aDstBuffer, int aDstStride,
+             int aWidth, int aHeight);
+
+#define BGR24ToRGB24 RGB24ToBGR24
+
+/*
+ * YUV family -> RGB family.
+ */
+int
+YUV444PToRGB24(const uint8_t* aYBuffer, int aYStride,
+               const uint8_t* aUBuffer, int aUStride,
+               const uint8_t* aVBuffer, int aVStride,
+               uint8_t* aDstBuffer, int aDstStride,
+               int aWidth, int aHeight);
+
+int
+YUV422PToRGB24(const uint8_t* aYBuffer, int aYStride,
+               const uint8_t* aUBuffer, int aUStride,
+               const uint8_t* aVBuffer, int aVStride,
+               uint8_t* aDstBuffer, int aDstStride,
+               int aWidth, int aHeight);
+
+int
+YUV420PToRGB24(const uint8_t* aYBuffer, int aYStride,
+               const uint8_t* aUBuffer, int aUStride,
+               const uint8_t* aVBuffer, int aVStride,
+               uint8_t* aDstBuffer, int aDstStride,
+               int aWidth, int aHeight);
+
+int
+NV12ToRGB24(const uint8_t* aYBuffer, int aYStride,
+            const uint8_t* aUVBuffer, int aUVStride,
+            uint8_t* aDstBuffer, int aDstStride,
+            int aWidth, int aHeight);
+
+int
+NV21ToRGB24(const uint8_t* aYBuffer, int aYStride,
+            const uint8_t* aVUBuffer, int aVUStride,
+            uint8_t* aDstBuffer, int aDstStride,
+            int aWidth, int aHeight);
+
+int
+YUV444PToBGR24(const uint8_t* aYBuffer, int aYStride,
+               const uint8_t* aUBuffer, int aUStride,
+               const uint8_t* aVBuffer, int aVStride,
+               uint8_t* aDstBuffer, int aDstStride,
+               int aWidth, int aHeight);
+
+int
+YUV422PToBGR24(const uint8_t* aYBuffer, int aYStride,
+               const uint8_t* aUBuffer, int aUStride,
+               const uint8_t* aVBuffer, int aVStride,
+               uint8_t* aDstBuffer, int aDstStride,
+               int aWidth, int aHeight);
+
+int
+YUV420PToBGR24(const uint8_t* aYBuffer, int aYStride,
+               const uint8_t* aUBuffer, int aUStride,
+               const uint8_t* aVBuffer, int aVStride,
+               uint8_t* aDstBuffer, int aDstStride,
+               int aWidth, int aHeight);
+
+int
+NV12ToBGR24(const uint8_t* aYBuffer, int aYStride,
+            const uint8_t* aUVBuffer, int aUVStride,
+            uint8_t* aDstBuffer, int aDstStride,
+            int aWidth, int aHeight);
+
+int
+NV21ToBGR24(const uint8_t* aYBuffer, int aYStride,
+            const uint8_t* aVUBuffer, int aVUStride,
+            uint8_t* aDstBuffer, int aDstStride,
+            int aWidth, int aHeight);
+
+/*
+ * YUV family -> RGBA family.
+ */
+int
+YUV444PToRGBA32(const uint8_t* aYBuffer, int aYStride,
+                const uint8_t* aUBuffer, int aUStride,
+                const uint8_t* aVBuffer, int aVStride,
+                uint8_t* aDstBuffer, int aDstStride,
+                int aWidth, int aHeight);
+
+int
+YUV422PToRGBA32(const uint8_t* aYBuffer, int aYStride,
+                const uint8_t* aUBuffer, int aUStride,
+                const uint8_t* aVBuffer, int aVStride,
+                uint8_t* aDstBuffer, int aDstStride,
+                int aWidth, int aHeight);
+
+int
+YUV420PToRGBA32(const uint8_t* aYBuffer, int aYStride,
+                const uint8_t* aUBuffer, int aUStride,
+                const uint8_t* aVBuffer, int aVStride,
+                uint8_t* aDstBuffer, int aDstStride,
+                int aWidth, int aHeight);
+
+int
+NV12ToRGBA32(const uint8_t* aYBuffer, int aYStride,
+             const uint8_t* aUVBuffer, int aUVStride,
+             uint8_t* aDstBuffer, int aDstStride,
+             int aWidth, int aHeight);
+
+int
+NV21ToRGBA32(const uint8_t* aYBuffer, int aYStride,
+             const uint8_t* aVUBuffer, int aVUStride,
+             uint8_t* aDstBuffer, int aDstStride,
+             int aWidth, int aHeight);
+
+int
+YUV444PToBGRA32(const uint8_t* aYBuffer, int aYStride,
+                const uint8_t* aUBuffer, int aUStride,
+                const uint8_t* aVBuffer, int aVStride,
+                uint8_t* aDstBuffer, int aDstStride,
+                int aWidth, int aHeight);
+
+int
+YUV422PToBGRA32(const uint8_t* aYBuffer, int aYStride,
+                const uint8_t* aUBuffer, int aUStride,
+                const uint8_t* aVBuffer, int aVStride,
+                uint8_t* aDstBuffer, int aDstStride,
+                int aWidth, int aHeight);
+
+int
+YUV420PToBGRA32(const uint8_t* aYBuffer, int aYStride,
+                const uint8_t* aUBuffer, int aUStride,
+                const uint8_t* aVBuffer, int aVStride,
+                uint8_t* aDstBuffer, int aDstStride,
+                int aWidth, int aHeight);
+
+int
+NV12ToBGRA32(const uint8_t* aYBuffer, int aYStride,
+             const uint8_t* aUVBuffer, int aUVStride,
+             uint8_t* aDstBuffer, int aDstStride,
+             int aWidth, int aHeight);
+
+int
+NV21ToBGRA32(const uint8_t* aYBuffer, int aYStride,
+             const uint8_t* aVUBuffer, int aVUStride,
+             uint8_t* aDstBuffer, int aDstStride,
+             int aWidth, int aHeight);
+
+/*
+ * RGB family -> YUV family.
+ */
+int
+RGB24ToYUV444P(const uint8_t* aSrcBuffer, int aSrcStride,
+               uint8_t* aYBuffer, int aYStride,
+               uint8_t* aUBuffer, int aUStride,
+               uint8_t* aVBuffer, int aVStride,
+               int aWidth, int aHeight);
+
+int
+RGB24ToYUV422P(const uint8_t* aSrcBuffer, int aSrcStride,
+               uint8_t* aYBuffer, int aYStride,
+               uint8_t* aUBuffer, int aUStride,
+               uint8_t* aVBuffer, int aVStride,
+               int aWidth, int aHeight);
+
+int
+RGB24ToYUV420P(const uint8_t* aSrcBuffer, int aSrcStride,
+               uint8_t* aYBuffer, int aYStride,
+               uint8_t* aUBuffer, int aUStride,
+               uint8_t* aVBuffer, int aVStride,
+               int aWidth, int aHeight);
+int
+RGB24ToNV12(const uint8_t* aSrcBuffer, int aSrcStride,
+            uint8_t* aYBuffer, int aYStride,
+            uint8_t* aUVBuffer, int aUVStride,
+            int aWidth, int aHeight);
+
+int
+RGB24ToNV21(const uint8_t* aSrcBuffer, int aSrcStride,
+            uint8_t* aYBuffer, int aYStride,
+            uint8_t* aVUBuffer, int aVUStride,
+            int aWidth, int aHeight);
+
+int
+BGR24ToYUV444P(const uint8_t* aSrcBuffer, int aSrcStride,
+               uint8_t* aYBuffer, int aYStride,
+               uint8_t* aUBuffer, int aUStride,
+               uint8_t* aVBuffer, int aVStride,
+               int aWidth, int aHeight);
+
+int
+BGR24ToYUV422P(const uint8_t* aSrcBuffer, int aSrcStride,
+               uint8_t* aYBuffer, int aYStride,
+               uint8_t* aUBuffer, int aUStride,
+               uint8_t* aVBuffer, int aVStride,
+               int aWidth, int aHeight);
+
+int
+BGR24ToYUV420P(const uint8_t* aSrcBuffer, int aSrcStride,
+               uint8_t* aYBuffer, int aYStride,
+               uint8_t* aUBuffer, int aUStride,
+               uint8_t* aVBuffer, int aVStride,
+               int aWidth, int aHeight);
+
+int
+BGR24ToNV12(const uint8_t* aSrcBuffer, int aSrcStride,
+            uint8_t* aYBuffer, int aYStride,
+            uint8_t* aUVBuffer, int aUVStride,
+            int aWidth, int aHeight);
+
+int
+BGR24ToNV21(const uint8_t* aSrcBuffer, int aSrcStride,
+            uint8_t* aYBuffer, int aYStride,
+            uint8_t* aUVBuffer, int aUVStride,
+            int aWidth, int aHeight);
+
+/*
+ * RGBA family -> YUV family.
+ */
+int
+RGBA32ToYUV444P(const uint8_t* aSrcBuffer, int aSrcStride,
+                uint8_t* aYBuffer, int aYStride,
+                uint8_t* aUBuffer, int aUStride,
+                uint8_t* aVBuffer, int aVStride,
+                int aWidth, int aHeight);
+
+int
+RGBA32ToYUV422P(const uint8_t* aSrcBuffer, int aSrcStride,
+                uint8_t* aYBuffer, int aYStride,
+                uint8_t* aUBuffer, int aUStride,
+                uint8_t* aVBuffer, int aVStride,
+                int aWidth, int aHeight);
+
+int
+RGBA32ToYUV420P(const uint8_t* aSrcBuffer, int aSrcStride,
+                uint8_t* aYBuffer, int aYStride,
+                uint8_t* aUBuffer, int aUStride,
+                uint8_t* aVBuffer, int aVStride,
+                int aWidth, int aHeight);
+int
+RGBA32ToNV12(const uint8_t* aSrcBuffer, int aSrcStride,
+             uint8_t* aYBuffer, int aYStride,
+             uint8_t* aUVBuffer, int aUVStride,
+             int aWidth, int aHeight);
+
+int
+RGBA32ToNV21(const uint8_t* aSrcBuffer, int aSrcStride,
+             uint8_t* aYBuffer, int aYStride,
+             uint8_t* aVUBuffer, int aVUStride,
+             int aWidth, int aHeight);
+
+int
+BGRA32ToYUV444P(const uint8_t* aSrcBuffer, int aSrcStride,
+                uint8_t* aYBuffer, int aYStride,
+                uint8_t* aUBuffer, int aUStride,
+                uint8_t* aVBuffer, int aVStride,
+                int aWidth, int aHeight);
+
+int
+BGRA32ToYUV422P(const uint8_t* aSrcBuffer, int aSrcStride,
+                uint8_t* aYBuffer, int aYStride,
+                uint8_t* aUBuffer, int aUStride,
+                uint8_t* aVBuffer, int aVStride,
+                int aWidth, int aHeight);
+
+int
+BGRA32ToYUV420P(const uint8_t* aSrcBuffer, int aSrcStride,
+                uint8_t* aYBuffer, int aYStride,
+                uint8_t* aUBuffer, int aUStride,
+                uint8_t* aVBuffer, int aVStride,
+                int aWidth, int aHeight);
+
+
+int
+BGRA32ToNV12(const uint8_t* aSrcBuffer, int aSrcStride,
+             uint8_t* aYBuffer, int aYStride,
+             uint8_t* aUVBuffer, int aUVStride,
+             int aWidth, int aHeight);
+
+int
+BGRA32ToNV21(const uint8_t* aSrcBuffer, int aSrcStride,
+             uint8_t* aYBuffer, int aYStride,
+             uint8_t* aUVBuffer, int aUVStride,
+             int aWidth, int aHeight);
+
+/*
+ * RGBA/RGB family <-> HSV family.
+ */
+int
+RGBA32ToHSV(const uint8_t* aSrcBuffer, int aSrcStride,
+            float* aDstBuffer, int aDstStride,
+            int aWidth, int aHeight);
+
+int
+BGRA32ToHSV(const uint8_t* aSrcBuffer, int aSrcStride,
+            float* aDstBuffer, int aDstStride,
+            int aWidth, int aHeight);
+
+int
+RGB24ToHSV(const uint8_t* aSrcBuffer, int aSrcStride,
+           float* aDstBuffer, int aDstStride,
+           int aWidth, int aHeight);
+
+int
+BGR24ToHSV(const uint8_t* aSrcBuffer, int aSrcStride,
+           float* aDstBuffer, int aDstStride,
+           int aWidth, int aHeight);
+
+int
+HSVToRGBA32(const float* aSrcBuffer, int aSrcStride,
+            uint8_t* aDstBuffer, int aDstStride,
+            int aWidth, int aHeight);
+
+int
+HSVToBGRA32(const float* aSrcBuffer, int aSrcStride,
+            uint8_t* aDstBuffer, int aDstStride,
+            int aWidth, int aHeight);
+
+int
+HSVToRGB24(const float* aSrcBuffer, int aSrcStride,
+           uint8_t* aDstBuffer, int aDstStride,
+           int aWidth, int aHeight);
+
+int
+HSVToBGR24(const float* aSrcBuffer, int aSrcStride,
+           uint8_t* aDstBuffer, int aDstStride,
+           int aWidth, int aHeight);
+
+/*
+ * RGBA/RGB family <-> Lab family.
+ */
+int
+RGBA32ToLab(const uint8_t* aSrcBuffer, int aSrcStride,
+            float* aDstBuffer, int aDstStride,
+            int aWidth, int aHeight);
+
+int
+BGRA32ToLab(const uint8_t* aSrcBuffer, int aSrcStride,
+            float* aDstBuffer, int aDstStride,
+            int aWidth, int aHeight);
+
+int
+RGB24ToLab(const uint8_t* aSrcBuffer, int aSrcStride,
+           float* aDstBuffer, int aDstStride,
+           int aWidth, int aHeight);
+
+int
+BGR24ToLab(const uint8_t* aSrcBuffer, int aSrcStride,
+           float* aDstBuffer, int aDstStride,
+           int aWidth, int aHeight);
+
+int
+LabToRGBA32(const float* aSrcBuffer, int aSrcStride,
+            uint8_t* aDstBuffer, int aDstStride,
+            int aWidth, int aHeight);
+
+int
+LabToBGRA32(const float* aSrcBuffer, int aSrcStride,
+            uint8_t* aDstBuffer, int aDstStride,
+            int aWidth, int aHeight);
+
+int
+LabToRGB24(const float* aSrcBuffer, int aSrcStride,
+           uint8_t* aDstBuffer, int aDstStride,
+           int aWidth, int aHeight);
+
+int
+LabToBGR24(const float* aSrcBuffer, int aSrcStride,
+           uint8_t* aDstBuffer, int aDstStride,
+           int aWidth, int aHeight);
+
+/*
+ * RGBA/RGB family -> Gray8.
+ */
+int
+RGB24ToGray8(const uint8_t* aSrcBuffer, int aSrcStride,
+             uint8_t* aDstBuffer, int aDstStride,
+             int aWidth, int aHeight);
+
+int
+BGR24ToGray8(const uint8_t* aSrcBuffer, int aSrcStride,
+             uint8_t* aDstBuffer, int aDstStride,
+             int aWidth, int aHeight);
+
+int
+RGBA32ToGray8(const uint8_t* aSrcBuffer, int aSrcStride,
+              uint8_t* aDstBuffer, int aDstStride,
+              int aWidth, int aHeight);
+
+int
+BGRA32ToGray8(const uint8_t* aSrcBuffer, int aSrcStride,
+              uint8_t* aDstBuffer, int aDstStride,
+              int aWidth, int aHeight);
+
+/*
+ * YUV family -> Gray8.
+ */
+int
+YUV444PToGray8(const uint8_t* aYBuffer, int aYStride,
+               const uint8_t* aUBuffer, int aUStride,
+               const uint8_t* aVBuffer, int aVStride,
+               uint8_t* aDstBuffer, int aDstStride,
+               int aWidth, int aHeight);
+
+int
+YUV422PToGray8(const uint8_t* aYBuffer, int aYStride,
+               const uint8_t* aUBuffer, int aUStride,
+               const uint8_t* aVBuffer, int aVStride,
+               uint8_t* aDstBuffer, int aDstStride,
+               int aWidth, int aHeight);
+
+int
+YUV420PToGray8(const uint8_t* aYBuffer, int aYStride,
+               const uint8_t* aUBuffer, int aUStride,
+               const uint8_t* aVBuffer, int aVStride,
+               uint8_t* aDstBuffer, int aDstStride,
+               int aWidth, int aHeight);
+
+int
+NV12ToGray8(const uint8_t* aYBuffer, int aYStride,
+            const uint8_t* aUBuffer, int aUStride,
+            uint8_t* aDstBuffer, int aDstStride,
+            int aWidth, int aHeight);
+
+int
+NV21ToGray8(const uint8_t* aYBuffer, int aYStride,
+            const uint8_t* aUBuffer, int aUStride,
+            uint8_t* aDstBuffer, int aDstStride,
+            int aWidth, int aHeight);
+
+} // namespace dom
+} // namespace mozilla
+#endif // mozilla_dom_ImageBitmapColorUtils_h

dom/canvas/ImageBitmapUtils.h

@@ -0,0 +1,99 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* 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_dom_ImageBitmapUtils_h
+#define mozilla_dom_ImageBitmapUtils_h
+
+#include "mozilla/UniquePtr.h"
+#include "nsTArrayForwardDeclare.h"
+
+namespace mozilla {
+
+namespace layers {
+class Image;
+struct PlanarYCbCrData;
+}
+
+namespace dom {
+
+struct ChannelPixelLayout;
+template<typename> class Sequence;
+
+typedef nsTArray<ChannelPixelLayout> ImagePixelLayout;
+
+/*
+ * This function creates an ImagePixelLayout object which describes the
+ * default layout of the given ImageBitmapFormat with the given width, height
+ * and stride.
+ */
+UniquePtr<ImagePixelLayout>
+CreateDefaultPixelLayout(ImageBitmapFormat aFormat,
+                         uint32_t aWidth, uint32_t aHeight, uint32_t aStride);
+
+/*
+ * This function extracts information from the aImage parameter to customize
+ * the ImagePixelLayout object, that is, this function creates a customized
+ * ImagePixelLayout object which exactly describes the pixel layout of the
+ * given aImage.
+ */
+UniquePtr<ImagePixelLayout>
+CreatePixelLayoutFromPlanarYCbCrData(const layers::PlanarYCbCrData* aData);
+
+/*
+ * Get the number of channels of the given ImageBitmapFormat.
+ */
+uint8_t
+GetChannelCountOfImageFormat(ImageBitmapFormat aFormat);
+
+/*
+ * Get the needed buffer size to store the image data in the given
+ * ImageBitmapFormat with the given width and height.
+ */
+uint32_t
+CalculateImageBufferSize(ImageBitmapFormat aFormat,
+                         uint32_t aWidth, uint32_t aHeight);
+
+/*
+ * This function always copies the image data in _aSrcBuffer_ into _aDstBuffer_
+ * and it also performs color conversion if the _aSrcFormat_ and the
+ * _aDstFormat_ are different.
+ *
+ * The source image is stored in the _aSrcBuffer_ and the corresponding pixel
+ * layout is described by the _aSrcLayout_.
+ *
+ * The copied and converted image will be stored in the _aDstBuffer_, which
+ * should be allocated with enough size before invoking this function and the
+ * needed size could be found by the CalculateImageBufferSize() method.
+ *
+ * The returned ImagePixelLayout object describes the pixel layout of the result
+ * image and will be null if on failure.
+ */
+UniquePtr<ImagePixelLayout>
+CopyAndConvertImageData(ImageBitmapFormat aSrcFormat,
+                        const uint8_t* aSrcBuffer,
+                        const ImagePixelLayout* aSrcLayout,
+                        ImageBitmapFormat aDstFormat,
+                        uint8_t* aDstBuffer);
+
+/*
+ * This function tries to find the best ImageBitmapFormat, from the aCandiates,
+ * which can be converted from the aSrcFormat. The algorithm now merely returns
+ * the FIRST one, from the aCandidates, which can be converted from the
+ * aSrcFormat.
+ *
+ * TODO: The algorithm should be updated after we implement optimizations for
+ *       different platforms (different kinds of layers::Image), considering
+ *       that some conversion might be cheaper through hardware.
+ */
+ImageBitmapFormat
+FindBestMatchingFromat(ImageBitmapFormat aSrcFormat,
+                       const Sequence<ImageBitmapFormat>& aCandidates);
+
+} // namespace dom
+} // namespace mozilla
+
+
+#endif // mozilla_dom_ImageBitmapUtils_h

dom/canvas/gtest/moz.build

@@ -0,0 +1,16 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+UNIFIED_SOURCES += [
+    'TestImageBitmapColorUtils.cpp',
+]
+
+LOCAL_INCLUDES += [
+    '/dom/canvas',
+    '/media/libyuv/include'
+]
+
+FINAL_LIBRARY = 'xul-gtest'

dom/canvas/moz.build

@@ -4,7 +4,10 @@
 # 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/.
 
-TEST_DIRS += ['compiledtest']
+TEST_DIRS += [
+    'compiledtest', 
+    'gtest'
+]
 
 # Change the following line to avoid bug 1081323 (clobber after changing a manifest):
 # Add test for webglcontextcreationerror.
@@ -53,7 +56,9 @@ UNIFIED_SOURCES += [
     'DocumentRendererChild.cpp',
     'DocumentRendererParent.cpp',
     'ImageBitmap.cpp',
+    'ImageBitmapColorUtils.cpp',
     'ImageBitmapRenderingContext.cpp',
+    'ImageBitmapUtils.cpp',
     'ImageData.cpp',
     'OffscreenCanvas.cpp',
 ]