Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-09 08:48:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 814149. Fix GetCanvas. r=bz

Browse Source
This commit is contained in:
Nicholas Cameron 2012-11-22 10:55:36 +13:00
parent 17299e21c3
commit b5abc3ce0b
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
content/canvas/src/CanvasRenderingContext2D.h
View File

@ -143,7 +143,8 @@ public:
nsHTMLCanvasElement* GetCanvas() const nsHTMLCanvasElement* GetCanvas() const
{ {
return mCanvasElement; // corresponds to changes to the old bindings made in bug 745025
return mCanvasElement->GetOriginalCanvas();
} }
void Save(); void Save();

4
content/html/content/public/nsHTMLCanvasElement.h
View File

@ -173,7 +173,7 @@ protected:
void CallPrintCallback(); void CallPrintCallback();
nsString mCurrentContextId; nsString mCurrentContextId;
nsCOMPtr<nsIDOMHTMLCanvasElement> mOriginalCanvas; nsRefPtr<nsHTMLCanvasElement> mOriginalCanvas;
nsCOMPtr<nsIPrintCallback> mPrintCallback; nsCOMPtr<nsIPrintCallback> mPrintCallback;
nsCOMPtr<nsICanvasRenderingContextInternal> mCurrentContext; nsCOMPtr<nsICanvasRenderingContextInternal> mCurrentContext;
nsCOMPtr<nsHTMLCanvasPrintState> mPrintState; nsCOMPtr<nsHTMLCanvasPrintState> mPrintState;
@ -193,7 +193,7 @@ public:
void ResetPrintCallback(); void ResetPrintCallback();
nsIDOMHTMLCanvasElement* GetOriginalCanvas(); nsHTMLCanvasElement* GetOriginalCanvas();
}; };
inline nsISupports* inline nsISupports*

2
content/html/content/src/nsHTMLCanvasElement.cpp
View File

@ -307,7 +307,7 @@ nsHTMLCanvasElement::IsPrintCallbackDone()
return mPrintState->mIsDone; return mPrintState->mIsDone;
} }
nsIDOMHTMLCanvasElement* nsHTMLCanvasElement*
nsHTMLCanvasElement::GetOriginalCanvas() nsHTMLCanvasElement::GetOriginalCanvas()
{ {
return mOriginalCanvas ? mOriginalCanvas.get() : this; return mOriginalCanvas ? mOriginalCanvas.get() : this;