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

Bug 846102 - Remove sub-frame offset from cursor handle position calculation. r=bnicholson

Browse Source
This commit is contained in:
Margaret Leibovic 2013-03-01 17:06:03 -08:00
parent 53fc6e003c
commit 5ddcbc9426
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mobile/android/chrome/content/browser.js
View File

@ -2396,9 +2396,6 @@ var SelectionHandler = {
},
positionHandles: function sh_positionHandles() {
// Translate coordinates to account for selections in sub-frames. We can't cache
// this because the top-level page may have scrolled since selection started.
let offset = this._getViewOffset();
let scrollX = {}, scrollY = {};
this._view.top.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils).getScrollXY(false, scrollX, scrollY);
@ -2418,26 +2415,33 @@ var SelectionHandler = {
let positions = null;
if (this._activeType == this.TYPE_CURSOR) {
// The left and top properties returned are relative to the client area
// of the window, so we don't need to account for a sub-frame offset.
let cursor = this._cwu.sendQueryContentEvent(this._cwu.QUERY_CARET_RECT, this._target.selectionEnd, 0, 0, 0);
let x = cursor.left;
let y = cursor.top + cursor.height;
positions = [ { handle: this.HANDLE_TYPE_MIDDLE,
left: x + offset.x + scrollX.value,
top: y + offset.y + scrollY.value,
hidden: checkHidden(x, y) } ];
positions = [{ handle: this.HANDLE_TYPE_MIDDLE,
left: x + scrollX.value,
top: y + scrollY.value,
hidden: checkHidden(x, y) }];
} else {
let sx = this.cache.start.x;
let sy = this.cache.start.y;
let ex = this.cache.end.x;
let ey = this.cache.end.y;
positions = [ { handle: this.HANDLE_TYPE_START,
// Translate coordinates to account for selections in sub-frames. We can't cache
// this because the top-level page may have scrolled since selection started.
let offset = this._getViewOffset();
positions = [{ handle: this.HANDLE_TYPE_START,
left: sx + offset.x + scrollX.value,
top: sy + offset.y + scrollY.value,
hidden: checkHidden(sx, sy) },
{ handle: this.HANDLE_TYPE_END,
left: ex + offset.x + scrollX.value,
top: ey + offset.y + scrollY.value,
hidden: checkHidden(ex, ey) } ];
hidden: checkHidden(ex, ey) }];
}
sendMessageToJava({