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

Bug 389756, backout, tree is burning

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@245155 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
Olli.Pettay%helsinki.fi 2008-02-07 18:21:18 +00:00
parent 9992a52566
commit 0c36a0efa0
1 changed files with 2 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
mozilla/content/html/document/src/nsImageDocument.cpp
View File

@ -69,9 +69,6 @@
#include "nsIDOMNSHTMLElement.h"
#include "nsContentErrors.h"
#include "ImageErrors.h"
#include "nsIDocShell.h"
#include "nsIContentViewer.h"
#include "nsIMarkupDocumentViewer.h"
#define AUTOMATIC_IMAGE_RESIZING_PREF "browser.enable_automatic_image_resizing"
@ -131,9 +128,6 @@ protected:
(float)mVisibleHeight / mImageHeight);
}
void SetZoomLevel(float aZoomLevel);
float GetZoomLevel();
nsCOMPtr<nsIContent> mImageContent;
PRInt32 mVisibleWidth;
@ -415,10 +409,6 @@ nsImageDocument::GetImageRequest(imgIRequest** aImageRequest)
NS_IMETHODIMP
nsImageDocument::ShrinkToFit()
{
if (GetZoomLevel() != 1.0 && mImageIsResized) {
return NS_OK;
}
// Keep image content alive while changing the attributes.
nsCOMPtr<nsIContent> imageContent = mImageContent;
nsCOMPtr<nsIDOMHTMLImageElement> image = do_QueryInterface(mImageContent);
@ -529,7 +519,6 @@ nsImageDocument::HandleEvent(nsIDOMEvent* aEvent)
CheckOverflowing(PR_FALSE);
}
else if (eventType.EqualsLiteral("click")) {
SetZoomLevel(1.0);
mShouldResize = PR_TRUE;
if (mImageIsResized) {
PRInt32 x = 0, y = 0;
@ -559,7 +548,6 @@ nsImageDocument::HandleEvent(nsIDOMEvent* aEvent)
if (charCode == 0x2B) {
mShouldResize = PR_FALSE;
if (mImageIsResized) {
SetZoomLevel(1.0);
RestoreImage();
}
}
@ -567,7 +555,6 @@ nsImageDocument::HandleEvent(nsIDOMEvent* aEvent)
else if (charCode == 0x2D) {
mShouldResize = PR_TRUE;
if (mImageIsOverflowing) {
SetZoomLevel(1.0);
ShrinkToFit();
}
}
@ -650,11 +637,8 @@ nsImageDocument::CheckOverflowing(PRBool changeState)
if (styleContext->GetStylePadding()->GetPadding(m))
visibleArea.Deflate(m);
float zoomLevel = GetZoomLevel();
mVisibleWidth = PRInt32(zoomLevel *
nsPresContext::AppUnitsToIntCSSPixels(visibleArea.width));
mVisibleHeight = PRInt32(zoomLevel *
nsPresContext::AppUnitsToIntCSSPixels(visibleArea.height));
mVisibleWidth = nsPresContext::AppUnitsToIntCSSPixels(visibleArea.width);
mVisibleHeight = nsPresContext::AppUnitsToIntCSSPixels(visibleArea.height);
}
PRBool imageWasOverflowing = mImageIsOverflowing;
@ -739,35 +723,6 @@ nsImageDocument::UpdateTitleAndCharset()
mImageWidth, mImageHeight, status);
}
void
nsImageDocument::SetZoomLevel(float aZoomLevel)
{
nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(mDocumentContainer);
if (docShell) {
nsCOMPtr<nsIContentViewer> cv;
docShell->GetContentViewer(getter_AddRefs(cv));
nsCOMPtr<nsIMarkupDocumentViewer> mdv = do_QueryInterface(cv);
if (mdv) {
mdv->SetFullZoom(aZoomLevel);
}
}
}
float
nsImageDocument::GetZoomLevel()
{
float zoomLevel = 1.0;
nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(mDocumentContainer);
if (docShell) {
nsCOMPtr<nsIContentViewer> cv;
docShell->GetContentViewer(getter_AddRefs(cv));
nsCOMPtr<nsIMarkupDocumentViewer> mdv = do_QueryInterface(cv);
if (mdv) {
mdv->GetFullZoom(&zoomLevel);
}
}
return zoomLevel;
}
nsresult
NS_NewImageDocument(nsIDocument** aResult)