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

backout out 1b0c8e6f01e2 to fix its commit message

Browse Source
This commit is contained in:
Brad Lassey 2012-01-26 02:57:41 -05:00
parent 5832a3ad0a
commit ec525a125a
2 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mobile/android/base/TabsTray.java
View File

@ -140,7 +140,6 @@ public class TabsTray extends Activity implements GeckoApp.OnTabsChangedListener
void finishActivity() { void finishActivity() {
finish(); finish();
overridePendingTransition(0, R.anim.shrink_fade_out); overridePendingTransition(0, R.anim.shrink_fade_out);
GeckoAppShell.sendEventToGecko(new GeckoEvent("Tab:Screenshot:Cancel",""));
} }
// Adapter to bind tabs into a list // Adapter to bind tabs into a list

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

@ -504,31 +504,7 @@ var BrowserApp = {
this._tabs.splice(this._tabs.indexOf(aTab), 1); this._tabs.splice(this._tabs.indexOf(aTab), 1);
}, },
screenshotQueue: null,
screenshotTab: function screenshotTab(aData) { screenshotTab: function screenshotTab(aData) {
if (this.screenshotQueue == null) {
this.screenShotQueue = [];
this.doScreenshotTab(aData);
} else {
this.screenshotQueue.push(aData);
}
},
doNextScreenshot: function() {
if (this.screenshotQueue == null || this.screenshotQueue.length == 0) {
this.screenshotQueue = null;
return;
}
let data = this.screenshotQueue.pop();
if (data == null) {
this.screenshotQueue = null;
return;
}
this.doScreenshotTab(data);
},
doScreenshotTab: function doScreenshotTab(aData) {
let json = JSON.parse(aData); let json = JSON.parse(aData);
let tab = this.getTabForId(parseInt(json.tabID)); let tab = this.getTabForId(parseInt(json.tabID));
let width = parseInt(json.width); let width = parseInt(json.width);
@ -923,8 +899,6 @@ var BrowserApp = {
this._handleTabClosed(this.getTabForId(parseInt(aData))); this._handleTabClosed(this.getTabForId(parseInt(aData)));
} else if (aTopic == "Tab:Screenshot") { } else if (aTopic == "Tab:Screenshot") {
this.screenshotTab(aData); this.screenshotTab(aData);
} else if (aTopic == "Tab:Screenshot:Cancel") {
this.screenshotQueue = null;
} else if (aTopic == "Browser:Quit") { } else if (aTopic == "Browser:Quit") {
this.quit(); this.quit();
} else if (aTopic == "SaveAs:PDF") { } else if (aTopic == "SaveAs:PDF") {
@ -1583,9 +1557,6 @@ Tab.prototype = {
} }
}; };
sendMessageToJava(message); sendMessageToJava(message);
Services.tm.mainThread.dispatch(function() {
BrowserApp.doNextScreenshot()
}, Ci.nsIThread.DISPATCH_NORMAL);
}, },
updateTransform: function() { updateTransform: function() {