diff -r 000000000000 -r 6474c204b198 gfx/thebes/gfx2DGlue.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gfx/thebes/gfx2DGlue.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,419 @@
+/* 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 GFX_2D_GLUE_H
+#define GFX_2D_GLUE_H
+
+
+#include "gfxPlatform.h"
+#include "gfxRect.h"
+#include "gfxMatrix.h"
+#include "gfx3DMatrix.h"
+#include "gfxContext.h"
+#include "mozilla/gfx/Matrix.h"
+#include "mozilla/gfx/Rect.h"
+#include "mozilla/gfx/2D.h"
+#include "gfxColor.h"
+
+namespace mozilla {
+namespace gfx {
+class DrawTarget;
+class SourceSurface;
+class ScaledFont;
+}
+}
+
+namespace mozilla {
+namespace gfx {
+
+inline Rect ToRect(const gfxRect &aRect)
+{
+  return Rect(Float(aRect.x), Float(aRect.y),
+              Float(aRect.width), Float(aRect.height));
+}
+
+inline Rect ToRect(const nsIntRect &aRect)
+{
+  return Rect(aRect.x, aRect.y, aRect.width, aRect.height);
+}
+
+inline IntRect ToIntRect(const nsIntRect &aRect)
+{
+  return IntRect(aRect.x, aRect.y, aRect.width, aRect.height);
+}
+
+inline Color ToColor(const gfxRGBA &aRGBA)
+{
+  return Color(Float(aRGBA.r), Float(aRGBA.g),
+               Float(aRGBA.b), Float(aRGBA.a));
+}
+
+inline Matrix ToMatrix(const gfxMatrix &aMatrix)
+{
+  return Matrix(Float(aMatrix.xx), Float(aMatrix.yx), Float(aMatrix.xy),
+                Float(aMatrix.yy), Float(aMatrix.x0), Float(aMatrix.y0));
+}
+
+inline gfxMatrix ThebesMatrix(const Matrix &aMatrix)
+{
+  return gfxMatrix(aMatrix._11, aMatrix._12, aMatrix._21,
+                   aMatrix._22, aMatrix._31, aMatrix._32);
+}
+
+inline Point ToPoint(const gfxPoint &aPoint)
+{
+  return Point(Float(aPoint.x), Float(aPoint.y));
+}
+
+inline IntPoint ToIntPoint(const nsIntPoint &aPoint)
+{
+  return IntPoint(aPoint.x, aPoint.y);
+}
+
+inline Size ToSize(const gfxSize &aSize)
+{
+  return Size(Float(aSize.width), Float(aSize.height));
+}
+
+inline IntSize ToIntSize(const gfxIntSize &aSize)
+{
+  return IntSize(aSize.width, aSize.height);
+}
+
+inline Filter ToFilter(GraphicsFilter aFilter)
+{
+  switch (aFilter) {
+  case GraphicsFilter::FILTER_NEAREST:
+    return Filter::POINT;
+  case GraphicsFilter::FILTER_GOOD:
+    return Filter::GOOD;
+  default:
+    return Filter::LINEAR;
+  }
+}
+
+inline GraphicsFilter ThebesFilter(Filter aFilter)
+{
+  switch (aFilter) {
+  case Filter::POINT:
+    return GraphicsFilter::FILTER_NEAREST;
+  default:
+    return GraphicsFilter::FILTER_BEST;
+  }
+}
+
+inline ExtendMode ToExtendMode(gfxPattern::GraphicsExtend aExtend)
+{
+  switch (aExtend) {
+  case gfxPattern::EXTEND_REPEAT:
+    return ExtendMode::REPEAT;
+  case gfxPattern::EXTEND_REFLECT:
+    return ExtendMode::REFLECT;
+  default:
+    return ExtendMode::CLAMP;
+  }
+}
+
+inline gfxPattern::GraphicsExtend ThebesExtend(ExtendMode aExtend)
+{
+  switch (aExtend) {
+  case ExtendMode::REPEAT:
+    return gfxPattern::EXTEND_REPEAT;
+  case ExtendMode::REFLECT:
+    return gfxPattern::EXTEND_REFLECT;
+  default:
+    return gfxPattern::EXTEND_PAD;
+  }
+}
+
+inline gfxPoint ThebesPoint(const Point &aPoint)
+{
+  return gfxPoint(aPoint.x, aPoint.y);
+}
+
+inline gfxSize ThebesSize(const Size &aSize)
+{
+  return gfxSize(aSize.width, aSize.height);
+}
+
+inline gfxIntSize ThebesIntSize(const IntSize &aSize)
+{
+  return gfxIntSize(aSize.width, aSize.height);
+}
+
+inline gfxRect ThebesRect(const Rect &aRect)
+{
+  return gfxRect(aRect.x, aRect.y, aRect.width, aRect.height);
+}
+
+inline nsIntRect ThebesIntRect(const IntRect &aRect)
+{
+  return nsIntRect(aRect.x, aRect.y, aRect.width, aRect.height);
+}
+
+inline gfxRGBA ThebesRGBA(const Color &aColor)
+{
+  return gfxRGBA(aColor.r, aColor.g, aColor.b, aColor.a);
+}
+
+inline gfxContext::GraphicsLineCap ThebesLineCap(CapStyle aStyle)
+{
+  switch (aStyle) {
+  case CapStyle::BUTT:
+    return gfxContext::LINE_CAP_BUTT;
+  case CapStyle::ROUND:
+    return gfxContext::LINE_CAP_ROUND;
+  case CapStyle::SQUARE:
+    return gfxContext::LINE_CAP_SQUARE;
+  }
+  MOZ_CRASH("Incomplete switch");
+}
+
+inline CapStyle ToCapStyle(gfxContext::GraphicsLineCap aStyle)
+{
+  switch (aStyle) {
+  case gfxContext::LINE_CAP_BUTT:
+    return CapStyle::BUTT;
+  case gfxContext::LINE_CAP_ROUND:
+    return CapStyle::ROUND;
+  case gfxContext::LINE_CAP_SQUARE:
+    return CapStyle::SQUARE;
+  }
+  MOZ_CRASH("Incomplete switch");
+}
+
+inline gfxContext::GraphicsLineJoin ThebesLineJoin(JoinStyle aStyle)
+{
+  switch (aStyle) {
+  case JoinStyle::MITER:
+    return gfxContext::LINE_JOIN_MITER;
+  case JoinStyle::BEVEL:
+    return gfxContext::LINE_JOIN_BEVEL;
+  case JoinStyle::ROUND:
+    return gfxContext::LINE_JOIN_ROUND;
+  default:
+    return gfxContext::LINE_JOIN_MITER;
+  }
+}
+
+inline JoinStyle ToJoinStyle(gfxContext::GraphicsLineJoin aStyle)
+{
+  switch (aStyle) {
+  case gfxContext::LINE_JOIN_MITER:
+    return JoinStyle::MITER;
+  case gfxContext::LINE_JOIN_BEVEL:
+    return JoinStyle::BEVEL;
+  case gfxContext::LINE_JOIN_ROUND:
+    return JoinStyle::ROUND;
+  }
+  MOZ_CRASH("Incomplete switch");
+}
+
+inline gfxImageFormat SurfaceFormatToImageFormat(SurfaceFormat aFormat)
+{
+  switch (aFormat) {
+  case SurfaceFormat::B8G8R8A8:
+    return gfxImageFormat::ARGB32;
+  case SurfaceFormat::B8G8R8X8:
+    return gfxImageFormat::RGB24;
+  case SurfaceFormat::R5G6B5:
+    return gfxImageFormat::RGB16_565;
+  case SurfaceFormat::A8:
+    return gfxImageFormat::A8;
+  default:
+    return gfxImageFormat::Unknown;
+  }
+}
+
+inline SurfaceFormat ImageFormatToSurfaceFormat(gfxImageFormat aFormat)
+{
+  switch (aFormat) {
+  case gfxImageFormat::ARGB32:
+    return SurfaceFormat::B8G8R8A8;
+  case gfxImageFormat::RGB24:
+    return SurfaceFormat::B8G8R8X8;
+  case gfxImageFormat::RGB16_565:
+    return SurfaceFormat::R5G6B5;
+  case gfxImageFormat::A8:
+    return SurfaceFormat::A8;
+  default:
+  case gfxImageFormat::Unknown:
+    return SurfaceFormat::B8G8R8A8;
+  }
+}
+
+inline gfxContentType ContentForFormat(const SurfaceFormat &aFormat)
+{
+  switch (aFormat) {
+  case SurfaceFormat::R5G6B5:
+  case SurfaceFormat::B8G8R8X8:
+  case SurfaceFormat::R8G8B8X8:
+    return gfxContentType::COLOR;
+  case SurfaceFormat::A8:
+    return gfxContentType::ALPHA;
+  case SurfaceFormat::B8G8R8A8:
+  case SurfaceFormat::R8G8B8A8:
+  default:
+    return gfxContentType::COLOR_ALPHA;
+  }
+}
+
+inline CompositionOp CompositionOpForOp(gfxContext::GraphicsOperator aOp)
+{
+  switch (aOp) {
+  case gfxContext::OPERATOR_ADD:
+    return CompositionOp::OP_ADD;
+  case gfxContext::OPERATOR_ATOP:
+    return CompositionOp::OP_ATOP;
+  case gfxContext::OPERATOR_IN:
+    return CompositionOp::OP_IN;
+  case gfxContext::OPERATOR_OUT:
+    return CompositionOp::OP_OUT;
+  case gfxContext::OPERATOR_SOURCE:
+    return CompositionOp::OP_SOURCE;
+  case gfxContext::OPERATOR_DEST_IN:
+    return CompositionOp::OP_DEST_IN;
+  case gfxContext::OPERATOR_DEST_OUT:
+    return CompositionOp::OP_DEST_OUT;
+  case gfxContext::OPERATOR_DEST_ATOP:
+    return CompositionOp::OP_DEST_ATOP;
+  case gfxContext::OPERATOR_XOR:
+    return CompositionOp::OP_XOR;
+  case gfxContext::OPERATOR_MULTIPLY:
+    return CompositionOp::OP_MULTIPLY;
+  case gfxContext::OPERATOR_SCREEN:
+    return CompositionOp::OP_SCREEN;
+  case gfxContext::OPERATOR_OVERLAY:
+    return CompositionOp::OP_OVERLAY;
+  case gfxContext::OPERATOR_DARKEN:
+    return CompositionOp::OP_DARKEN;
+  case gfxContext::OPERATOR_LIGHTEN:
+    return CompositionOp::OP_LIGHTEN;
+  case gfxContext::OPERATOR_COLOR_DODGE:
+    return CompositionOp::OP_COLOR_DODGE;
+  case gfxContext::OPERATOR_COLOR_BURN:
+    return CompositionOp::OP_COLOR_BURN;
+  case gfxContext::OPERATOR_HARD_LIGHT:
+    return CompositionOp::OP_HARD_LIGHT;
+  case gfxContext::OPERATOR_SOFT_LIGHT:
+    return CompositionOp::OP_SOFT_LIGHT;
+  case gfxContext::OPERATOR_DIFFERENCE:
+    return CompositionOp::OP_DIFFERENCE;
+  case gfxContext::OPERATOR_EXCLUSION:
+    return CompositionOp::OP_EXCLUSION;
+  case gfxContext::OPERATOR_HUE:
+    return CompositionOp::OP_HUE;
+  case gfxContext::OPERATOR_SATURATION:
+    return CompositionOp::OP_SATURATION;
+  case gfxContext::OPERATOR_COLOR:
+    return CompositionOp::OP_COLOR;
+  case gfxContext::OPERATOR_LUMINOSITY:
+    return CompositionOp::OP_LUMINOSITY;
+  default:
+    return CompositionOp::OP_OVER;
+  }
+}
+
+inline gfxContext::GraphicsOperator ThebesOp(CompositionOp aOp)
+{
+  switch (aOp) {
+  case CompositionOp::OP_ADD:
+    return gfxContext::OPERATOR_ADD;
+  case CompositionOp::OP_ATOP:
+    return gfxContext::OPERATOR_ATOP;
+  case CompositionOp::OP_IN:
+    return gfxContext::OPERATOR_IN;
+  case CompositionOp::OP_OUT:
+    return gfxContext::OPERATOR_OUT;
+  case CompositionOp::OP_SOURCE:
+    return gfxContext::OPERATOR_SOURCE;
+  case CompositionOp::OP_DEST_IN:
+    return gfxContext::OPERATOR_DEST_IN;
+  case CompositionOp::OP_DEST_OUT:
+    return gfxContext::OPERATOR_DEST_OUT;
+  case CompositionOp::OP_DEST_ATOP:
+    return gfxContext::OPERATOR_DEST_ATOP;
+  case CompositionOp::OP_XOR:
+    return gfxContext::OPERATOR_XOR;
+  case CompositionOp::OP_MULTIPLY:
+    return gfxContext::OPERATOR_MULTIPLY;
+  case CompositionOp::OP_SCREEN:
+    return gfxContext::OPERATOR_SCREEN;
+  case CompositionOp::OP_OVERLAY:
+    return gfxContext::OPERATOR_OVERLAY;
+  case CompositionOp::OP_DARKEN:
+    return gfxContext::OPERATOR_DARKEN;
+  case CompositionOp::OP_LIGHTEN:
+    return gfxContext::OPERATOR_LIGHTEN;
+  case CompositionOp::OP_COLOR_DODGE:
+    return gfxContext::OPERATOR_COLOR_DODGE;
+  case CompositionOp::OP_COLOR_BURN:
+    return gfxContext::OPERATOR_COLOR_BURN;
+  case CompositionOp::OP_HARD_LIGHT:
+    return gfxContext::OPERATOR_HARD_LIGHT;
+  case CompositionOp::OP_SOFT_LIGHT:
+    return gfxContext::OPERATOR_SOFT_LIGHT;
+  case CompositionOp::OP_DIFFERENCE:
+    return gfxContext::OPERATOR_DIFFERENCE;
+  case CompositionOp::OP_EXCLUSION:
+    return gfxContext::OPERATOR_EXCLUSION;
+  case CompositionOp::OP_HUE:
+    return gfxContext::OPERATOR_HUE;
+  case CompositionOp::OP_SATURATION:
+    return gfxContext::OPERATOR_SATURATION;
+  case CompositionOp::OP_COLOR:
+    return gfxContext::OPERATOR_COLOR;
+  case CompositionOp::OP_LUMINOSITY:
+    return gfxContext::OPERATOR_LUMINOSITY;
+  default:
+    return gfxContext::OPERATOR_OVER;
+  }
+}
+
+inline void
+ToMatrix4x4(const gfx3DMatrix& aIn, Matrix4x4& aOut)
+{
+  aOut._11 = aIn._11;
+  aOut._12 = aIn._12;
+  aOut._13 = aIn._13;
+  aOut._14 = aIn._14;
+  aOut._21 = aIn._21;
+  aOut._22 = aIn._22;
+  aOut._23 = aIn._23;
+  aOut._24 = aIn._24;
+  aOut._31 = aIn._31;
+  aOut._32 = aIn._32;
+  aOut._33 = aIn._33;
+  aOut._34 = aIn._34;
+  aOut._41 = aIn._41;
+  aOut._42 = aIn._42;
+  aOut._43 = aIn._43;
+  aOut._44 = aIn._44;
+}
+
+inline void
+To3DMatrix(const Matrix4x4& aIn, gfx3DMatrix& aOut)
+{
+  aOut._11 = aIn._11;
+  aOut._12 = aIn._12;
+  aOut._13 = aIn._13;
+  aOut._14 = aIn._14;
+  aOut._21 = aIn._21;
+  aOut._22 = aIn._22;
+  aOut._23 = aIn._23;
+  aOut._24 = aIn._24;
+  aOut._31 = aIn._31;
+  aOut._32 = aIn._32;
+  aOut._33 = aIn._33;
+  aOut._34 = aIn._34;
+  aOut._41 = aIn._41;
+  aOut._42 = aIn._42;
+  aOut._43 = aIn._43;
+  aOut._44 = aIn._44;
+}
+
+}
+}
+
+#endif