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 773730 - Minimize the number of element.style calls we make for text selection handles. r=mfinkle

Browse Source
This commit is contained in:
Margaret Leibovic 2012-07-14 09:18:03 -07:00
parent 72e6be1fa6
commit e459ff7b7e
1 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1497,7 +1497,7 @@ var SelectionHandler = {
if (zoom != this._viewOffset.zoom) {
this._viewOffset.zoom = zoom;
this.updateCacheForSelection();
this.positionHandles();
this.positionHandles(true);
}
break;
}
@ -1604,7 +1604,7 @@ var SelectionHandler = {
QueryInterface(Ci.nsISelectionController);
selectionController.selectAll();
this.updateCacheForSelection();
this.positionHandles();
this.positionHandles(false);
break;
}
case COPY: {
@ -1645,13 +1645,12 @@ var SelectionHandler = {
*/
// Update the handle position as it's dragged
if (aIsStartHandle) {
this._start.style.left = aX + this._view.scrollX - this._viewOffset.left + "px";
this._start.style.top = aY + this._view.scrollY - this._viewOffset.top + "px";
} else {
this._end.style.left = aX + this._view.scrollX - this._viewOffset.left + "px";
this._end.style.top = aY + this._view.scrollY - this._viewOffset.top + "px";
}
let leftTop = "left:" + (aX + this._view.scrollX - this._viewOffset.left) + "px;" +
"top:" + (aY + this._view.scrollY - this._viewOffset.top) + "px;";
if (aIsStartHandle)
this._start.style.cssText = this._start.style.cssText + leftTop;
else
this._end.style.cssText = this._end.style.cssText + leftTop;
let cwu = this._view.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
@ -1817,22 +1816,28 @@ var SelectionHandler = {
// 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() {
let height = this.HANDLE_HEIGHT / this._viewOffset.zoom;
this._start.style.height = height + "px";
this._end.style.height = height + "px";
positionHandles: function sh_positionHandles(adjustScale) {
let startCss = this._start.style.cssText;
let endCss = this._end.style.cssText;
let width = this.HANDLE_WIDTH/ this._viewOffset.zoom;
this._start.style.width = width + "px";
this._end.style.width = width + "px";
if (adjustScale) {
let heightWidth = "height:" + this.HANDLE_HEIGHT / this._viewOffset.zoom + "px;" +
"width:" + this.HANDLE_WIDTH / this._viewOffset.zoom + "px;";
this._start.style.left = (this.cache.start.x + this._view.scrollX - this._viewOffset.left -
this.HANDLE_PADDING - this.HANDLE_HORIZONTAL_OFFSET - width) + "px";
this._start.style.top = (this.cache.start.y + this._view.scrollY - this._viewOffset.top) + "px";
startCss += heightWidth;
endCss += heightWidth;
}
this._end.style.left = (this.cache.end.x + this._view.scrollX - this._viewOffset.left -
this.HANDLE_PADDING + this.HANDLE_HORIZONTAL_OFFSET) + "px";
this._end.style.top = (this.cache.end.y + this._view.scrollY - this._viewOffset.top) + "px";
startCss += "left:" + (this.cache.start.x + this._view.scrollX - this._viewOffset.left -
this.HANDLE_PADDING - this.HANDLE_HORIZONTAL_OFFSET - this.HANDLE_WIDTH / this._viewOffset.zoom) + "px;" +
"top:" + (this.cache.start.y + this._view.scrollY - this._viewOffset.top) + "px;";
endCss += "left:" + (this.cache.end.x + this._view.scrollX - this._viewOffset.left -
this.HANDLE_PADDING + this.HANDLE_HORIZONTAL_OFFSET) + "px;" +
"top:" + (this.cache.end.y + this._view.scrollY - this._viewOffset.top) + "px;";
this._start.style.cssText = startCss;
this._end.style.cssText = endCss;
},
showHandles: function sh_showHandles() {
@ -1846,7 +1851,7 @@ var SelectionHandler = {
return;
}
this.positionHandles();
this.positionHandles(true);
this._start.setAttribute("showing", "true");
this._end.setAttribute("showing", "true");
@ -1907,7 +1912,7 @@ var SelectionHandler = {
this._touchDelta = null;
// Adjust the handles to be in the correct spot relative to the text selection
this.positionHandles();
this.positionHandles(false);
break;
case "touchmove":