diff --git a/dom/browser-element/BrowserElementChild.js b/dom/browser-element/BrowserElementChild.js index 5abf58eed48a..c7f30dc58c84 100644 --- a/dom/browser-element/BrowserElementChild.js +++ b/dom/browser-element/BrowserElementChild.js @@ -21,7 +21,7 @@ let whitelistedEvents = [ ]; function debug(msg) { - dump("BrowserElementChild - " + msg + "\n"); + //dump("BrowserElementChild - " + msg + "\n"); } function sendAsyncMsg(msg, data) { diff --git a/dom/browser-element/BrowserElementScrolling.js b/dom/browser-element/BrowserElementScrolling.js index 72c4d0bc743d..0788d4694805 100644 --- a/dom/browser-element/BrowserElementScrolling.js +++ b/dom/browser-element/BrowserElementScrolling.js @@ -112,13 +112,6 @@ const ContentPanning = { }, getPannable: function cp_getPannable(node) { -debug('getPannable'); -let scrollable = docShell.QueryInterface(Ci.nsIScrollable); - -let canHaveHorizontal = {}; -let canHaveVertical = {}; -scrollable.getScrollbarVisibility(canHaveHorizontal, canHaveVertical); -debug('horizontal: ' + canHaveHorizontal.value + ' vertical: ' + canHaveVertical.value); if (!(node instanceof Ci.nsIDOMHTMLElement) || node.tagName == 'HTML') return [null, null]; @@ -136,10 +129,8 @@ debug('horizontal: ' + canHaveHorizontal.value + ' vertical: ' + canHaveVertical rect.width < node.scrollWidth)); let isScroll = (overflow.indexOf('scroll') != -1); - if (isScroll || isAuto) { - debug(node); + if (isScroll || isAuto) return [node, this._generateCallback(node)]; - } node = node.parentNode; }