From de9ee8155b73d1917569b4f5d64e438b24f2f595 Mon Sep 17 00:00:00 2001
From: Bas Schouten <bschouten@mozilla.com>
Date: Sun, 14 Sep 2014 23:51:32 +0200
Subject: [PATCH] Bug 1066144: Accept D2D paths for D2D 1.1 backends.
 r=jrmuizel

---
 gfx/thebes/gfxContext.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gfx/thebes/gfxContext.cpp b/gfx/thebes/gfxContext.cpp
index ab9030eb210a..8663382ce323 100644
--- a/gfx/thebes/gfxContext.cpp
+++ b/gfx/thebes/gfxContext.cpp
@@ -244,7 +244,8 @@ TemporaryRef<Path> gfxContext::GetPath()
 
 void gfxContext::SetPath(Path* path)
 {
-  MOZ_ASSERT(path->GetBackendType() == mDT->GetBackendType());
+  MOZ_ASSERT(path->GetBackendType() == mDT->GetBackendType() ||
+             (mDT->GetBackendType() == BackendType::DIRECT2D1_1 && path->GetBackendType() == BackendType::DIRECT2D));
   mPath = path;
   mPathBuilder = nullptr;
   mPathIsRect = false;