Bug 1493616. Fix up logging to only trigger appropriately.
authorJeff Muizelaar <jmuizelaar@mozilla.com>
Sat, 29 Sep 2018 20:53:07 -0400
changeset 438922 742336dae3924fa7e1c19993e7b7f175adc427b7
parent 438921 c97cf45fc0e4feea7a33bcf4a49dba452a506efa
child 438923 3920c858319dff66ebbc9263f6aa8d24f16071f8
push id34742
push userccoroiu@mozilla.com
push dateSun, 30 Sep 2018 09:46:37 +0000
treeherdermozilla-central@7e9ab0e7b608 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1493616
milestone64.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 1493616. Fix up logging to only trigger appropriately.
gfx/layers/wr/WebRenderCommandBuilder.cpp
--- a/gfx/layers/wr/WebRenderCommandBuilder.cpp
+++ b/gfx/layers/wr/WebRenderCommandBuilder.cpp
@@ -742,17 +742,18 @@ struct DIGroup
       }
 
       if (mInvalidRect.Contains(bounds)) {
         GP("Wholely contained\n");
         BlobItemData* data = GetBlobItemData(item);
         data->mInvalid = false;
       } else {
         BlobItemData* data = GetBlobItemData(item);
-        gfxCriticalError() << "DisplayItem" << item->Name() << "should be invalid";
+        if (data->mInvalid)
+          gfxCriticalError() << "DisplayItem" << item->Name() << "should be invalid";
         // if the item is invalid it needs to be fully contained
         MOZ_RELEASE_ASSERT(!data->mInvalid);
       }
 
       nsDisplayList* children = item->GetChildren();
       if (children) {
         GP("doing children in EndGroup\n");
         aGrouper->PaintContainerItem(this, item, bounds, children, aContext, aRecorder);