tor-browser

commit 404688c2813d27bde7e6f142a9fdfa7160e01eec
parent 7267ee8b9a4f4632607186ff33f711ba671ae5b1
Author: Emilio Cobos Álvarez <emilio@crisal.io>
Date:   Mon,  3 Nov 2025 14:10:30 +0000

Bug 1997897 - Minor canvas capture clean-ups. r=pehrsons

No behavior change, but OwnerDoc() and RefreshDriver() never return
null.

Differential Revision: https://phabricator.services.mozilla.com/D271052

Diffstat:
M
dom/html/HTMLCanvasElement.cpp
 | 
23
+++++++----------------

1 file changed, 7 insertions(+), 16 deletions(-)
diff --git a/dom/html/HTMLCanvasElement.cpp b/dom/html/HTMLCanvasElement.cpp
@@ -1117,10 +1117,8 @@ OffscreenCanvas* HTMLCanvasElement::TransferControlToOffscreen(
   }
 
   LayersBackend backend = LayersBackend::LAYERS_NONE;
-  nsIWidget* docWidget = nsContentUtils::WidgetForDocument(OwnerDoc());
-  if (docWidget) {
-    WindowRenderer* renderer = docWidget->GetWindowRenderer();
-    if (renderer) {
+  if (nsIWidget* docWidget = nsContentUtils::WidgetForDocument(OwnerDoc())) {
+    if (WindowRenderer* renderer = docWidget->GetWindowRenderer()) {
       backend = renderer->GetCompositorBackendType();
     }
   }
@@ -1425,30 +1423,23 @@ nsresult HTMLCanvasElement::RegisterFrameCaptureListener(
   }
 
   if (!mRequestedFrameRefreshObserver) {
-    Document* doc = OwnerDoc();
-    if (!doc) {
-      return NS_ERROR_FAILURE;
-    }
-
-    PresShell* shell = nsContentUtils::FindPresShellForDocument(doc);
-    if (!shell) {
+    PresShell* shell = nsContentUtils::FindPresShellForDocument(OwnerDoc());
+    if (NS_WARN_IF(!shell)) {
       return NS_ERROR_FAILURE;
     }
 
     nsPresContext* context = shell->GetPresContext();
-    if (!context) {
+    if (NS_WARN_IF(!context)) {
       return NS_ERROR_FAILURE;
     }
 
     context = context->GetRootPresContext();
-    if (!context) {
+    if (NS_WARN_IF(!context)) {
       return NS_ERROR_FAILURE;
     }
 
     nsRefreshDriver* driver = context->RefreshDriver();
-    if (!driver) {
-      return NS_ERROR_FAILURE;
-    }
+    MOZ_ASSERT(driver);
 
     mRequestedFrameRefreshObserver =
         new RequestedFrameRefreshObserver(this, driver, aReturnPlaceholderData);