From 2cd2506f4c87de8d9040db3197356bca0bf9bae4 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Wed, 28 Aug 2013 16:58:25 -0400 Subject: [PATCH] Backed out changeset b3bea36ce719 (bug 901607) for mochitest-mc orange. CLOSED TREE --- browser/metro/base/content/browser.js | 6 ++---- browser/metro/base/content/contenthandlers/Content.js | 9 --------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/browser/metro/base/content/browser.js b/browser/metro/base/content/browser.js index 8d8977d0f669..7730de3a6676 100644 --- a/browser/metro/base/content/browser.js +++ b/browser/metro/base/content/browser.js @@ -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"); diff --git a/browser/metro/base/content/contenthandlers/Content.js b/browser/metro/base/content/contenthandlers/Content.js index f8a05f44db21..cc5051c050ff 100644 --- a/browser/metro/base/content/contenthandlers/Content.js +++ b/browser/metro/base/content/contenthandlers/Content.js @@ -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; },