wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backing out 99f6b3acc464 (bug 618975). Bug This caused a reftest crash. a=bustage

Browse Source
This commit is contained in:
Doug Turner 2011-03-08 22:05:06 -08:00
parent 04b3e2145d
commit 3bce7a1dc1
3 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mobile/chrome/content/bindings/browser.js
View File

@ -301,18 +301,11 @@ let ContentScroll = {
},
getScrollOffsetForElement: function(aElement) {
if (aElement.parentNode == aElement.ownerDocument)
return this.getScrollOffset(aElement.ownerDocument.defaultView);
return { x: aElement.scrollLeft, y: aElement.scrollTop };
return this.getScrollOffset(aElement.ownerDocument.defaultView);
},
setScrollOffsetForElement: function(aElement, aLeft, aTop) {
if (aElement.parentNode == aElement.ownerDocument) {
aElement.ownerDocument.defaultView.scrollTo(aLeft, aTop);
} else {
aElement.scrollLeft = aLeft;
aElement.scrollTop = aTop;
}
aElement.ownerDocument.defaultView.scrollTo(aLeft, aTop);
},
receiveMessage: function(aMessage) {
@ -354,8 +347,7 @@ let ContentScroll = {
let win = element.ownerDocument.defaultView;
let winCwu = win.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
let winCwu20 = winCwu.QueryInterface(Ci.nsIDOMWindowUtils_MOZILLA_2_0_BRANCH);
winCwu20.setDisplayPortForElement(x, y, displayport.width, displayport.height, element);
winCwu.setDisplayPort(x, y, displayport.width, displayport.height);
break;
}
@ -427,8 +419,7 @@ let ContentActive = {
case "Content:Deactivate":
docShell.isActive = false;
let cwu = content.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
let cwu20 = cwu.QueryInterface(Ci.nsIDOMWindowUtils_MOZILLA_2_0_BRANCH);
cwu20.setDisplayPortForElement(0,0,0,0,content.document.documentElement);
cwu.setDisplayPort(0,0,0,0);
break;
case "Content:Activate":

8
mobile/chrome/content/bindings/browser.xml
View File

@ -950,13 +950,7 @@
*/
_updateCacheViewport: function() {
// Do not update scroll values for content.
if (this.isRoot())
this._sendDisplayportUpdate(-1, -1);
else {
let contentView = this._contentView;
this._sendDisplayportUpdate(contentView.scrollX,
contentView.scrollY);
}
this._sendDisplayportUpdate(-1, -1);
},
_getContentSize: function() {

2
mobile/chrome/content/browser.js
View File

@ -1161,8 +1161,6 @@ Browser.MainDragger.prototype = {
},
dragStop: function dragStop(dx, dy, scroller) {
if (this._contentView && this._contentView._updateCacheViewport)
this._contentView._updateCacheViewport();
this._contentView = null;
this.dragMove(Browser.snapSidebars(), 0, scroller);
Browser.tryUnfloatToolbar();