зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset b3bea36ce719 (bug 901607) for mochitest-mc orange.
CLOSED TREE
This commit is contained in:
Родитель
d5604b3c54
Коммит
2cd2506f4c
|
@ -68,12 +68,10 @@ var Browser = {
|
|||
messageManager.loadFrameScript("chrome://browser/content/contenthandlers/SelectionHandler.js", true);
|
||||
messageManager.loadFrameScript("chrome://browser/content/contenthandlers/ContextMenuHandler.js", true);
|
||||
messageManager.loadFrameScript("chrome://browser/content/contenthandlers/FindHandler.js", true);
|
||||
messageManager.loadFrameScript("chrome://browser/content/contenthandlers/ConsoleAPIObserver.js", true);
|
||||
if (!Services.prefs.getBoolPref(kAsyncPanZoomEnabled)) {
|
||||
messageManager.loadFrameScript("chrome://global/content/BrowserElementPanning.js", true);
|
||||
}
|
||||
// XXX Viewport resizing disabled because of bug 766142
|
||||
//messageManager.loadFrameScript("chrome://browser/content/contenthandlers/ViewportHandler.js", true);
|
||||
messageManager.loadFrameScript("chrome://browser/content/contenthandlers/ConsoleAPIObserver.js", true);
|
||||
//messageManager.loadFrameScript("chrome://browser/content/contenthandlers/PluginCTPHandler.js", true);
|
||||
} catch (e) {
|
||||
// XXX whatever is calling startup needs to dump errors!
|
||||
dump("###########" + e + "\n");
|
||||
|
|
|
@ -150,8 +150,6 @@ let Content = {
|
|||
addEventListener("click", this, false);
|
||||
|
||||
docShell.useGlobalHistory = true;
|
||||
|
||||
this._apzEnabled = Services.prefs.getBoolPref("layers.async-pan-zoom.enabled");
|
||||
},
|
||||
|
||||
/*******************************************
|
||||
|
@ -410,18 +408,11 @@ let Content = {
|
|||
_highlightElement: null,
|
||||
|
||||
_doTapHighlight: function _doTapHighlight(aElement) {
|
||||
// Handled by BrowserElementPanning when apz is disabled
|
||||
if (this._apzEnabled) {
|
||||
return;
|
||||
}
|
||||
gDOMUtils.setContentState(aElement, kStateActive);
|
||||
this._highlightElement = aElement;
|
||||
},
|
||||
|
||||
_cancelTapHighlight: function _cancelTapHighlight(aElement) {
|
||||
if (this._apzEnabled) {
|
||||
return;
|
||||
}
|
||||
gDOMUtils.setContentState(content.document.documentElement, kStateActive);
|
||||
this._highlightElement = null;
|
||||
},
|
||||
|
|
Загрузка…
Ссылка в новой задаче