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 617539 - Remove _MOZILLA_2_0 interfaces, mobile-browser fixup, r=mfinkle

Browse Source
This commit is contained in:
Benjamin Smedberg 2011-03-24 14:44:07 -04:00
parent 7b84d781db
commit 0c0f768648
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mobile/chrome/content/bindings/browser.js
View File

@ -333,8 +333,7 @@ let ContentScroll = {
break;
// Map ID to element
let cwu20 = rootCwu.QueryInterface(Ci.nsIDOMWindowUtils_MOZILLA_2_0_BRANCH);
let element = cwu20.findElementWithViewId(json.id);
let element = rootCwu.findElementWithViewId(json.id);
if (!element)
break;
@ -358,8 +357,7 @@ let ContentScroll = {
let win = element.ownerDocument.defaultView;
let winCwu = win.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
let winCwu20 = winCwu.QueryInterface(Ci.nsIDOMWindowUtils_MOZILLA_2_0_BRANCH);
winCwu20.setDisplayPortForElement(x, y, displayport.width, displayport.height, element);
winCwu.setDisplayPortForElement(x, y, displayport.width, displayport.height, element);
// XXX If we scrolled during this displayport update, then it is the
// end of a pan. Due to bug 637852, there may be seaming issues
@ -367,7 +365,7 @@ let ContentScroll = {
if (json.id == 1 && json.scrollX >= 0 && json.scrollY >= 0)
win.setTimeout(
function() {
winCwu20.redraw();
winCwu.redraw();
}, 0);
break;
@ -444,8 +442,7 @@ let ContentActive = {
case "Content:Deactivate":
docShell.isActive = false;
let cwu = content.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
let cwu20 = cwu.QueryInterface(Ci.nsIDOMWindowUtils_MOZILLA_2_0_BRANCH);
cwu20.setDisplayPortForElement(0,0,0,0,content.document.documentElement);
cwu.setDisplayPortForElement(0,0,0,0,content.document.documentElement);
break;
case "Content:Activate":

2
mobile/chrome/content/browser-ui.js
View File

@ -569,7 +569,7 @@ var BrowserUI = {
#ifndef MOZ_OFFICIAL_BRANDING
setTimeout(function() {
let startup = Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup_MOZILLA_2_0).getStartupInfo();
let startup = Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup).getStartupInfo();
for (let name in startup) {
if (name != "process")
Services.console.logStringMessage("[timing] " + name + ": " + (startup[name] - startup.process) + "ms");

4
mobile/chrome/content/browser.js
View File

@ -2596,10 +2596,8 @@ Tab.prototype = {
// stop about:blank from loading
browser.stop();
const i = Ci.nsIFrameLoader_MOZILLA_2_0_BRANCH;
let fl = browser.QueryInterface(Ci.nsIFrameLoaderOwner).frameLoader;
let enabler = fl.QueryInterface(i);
enabler.renderMode = i.RENDER_MODE_ASYNC_SCROLL;
fl.renderMode = Ci.nsIFrameLoader.RENDER_MODE_ASYNC_SCROLL;
return browser;
},