Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 04:45:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing bug 121861. Removing dead code from nsHTMLImageElement::SetSrc(). r=bzbarsky@mit.edu, sr=dveditz@netscape.com

Browse Source
This commit is contained in:
jst%netscape.com 2002-02-09 02:21:16 +00:00
parent 6012fe8817
commit a73e344534
1 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
content/html/content/src/nsHTMLImageElement.cpp
View File

@ -901,29 +901,6 @@ nsHTMLImageElement::SetSrcInner(nsIURI* aBaseURL,
result = shell->GetPresContext(getter_AddRefs(context));
if (context) {
nsSize size;
nsHTMLValue val;
float p2t;
context->GetScaledPixelsToTwips(&p2t);
result = GetHTMLAttribute(nsHTMLAtoms::width, val);
if (NS_CONTENT_ATTR_HAS_VALUE == result) {
size.width = NSIntPixelsToTwips(val.GetIntValue(), p2t);
}
else {
size.width = 0;
}
result = GetHTMLAttribute(nsHTMLAtoms::height, val);
if (NS_CONTENT_ATTR_HAS_VALUE == result) {
size.height = NSIntPixelsToTwips(val.GetIntValue(), p2t);
}
else {
size.height = 0;
}
nsAutoString url;
if (aBaseURL) {
result = NS_MakeAbsoluteURI(url, aSrc, aBaseURL);
@ -935,11 +912,6 @@ nsHTMLImageElement::SetSrcInner(nsIURI* aBaseURL,
url.Assign(aSrc);
}
nsSize* specifiedSize = nsnull;
if ((size.width > 0) || (size.height > 0)) {
specifiedSize = &size;
}
nsCOMPtr<nsIURI> uri;
result = NS_NewURI(getter_AddRefs(uri), aSrc, aBaseURL);
if (NS_FAILED(result)) return result;
@ -955,11 +927,12 @@ nsHTMLImageElement::SetSrcInner(nsIURI* aBaseURL,
nsCOMPtr<nsIDOMWindow> domWin(do_QueryInterface(globalObject));
PRBool shouldLoad = PR_TRUE;
result = NS_CheckContentLoadPolicy(nsIContentPolicy::IMAGE,
uri,
NS_STATIC_CAST(nsIDOMHTMLImageElement *,
this),
domWin, &shouldLoad);
result =
NS_CheckContentLoadPolicy(nsIContentPolicy::IMAGE,
uri,
NS_STATIC_CAST(nsIDOMHTMLImageElement *,
this),
domWin, &shouldLoad);
if (NS_SUCCEEDED(result) && !shouldLoad) {
return NS_OK;
}