Bug 650694 - browser_scrollbar.js on Android fails four tests and times out [r=mbrubeck]

This commit is contained in:
Vivien Nicolas 2011-05-09 13:28:48 +02:00
parent a068bd1f8d
commit dd83f17e32
2 changed files with 3 additions and 6 deletions

View File

@ -2679,7 +2679,8 @@ Tab.prototype = {
// Make sure the viewport height is not shorter than the window when
// the page is zoomed out to show its full width.
viewportH = Math.max(viewportH, screenH * (browser.contentDocumentWidth / screenW));
if (viewportH * this.clampZoomLevel(this.getPageZoomLevel()) < screenH)
viewportH = Math.max(viewportH, screenH * (browser.contentDocumentWidth / screenW));
if (browser.contentWindowWidth != viewportW || browser.contentWindowHeight != viewportH)
browser.setWindowSize(viewportW, viewportH);

View File

@ -87,11 +87,7 @@ gTests.push({
},
checkHorizontalScrollable: function() {
checkScrollbars(true, true);
// TODO: current code forces the height to grow so we always have visible document when
// zooming out to see the wide document
//checkScrollbars(true, false);
todo(false, "Don't cause the height to grow beyond the window height if it doesn't need to");
checkScrollbars(true, false);
waitForPageShow(testURL_01 + "vertical", gCurrentTest.checkVerticalScrollable);
gOpenedTabs.push(Browser.addTab(testURL_01 + "vertical", true));