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 773819 - Avoid calls to getBoundingClientRect in text selection code. r=mfinkle

Browse Source
This commit is contained in:
Margaret Leibovic 2012-07-14 15:30:22 -07:00
parent f6b16cba01
commit 8805cb8566
1 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1571,7 +1571,7 @@ var SelectionHandler = {
selection.QueryInterface(Ci.nsISelectionPrivate).addSelectionListener(this);
// Initialize the cache
this.cache = {};
this.cache = { start: {}, end: {}};
this.updateCacheForSelection();
this.showHandles();
@ -1630,10 +1630,15 @@ var SelectionHandler = {
// Update the handle position as it's dragged
let leftTop = "left:" + (aX + this._view.scrollX - this._viewOffset.left) + "px;" +
"top:" + (aY + this._view.scrollY - this._viewOffset.top) + "px;";
if (aIsStartHandle)
if (aIsStartHandle) {
this._start.style.cssText = this._start.style.cssText + leftTop;
else
this.cache.start.left = aX;
this.cache.start.top = aY;
} else {
this._end.style.cssText = this._end.style.cssText + leftTop;
this.cache.end.left = aX;
this.cache.end.top = aY;
}
let cwu = this._view.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
@ -1669,6 +1674,9 @@ var SelectionHandler = {
this._start = oldEnd;
this._end = oldStart;
// We need to update the cache for the new handles
this.updateCacheForHandleRects();
// Re-send mouse events to update the selection corresponding to the new handles
if (this._isRTL) {
this._sendEndMouseEvents(cwu, false);
@ -1681,25 +1689,23 @@ var SelectionHandler = {
},
_sendStartMouseEvents: function sh_sendStartMouseEvents(cwu, useShift) {
let start = this._start.getBoundingClientRect();
let x = start.right - this.HANDLE_PADDING;
let x = this.cache.start.left + this.HANDLE_PADDING + this.HANDLE_WIDTH;
// Send mouse events 1px above handle to avoid hitting the handle div (bad things happen in that case)
let y = start.top - 1;
let y = this.cache.start.top - 1;
this._sendMouseEvents(cwu, useShift, x, y);
},
_sendEndMouseEvents: function sh_sendEndMouseEvents(cwu, useShift) {
let end = this._end.getBoundingClientRect();
let x = end.left + this.HANDLE_PADDING;
let x = this.cache.end.left + this.HANDLE_PADDING;
// Send mouse events 1px above handle to avoid hitting the handle div (bad things happen in that case)
let y = end.top - 1;
let y = this.cache.end.top - 1;
this._sendMouseEvents(cwu, useShift, x, y);
},
_sendMouseEvents: function sh_sendMouseEvents(cwu, useShift, x, y) {
let element = cwu.elementFromPoint(x, y, false, false);
let element = cwu.elementFromPoint(x, y, false, true);
// Don't send mouse events to the other handle
if (element instanceof Ci.nsIDOMHTMLHtmlElement)
return;
@ -1783,12 +1789,25 @@ var SelectionHandler = {
(!aIsStartHandle && (start.y < this.cache.start.y || (start.y == this.cache.start.y && start.x < this.cache.start.x)));
}
this.cache.start = start;
this.cache.end = end;
this.cache.start.x = start.x;
this.cache.start.y = start.y;
this.cache.end.x = end.x;
this.cache.end.y = end.y;
return selectionReversed;
},
// Updates the cached client rect left/top values for the handles.
updateCacheForHandleRects: function sh_updateCacheForHandleRects() {
let start = this._start.getBoundingClientRect();
this.cache.start.left = start.left;
this.cache.start.top = start.top;
let end = this._end.getBoundingClientRect();
this.cache.end.left = end.left;
this.cache.end.top = end.top;
},
// Adjust start/end positions to account for scroll, and account for the dimensions of the
// handle elements to ensure the handles point exactly at the ends of the selection.
positionHandles: function sh_positionHandles(adjustScale) {
@ -1827,6 +1846,7 @@ var SelectionHandler = {
}
this.positionHandles(true);
this.updateCacheForHandleRects();
this._start.setAttribute("showing", "true");
this._end.setAttribute("showing", "true");
@ -1877,6 +1897,9 @@ var SelectionHandler = {
this._touchDelta = { x: touch.clientX - rect.left,
y: touch.clientY - rect.top };
// Update the cache in case the page panned since last touch
this.updateCacheForHandleRects();
aEvent.target.addEventListener("touchmove", this, false);
break;