Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing bug 312232. getScreenCTM fails in xulrunner builds due to uninitialized nsresult. Patched by Rob Adams <readams@readams.net>, r=me, sr=tor@acm.org, a=asa@mozill.org

Browse Source 
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@182289 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jwatt%jwatt.org
2005-10-15 00:21:05 +00:00
parent 7876001aa7
commit 2ff2e0bd13
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/content/svg/content/src/nsSVGMarkerElement.cpp
View File

@@ -416,6 +416,8 @@ nsSVGMarkerElement::GetMarkerTransform(float aStrokeWidth,
NS_IMETHODIMP
nsSVGMarkerElement::GetViewboxToViewportTransform(nsIDOMSVGMatrix **_retval)
{
nsresult rv = NS_OK;
if (!mViewBoxToViewportTransform) {
float viewportWidth;
{
@@ -512,15 +514,15 @@ nsSVGMarkerElement::GetViewboxToViewportTransform(nsIDOMSVGMatrix **_retval)
printf(" [b d f] = [ 0, %f, %f]\n", d, f);
#endif
NS_NewSVGMatrix(getter_AddRefs(mViewBoxToViewportTransform),
a, 0.0f,
0.0f, d,
e, f);
rv = NS_NewSVGMatrix(getter_AddRefs(mViewBoxToViewportTransform),
a, 0.0f,
0.0f, d,
e, f);
}
*_retval = mViewBoxToViewportTransform;
NS_IF_ADDREF(*_retval);
return NS_OK;
return rv;
}
//----------------------------------------------------------------------

2
mozilla/content/svg/content/src/nsSVGSVGElement.cpp
View File

@@ -806,7 +806,7 @@ nsSVGSVGElement::GetElementById(const nsAString & elementId, nsIDOMElement **_re
NS_IMETHODIMP
nsSVGSVGElement::GetViewboxToViewportTransform(nsIDOMSVGMatrix **_retval)
{
nsresult rv;
nsresult rv = NS_OK;
if (!mViewBoxToViewportTransform) {
float viewportWidth;