Bug 1068195 - Fix an invalid MOZ_ASSERT in moz2d code, asserting the value of a constant string pointer. r=jrmuizel
authorJacek Caban <jacek@codeweavers.com>
Wed, 19 Nov 2014 11:08:14 +0100
changeset 240800 2582b6cec7b0044541a66a2aef397440e34bd67e
parent 240799 33b8e5e8261e25725af7276dfd6756010b8aac5d
child 240801 b036339d48699fc4ca24b3914c15d686c8752875
push id4311
push userraliiev@mozilla.com
push dateMon, 12 Jan 2015 19:37:41 +0000
treeherdermozilla-beta@150c9fed433b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs1068195
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1068195 - Fix an invalid MOZ_ASSERT in moz2d code, asserting the value of a constant string pointer. r=jrmuizel
gfx/2d/DrawTargetD2D.cpp
--- a/gfx/2d/DrawTargetD2D.cpp
+++ b/gfx/2d/DrawTargetD2D.cpp
@@ -2370,17 +2370,18 @@ DrawTargetD2D::CreateBrushForPattern(con
     if (!pat->mSamplingRect.IsEmpty() &&
         (source->GetType() == SurfaceType::D2D1_BITMAP ||
          source->GetType() == SurfaceType::D2D1_DRAWTARGET)) {
       IntRect samplingRect = pat->mSamplingRect;
 
       RefPtr<DrawTargetD2D> dt = new DrawTargetD2D();
       if (!dt->Init(samplingRect.Size(),
                     source->GetFormat())) {
-        MOZ_ASSERT("Invalid sampling rect size!");
+        // FIXME: Uncomment assertion, bug 1068195
+        // MOZ_ASSERT(false, "Invalid sampling rect size!");
         return nullptr;
       }
 
       dt->CopySurface(source, samplingRect, IntPoint());
       source = dt->Snapshot();
 
       mat.PreTranslate(samplingRect.x, samplingRect.y);
     }