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

Backed out changesets f488602d26c9 and 09725c69fd76 (bug 860493) for OSX bustage.

Browse Source 
CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2013-11-04 12:55:56 -05:00
parent 7eed7f15d5
commit 52c8cecb5f
3 changed files with 17 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/app/profile/firefox.js
View File

@ -588,11 +588,7 @@ pref("browser.gesture.twist.left", "cmd_gestureRotateLeft");
pref("browser.gesture.twist.end", "cmd_gestureRotateEnd");
pref("browser.gesture.tap", "cmd_fullZoomReset");
#ifndef RELEASE_BUILD
pref("browser.snapshots.limit", 5);
#else
pref("browser.snapshots.limit", 0);
#endif
// 0: Nothing happens
// 1: Scrolling contents

46
browser/base/content/browser-gestureSupport.js
View File

@ -2,8 +2,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
Cu.import("resource://gre/modules/TelemetryStopwatch.jsm", this);
// Simple gestures support
//
// As per bug #412486, web content must not be allowed to receive any
@ -943,34 +941,24 @@ let gHistorySwipeAnimation = {
(gBrowser.webNavigation.sessionHistory.index < 0))
return;
TelemetryStopwatch.start("FX_GESTURE_TAKE_SNAPSHOT_OF_PAGE");
try {
let browser = gBrowser.selectedBrowser;
let r = browser.getBoundingClientRect();
let canvas = document.createElementNS("http://www.w3.org/1999/xhtml",
"canvas");
canvas.mozOpaque = true;
canvas.width = r.width;
canvas.height = r.height;
let ctx = canvas.getContext("2d");
let zoom = browser.markupDocumentViewer.fullZoom;
ctx.scale(zoom, zoom);
ctx.drawWindow(browser.contentWindow,
0, 0, r.width / zoom, r.height / zoom, "white",
ctx.DRAWWINDOW_DO_NOT_FLUSH | ctx.DRAWWINDOW_DRAW_VIEW |
ctx.DRAWWINDOW_ASYNC_DECODE_IMAGES |
ctx.DRAWWINDOW_USE_WIDGET_LAYERS);
} finally {
TelemetryStopwatch.stop("FX_GESTURE_TAKE_SNAPSHOT_OF_PAGE");
}
let browser = gBrowser.selectedBrowser;
let r = browser.getBoundingClientRect();
let canvas = document.createElementNS("http://www.w3.org/1999/xhtml",
"canvas");
canvas.mozOpaque = true;
canvas.width = r.width;
canvas.height = r.height;
let ctx = canvas.getContext("2d");
let zoom = browser.markupDocumentViewer.fullZoom;
ctx.scale(zoom, zoom);
ctx.drawWindow(browser.contentWindow,
0, 0, r.width / zoom, r.height / zoom, "white",
ctx.DRAWWINDOW_DO_NOT_FLUSH | ctx.DRAWWINDOW_DRAW_VIEW |
ctx.DRAWWINDOW_ASYNC_DECODE_IMAGES |
ctx.DRAWWINDOW_USE_WIDGET_LAYERS);
TelemetryStopwatch.start("FX_GESTURE_INSTALL_SNAPSHOT_OF_PAGE");
try {
this._installCurrentPageSnapshot(canvas);
this._assignSnapshotToCurrentBrowser(canvas);
} finally {
TelemetryStopwatch.stop("FX_GESTURE_INSTALL_SNAPSHOT_OF_PAGE");
}
this._installCurrentPageSnapshot(canvas);
this._assignSnapshotToCurrentBrowser(canvas);
},
/**

12
toolkit/components/telemetry/Histograms.json
View File

@ -2627,18 +2627,6 @@
"n_buckets": 20,
"description": "Gloda: indexing rate (message/s)"
},
"FX_GESTURE_TAKE_SNAPSHOT_OF_PAGE": {
"kind": "exponential",
"high": "1000",
"n_buckets": "30",
"description": "Firefox: Time taken to capture the page to a canvas, for reuse while swiping through history (ms)."
},
"FX_GESTURE_INSTALL_SNAPSHOT_OF_PAGE": {
"kind": "exponential",
"high": "1000",
"n_buckets": "30",
"description": "Firefox: Time taken to store the image capture of the page to a canvas, for reuse while swiping through history (ms)."
},
"FX_TAB_ANIM_OPEN_MS": {
"kind": "exponential",
"high": "3000",