Bug 1461954: Fix nsBulletFrame's image request registration code. r?tnikkel draft
authorEmilio Cobos Álvarez <emilio@crisal.io>
Wed, 16 May 2018 15:05:54 +0200
changeset 795689 b6154c11a4d49186fa33b9aa781afe29fc24b3b3
parent 795688 ec972dc9ac2e7fddefe60d7c393cccb734739ebc
child 795759 ccbd56763120fdb75b30dc0174f9187dac3ee725
push id110051
push userbmo:emilio@crisal.io
push dateWed, 16 May 2018 13:09:15 +0000
reviewerstnikkel
bugs1461954
milestone62.0a1
Bug 1461954: Fix nsBulletFrame's image request registration code. r?tnikkel Ideas for a test for this welcome :). MozReview-Commit-ID: 1IpUlakeKXm
layout/generic/nsBulletFrame.cpp
--- a/layout/generic/nsBulletFrame.cpp
+++ b/layout/generic/nsBulletFrame.cpp
@@ -1408,17 +1408,17 @@ nsBulletFrame::RegisterImageRequest(bool
       nsLayoutUtils::RegisterImageRequest(PresContext(), mImageRequest,
                                           &isRequestRegistered);
     } else {
       nsLayoutUtils::RegisterImageRequestIfAnimated(PresContext(),
                                                     mImageRequest,
                                                     &isRequestRegistered);
     }
 
-    isRequestRegistered = mRequestRegistered;
+    mRequestRegistered = isRequestRegistered;
   }
 }
 
 
 void
 nsBulletFrame::DeregisterAndCancelImageRequest()
 {
   if (mImageRequest) {
@@ -1426,17 +1426,17 @@ nsBulletFrame::DeregisterAndCancelImageR
     // the address.
     bool isRequestRegistered = mRequestRegistered;
 
     // Deregister our image request from the refresh driver.
     nsLayoutUtils::DeregisterImageRequest(PresContext(),
                                           mImageRequest,
                                           &isRequestRegistered);
 
-    isRequestRegistered = mRequestRegistered;
+    mRequestRegistered = isRequestRegistered;
 
     // Cancel the image request and forget about it.
     mImageRequest->CancelAndForgetObserver(NS_ERROR_FAILURE);
     mImageRequest = nullptr;
   }
 }