Bug 1846293 - Improve flush handing in Canvas2D. r=dholbert a=pascalc

Don't keep weak pointers before flushing. Differential Revision: https://phabricator.services.mozilla.com/D184950
iaxat · Sep 8, 2023 · 6b19f62 · 6b19f62
1 parent fc4a087
commit 6b19f62
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/dom/canvas/CanvasRenderingContext2D.cpp b/dom/canvas/CanvasRenderingContext2D.cpp
@@ -4372,14 +4372,14 @@ TextMetrics* CanvasRenderingContext2D::DrawOrMeasureText(
   const double kHangingBaselineDefault = 0.8;      // fraction of ascent
   const double kIdeographicBaselineDefault = 0.5;  // fraction of descent
 
-  gfxFontGroup* currentFontStyle = GetCurrentFontStyle();
+  RefPtr<gfxFontGroup> currentFontStyle = GetCurrentFontStyle();
   if (NS_WARN_IF(!currentFontStyle)) {
     aError = NS_ERROR_FAILURE;
     return nullptr;
   }
 
   RefPtr<PresShell> presShell = GetPresShell();
-  Document* document = presShell ? presShell->GetDocument() : nullptr;
+  RefPtr<Document> document = presShell ? presShell->GetDocument() : nullptr;
 
   // replace all the whitespace characters with U+0020 SPACE
   nsAutoString textToDraw(aRawText);