commit a183688e06b0a2674b28003370ea0e3314050e68 Author: Olli Pettay Olli.Pettay@helsinki.fi Date: Wed Mar 26 14:43:27 2014 -0400
Bug 987140 - Return width/height from the most recent image request. r=bz, a=sledru --- content/html/content/src/nsGenericHTMLElement.cpp | 2 +- content/html/content/src/nsGenericHTMLElement.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp index 47e79f8..080294a 100644 --- a/content/html/content/src/nsGenericHTMLElement.cpp +++ b/content/html/content/src/nsGenericHTMLElement.cpp @@ -3293,7 +3293,7 @@ nsGenericHTMLElement::GetProperties(nsISupports** aProperties) }
nsSize -nsGenericHTMLElement::GetWidthHeightForImage(imgIRequest *aImageRequest) +nsGenericHTMLElement::GetWidthHeightForImage(nsRefPtr<imgRequestProxy>& aImageRequest) { nsSize size(0,0);
diff --git a/content/html/content/src/nsGenericHTMLElement.h b/content/html/content/src/nsGenericHTMLElement.h index 955d4ea..cdf3f36 100644 --- a/content/html/content/src/nsGenericHTMLElement.h +++ b/content/html/content/src/nsGenericHTMLElement.h @@ -328,8 +328,10 @@ public:
/** * Get width and height, using given image request if attributes are unset. + * Pass a reference to the image request, since the method may change the + * value and we want to use the updated value. */ - nsSize GetWidthHeightForImage(imgIRequest *aImageRequest); + nsSize GetWidthHeightForImage(nsRefPtr<imgRequestProxy>& aImageRequest);
public: // Implementation for nsIContent