From b085ab3a85c9fdcfda4f5900d881f554e7109ba9 Mon Sep 17 00:00:00 2001
From: wangra <[email protected]>
Date: Thu, 30 Jul 2026 22:50:17 -0400
Subject: [PATCH] Introduce ResultAccumulator to aggregate results

Introduce ResultAccumulator to aggregate results to simplify manual
result tracking.

Test: angle_end2end_tests --gtest_filter="ImageTest.SiblingOrphaningOnBackendFailure"
Bug: b/513048243
Change-Id: I5a092a6c6cb0fa2b1269f1f619952b18a004ec76
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/8178168
Reviewed-by: Shahbaz Youssefi <[email protected]>
Reviewed-by: Geoff Lang <[email protected]>
Commit-Queue: Ran Wang <[email protected]>
---
diff --git a/src/libANGLE/Error.h b/src/libANGLE/Error.h
index 5b140e3..fc8c218 100644
--- a/src/libANGLE/Error.h
+++ b/src/libANGLE/Error.h
@@ -123,6 +123,27 @@
     Stop,
 };
 
+class [[nodiscard]] ResultAccumulator
+{
+  public:
+    ResultAccumulator() : mResult(Result::Continue) {}
+    ResultAccumulator(Result result) : mResult(result) {}
+
+    ResultAccumulator &operator=(Result result)
+    {
+        if (result != Result::Continue)
+        {
+            mResult = result;
+        }
+        return *this;
+    }
+
+    operator Result() const { return mResult; }
+
+  private:
+    Result mResult;
+};
+
 // TODO(jmadill): Remove this when refactor is complete. http://anglebug.com/42261727
 egl::Error ResultToEGL(Result result);
 }  // namespace angle
diff --git a/src/libANGLE/Image.cpp b/src/libANGLE/Image.cpp
index 33db5aa..0bad2f0 100644
--- a/src/libANGLE/Image.cpp
+++ b/src/libANGLE/Image.cpp
@@ -129,7 +129,7 @@
 {
     ASSERT(outReleaseImage != nullptr);
 
-    angle::Result result = angle::Result::Continue;
+    angle::ResultAccumulator result = angle::Result::Continue;
 
     if (mTargetOf.get() != nullptr)
     {
@@ -143,11 +143,7 @@
     {
         for (Image *sourceImage : mSourcesOf)
         {
-            angle::Result orphanResult = sourceImage->orphanSibling(context, this);
-            if (orphanResult != angle::Result::Continue)
-            {
-                result = orphanResult;
-            }
+            result = sourceImage->orphanSibling(context, this);
         }
         mSourcesOf.clear();
     }
diff --git a/src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp b/src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp
index 4ad3d2c..8b86f1c 100644
--- a/src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp
@@ -1000,7 +1000,7 @@
 
 angle::Result TextureStorage11_2D::onDestroy(const gl::Context *context)
 {
-    angle::Result result = angle::Result::Continue;
+    angle::ResultAccumulator result = angle::Result::Continue;
     for (unsigned i = 0; i < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; i++)
     {
         if (mAssociatedImages[i] != nullptr)
@@ -1009,10 +1009,7 @@
 
             // We must let the Images recover their data before we delete it from the
             // TextureStorage.
-            if (IsError(mAssociatedImages[i]->recoverFromAssociatedStorage(context)))
-            {
-                result = angle::Result::Stop;
-            }
+            result = mAssociatedImages[i]->recoverFromAssociatedStorage(context);
         }
     }
     ANGLE_TRY(result);
@@ -1932,7 +1929,7 @@
 
 angle::Result TextureStorage11_Cube::onDestroy(const gl::Context *context)
 {
-    angle::Result result = angle::Result::Continue;
+    angle::ResultAccumulator result = angle::Result::Continue;
     for (unsigned int level = 0; level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; level++)
     {
         for (unsigned int face = 0; face < gl::kCubeFaceCount; face++)
@@ -1943,10 +1940,7 @@
 
                 // We must let the Images recover their data before we delete it from the
                 // TextureStorage.
-                if (IsError(mAssociatedImages[face][level]->recoverFromAssociatedStorage(context)))
-                {
-                    result = angle::Result::Stop;
-                }
+                result = mAssociatedImages[face][level]->recoverFromAssociatedStorage(context);
             }
         }
     }
@@ -2445,7 +2439,7 @@
 
 angle::Result TextureStorage11_3D::onDestroy(const gl::Context *context)
 {
-    angle::Result result = angle::Result::Continue;
+    angle::ResultAccumulator result = angle::Result::Continue;
     for (unsigned i = 0; i < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; i++)
     {
         if (mAssociatedImages[i] != nullptr)
@@ -2454,10 +2448,7 @@
 
             // We must let the Images recover their data before we delete it from the
             // TextureStorage.
-            if (IsError(mAssociatedImages[i]->recoverFromAssociatedStorage(context)))
-            {
-                result = angle::Result::Stop;
-            }
+            result = mAssociatedImages[i]->recoverFromAssociatedStorage(context);
         }
     }
 
@@ -2825,7 +2816,7 @@
 
 angle::Result TextureStorage11_2DArray::onDestroy(const gl::Context *context)
 {
-    angle::Result result = angle::Result::Continue;
+    angle::ResultAccumulator result = angle::Result::Continue;
     for (auto iter : mAssociatedImages)
     {
         if (iter.second)
@@ -2834,10 +2825,7 @@
 
             // We must let the Images recover their data before we delete it from the
             // TextureStorage.
-            if (IsError(iter.second->recoverFromAssociatedStorage(context)))
-            {
-                result = angle::Result::Stop;
-            }
+            result = iter.second->recoverFromAssociatedStorage(context);
         }
     }
     mAssociatedImages.clear();