diff --git a/mozilla/layout/base/nsImageLoader.cpp b/mozilla/layout/base/nsImageLoader.cpp index c1f27a1d354..da4c70a987a 100644 --- a/mozilla/layout/base/nsImageLoader.cpp +++ b/mozilla/layout/base/nsImageLoader.cpp @@ -123,7 +123,13 @@ nsImageLoader::Load(imgIRequest *aImage) mRequest = nsnull; } - return aImage->Clone(this, getter_AddRefs(mRequest)); + // Make sure to clone into a temporary, then set mRequest, since + // cloning may notify and we don't want to trigger paints from this + // code. + nsCOMPtr newRequest; + nsresult rv = aImage->Clone(this, getter_AddRefs(newRequest)); + mRequest.swap(newRequest); + return rv; }