corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1414077 - Don't try to scroll image if the image document is not visible; r=bz

Browse Source 
MozReview-Commit-ID: J7Roez2btL
This commit is contained in:
Edgar Chen
2017-11-07 17:51:13 +08:00
parent 4a16eee190
commit e2eef5fa1c
3 changed files with 58 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dom/html/ImageDocument.cpp
View File

@@ -412,8 +412,6 @@ ImageDocument::DOMRestoreImageTo(int32_t aX, int32_t aY)
void
ImageDocument::ScrollImageTo(int32_t aX, int32_t aY, bool restoreImage)
{
float ratio = GetRatio();
if (restoreImage) {
RestoreImage();
FlushPendingNotifications(FlushType::Layout);
@@ -429,6 +427,12 @@ ImageDocument::ScrollImageTo(int32_t aX, int32_t aY, bool restoreImage)
return;
}
float ratio = GetRatio();
// Don't try to scroll image if the document is not visible (mVisibleWidth or
// mVisibleHeight is zero).
if (ratio <= 0.0) {
return;
}
nsRect portRect = sf->GetScrollPortRect();
sf->ScrollTo(nsPoint(nsPresContext::CSSPixelsToAppUnits(aX/ratio) - portRect.width/2,
nsPresContext::CSSPixelsToAppUnits(aY/ratio) - portRect.height/2),