mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 598476 - Errors in FormHelper from old BrowserView code [r=mfinkle]

This commit is contained in:
Matt Brubeck 2010-09-24 00:48:52 -04:00
Родитель 4257fc7963
Коммит fd3b89d9b2
2 изменённых файлов: 6 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
mobile/chrome/content/bindings/browser.js
Просмотреть файл

@ -342,7 +342,6 @@ let ContentScroll = {
init: function() { init: function() {
addMessageListener("Content:ScrollTo", this); addMessageListener("Content:ScrollTo", this);
addMessageListener("Content:ScrollBy", this); addMessageListener("Content:ScrollBy", this);
addMessageListener("Content:SetResolution", this);
addMessageListener("Content:SetCacheViewport", this); addMessageListener("Content:SetCacheViewport", this);
addMessageListener("Content:SetWindowSize", this); addMessageListener("Content:SetWindowSize", this);

9
mobile/chrome/content/browser-ui.js
Просмотреть файл

@ -1662,6 +1662,7 @@ var FormHelperUI = {
this._autofillContainer = document.getElementById("form-helper-autofill"); this._autofillContainer = document.getElementById("form-helper-autofill");
this._cmdPrevious = document.getElementById(this.commands.previous); this._cmdPrevious = document.getElementById(this.commands.previous);
this._cmdNext = document.getElementById(this.commands.next); this._cmdNext = document.getElementById(this.commands.next);
this._visibleScreenArea = new Rect(0, 0, 0, 0);
// Listen for form assistant messages from content // Listen for form assistant messages from content
messageManager.addMessageListener("FormAssist:Show", this); messageManager.addMessageListener("FormAssist:Show", this);
@ -1786,7 +1787,7 @@ var FormHelperUI = {
rect.height = rect.bottom - rect.top; rect.height = rect.bottom - rect.top;
rect.width = rect.right - rect.left; rect.width = rect.right - rect.left;
Browser._browserView._visibleScreenArea = rect; this._visibleScreenArea = rect;
BrowserUI.sizeControls(rect.width, rect.height); BrowserUI.sizeControls(rect.width, rect.height);
this._zoom(this._currentElementRect, this._currentCaretRect); this._zoom(this._currentElementRect, this._currentCaretRect);
}, },
@ -1902,7 +1903,7 @@ var FormHelperUI = {
if (aElementRect && aCaretRect && this._open) { if (aElementRect && aCaretRect && this._open) {
this._currentCaretRect = aCaretRect; this._currentCaretRect = aCaretRect;
let visibleScreenArea = new Rect(0, 0, window.innerWidth, window.innerHeight); let visibleScreenArea = !this._visibleScreenArea.isEmpty() ? this._visibleScreenArea : new Rect(0, 0, window.innerWidth, window.innerHeight);
// respect the helper container in setting the correct viewAreaHeight // respect the helper container in setting the correct viewAreaHeight
let viewAreaHeight = visibleScreenArea.height - this._container.getBoundingClientRect().height; let viewAreaHeight = visibleScreenArea.height - this._container.getBoundingClientRect().height;
@ -1997,7 +1998,7 @@ var FormHelperUI = {
return; return;
this._restore = { this._restore = {
zoom: Browser._browserView.getZoomLevel(), scale: getBrowser().scale,
contentScrollOffset: Browser.getScrollboxPosition(Browser.contentScrollboxScroller), contentScrollOffset: Browser.getScrollboxPosition(Browser.contentScrollboxScroller),
pageScrollOffset: Browser.getScrollboxPosition(Browser.pageScrollboxScroller) pageScrollOffset: Browser.getScrollboxPosition(Browser.pageScrollboxScroller)
}; };
@ -2009,7 +2010,7 @@ var FormHelperUI = {
return; return;
let restore = this._restore; let restore = this._restore;
Browser._browserView.setZoomLevel(restore.zoom); getBrowser().scale = restore.scale;
Browser.contentScrollboxScroller.scrollTo(restore.contentScrollOffset.x, restore.contentScrollOffset.y); Browser.contentScrollboxScroller.scrollTo(restore.contentScrollOffset.x, restore.contentScrollOffset.y);
Browser.pageScrollboxScroller.scrollTo(restore.pageScrollOffset.x, restore.pageScrollOffset.y); Browser.pageScrollboxScroller.scrollTo(restore.pageScrollOffset.x, restore.pageScrollOffset.y);
}, },