From 97f33ec2f85c2b274eb818beffde24eb154817a3 Mon Sep 17 00:00:00 2001
From: Xidorn Quan <me@upsuper.org>
Date: Thu, 19 Jan 2017 16:41:19 +1100
Subject: [PATCH] Bug 1332180 - Early return from shape-outside:url() value in
 ctor of FloatInfo. r=TYLin

MozReview-Commit-ID: E2nj3DWt1fr

--HG--
extra : rebase_source : 65cd44b001f8f6ed0085d03f7bc45d07780ef5c1
---
 layout/generic/nsFloatManager.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/layout/generic/nsFloatManager.cpp b/layout/generic/nsFloatManager.cpp
index 8071b3bf55dd..a47539f81eae 100644
--- a/layout/generic/nsFloatManager.cpp
+++ b/layout/generic/nsFloatManager.cpp
@@ -689,6 +689,13 @@ nsFloatManager::FloatInfo::FloatInfo(nsIFrame* aFrame,
     return;
   }
 
+  if (shapeOutside.GetType() == StyleShapeSourceType::URL) {
+    // Bug 1265343: Implement 'shape-image-threshold'. Early return
+    // here because shape-outside with url() value doesn't have a
+    // reference box, and GetReferenceBox() asserts that.
+    return;
+  }
+
   // Initialize <shape-box>'s reference rect.
   LogicalRect rect = aMarginRect;
 
@@ -723,8 +730,6 @@ nsFloatManager::FloatInfo::FloatInfo(nsIFrame* aFrame,
       mShapeInfo = MakeUnique<CircleShapeInfo>(basicShape, aLineLeft, aBlockStart,
                                                rect, aWM, aContainerSize);
     }
-  } else if (shapeOutside.GetType() == StyleShapeSourceType::URL) {
-    // Bug 1265343: Implement 'shape-image-threshold'.
   } else {
     MOZ_ASSERT_UNREACHABLE("Unknown StyleShapeSourceType!");
   }