Bug 560830 - Handle DOMMouseScroll events in highlighter panels, r+a=gavin
authorJulian Viereck <jviereck@mozilla.com>
Mon, 09 Aug 2010 16:02:20 -0300
changeset 49230 814a9de8b245f3318e79cc9e7b76b9cd674a56d5
parent 49229 cfc0accaf8b230976b87e4c0dd75fc1b074af79b
child 49231 aff7615b9d2c601979f1e23c940a336218874aca
push id14953
push userrcampbell@mozilla.com
push dateMon, 09 Aug 2010 19:02:49 +0000
treeherderautoland@aff7615b9d2c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs560830
milestone2.0b4pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 560830 - Handle DOMMouseScroll events in highlighter panels, r+a=gavin
browser/base/content/browser.xul
browser/base/content/inspector.js
browser/base/content/test/Makefile.in
browser/base/content/test/browser_inspector_scrolling.js
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -217,17 +217,18 @@
     </panel>
 
     <panel id="highlighter-panel"
            hidden="true"
            ignorekeys="true"
            noautofocus="true"
            noautohide="true"
            onclick="InspectorUI.stopInspecting();"
-           onmousemove="InspectorUI.highlighter.handleMouseMove(event);"/>
+           onmousemove="InspectorUI.highlighter.handleMouseMove(event);"
+           onMozMousePixelScroll="InspectorUI.highlighter.handlePixelScroll(event);"/>
 
     <panel id="inspector-panel"
            orient="vertical"
            hidden="true"
            ignorekeys="true"
            noautofocus="true"
            noautohide="true"
            level="top"
--- a/browser/base/content/inspector.js
+++ b/browser/base/content/inspector.js
@@ -19,16 +19,17 @@
  * The Initial Developer of the Original Code is
  * The Mozilla Foundation.
  * Portions created by the Initial Developer are Copyright (C) 2010
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
  *   Rob Campbell <rcampbell@mozilla.com> (original author)
  *   Mihai Șucan <mihai.sucan@gmail.com>
+ *   Julian Viereck <jviereck@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
  * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
@@ -315,16 +316,39 @@ PanelHighlighter.prototype = {
     }
     let browserRect = this.browser.getBoundingClientRect();
     let element = InspectorUI.elementFromPoint(this.win.document,
       aEvent.clientX - browserRect.left, aEvent.clientY - browserRect.top);
     if (element && element != this.node) {
       InspectorUI.inspectNode(element);
     }
   },
+
+  /**
+   * Handle MozMousePixelScroll in panel when InspectorUI.inspecting is true.
+   *
+   * @param aEvent
+   *        The onMozMousePixelScrollEvent triggering the method.
+   * @returns void
+   */
+  handlePixelScroll: function PanelHighlighter_handlePixelScroll(aEvent) {
+    if (!InspectorUI.inspecting) {
+      return;
+    }
+    let browserRect = this.browser.getBoundingClientRect();
+    let element = InspectorUI.elementFromPoint(this.win.document,
+      aEvent.clientX - browserRect.left, aEvent.clientY - browserRect.top);
+    let win = element.ownerDocument.defaultView;
+
+    if (aEvent.axis == aEvent.HORIZONTAL_AXIS) {
+      win.scrollBy(aEvent.detail, 0);
+    } else {
+      win.scrollBy(0, aEvent.detail);
+    }
+  }
 };
 
 ///////////////////////////////////////////////////////////////////////////
 //// InspectorTreeView
 
 /**
  * TreeView object to manage the view of the DOM tree. Wraps and provides an
  * interface to an inIDOMView object
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -146,16 +146,17 @@ endif
                  browser_drag.js \
                  browser_gestureSupport.js \
                  browser_getshortcutoruri.js \
                  browser_inspector_initialization.js \
                  browser_inspector_treeSelection.js \
                  browser_inspector_highlighter.js \
                  browser_inspector_stylePanel.js \
                  browser_inspector_iframeTest.js \
+                 browser_inspector_scrolling.js \
                  browser_pageInfo.js \
                  browser_page_style_menu.js \
                  browser_pinnedTabs.js \
                  browser_plainTextLinks.js \
                  browser_pluginnotification.js \
                  browser_popupUI.js \
                  browser_relatedTabs.js \
                  browser_sanitize-passwordDisabledHosts.js \
new file mode 100644
--- /dev/null
+++ b/browser/base/content/test/browser_inspector_scrolling.js
@@ -0,0 +1,113 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Inspector iframe Tests.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Rob Campbell <rcampbell@mozilla.com>
+ *   Mihai Șucan <mihai.sucan@gmail.com>
+ *   Julian Viereck <jviereck@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+let doc;
+let div;
+let iframe;
+
+function createDocument()
+{
+  doc.title = "Inspector scrolling Tests";
+
+  iframe = doc.createElement("iframe");
+
+  iframe.addEventListener("load", function () {
+    iframe.removeEventListener("load", arguments.callee, false);
+
+    div = iframe.contentDocument.createElement("div");
+    div.textContent = "big div";
+    div.setAttribute("style", "height:500px; width:500px; border:1px solid gray;");
+    iframe.contentDocument.body.appendChild(div);
+    toggleInspector();
+  }, false);
+
+  iframe.src = "data:text/html,foo bar";
+  doc.body.appendChild(iframe);
+}
+
+function toggleInspector()
+{
+  document.addEventListener("popupshown", inspectNode, false);
+  InspectorUI.toggleInspectorUI();
+}
+
+function inspectNode(aEvent)
+{
+  if (aEvent.target.id != "inspector-panel") {
+    return true;
+  }
+
+  document.removeEventListener("popupshown", inspectNode, false);
+  document.addEventListener("popupshown", performScrollingTest, false);
+
+  InspectorUI.inspectNode(div)
+}
+
+function performScrollingTest(aEvent)
+{
+  if (aEvent.target.id != "highlighter-panel") {
+    return true;
+  }
+
+  document.removeEventListener("popupshown", performScrollingTest, false);
+
+  EventUtils.synthesizeMouseScroll(aEvent.target, 10, 10,
+    {axis:"vertical", delta:50, type:"MozMousePixelScroll"}, window);
+
+  is(iframe.contentDocument.body.scrollTop, 50, "inspected iframe scrolled");
+
+  InspectorUI.closeInspectorUI();
+  gBrowser.removeCurrentTab();
+  finish();
+}
+
+function test()
+{
+  waitForExplicitFinish();
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+    doc = content.document;
+    waitForFocus(createDocument, content);
+  }, true);
+
+  content.location = "data:text/html,mouse scrolling test for inspector";
+}