Backed out changesets 5a1ff68f37d9 and eed8b79a4803 (bug 685470) for mochitest-other timeouts.
authorRyan VanderMeulen <ryanvm@gmail.com>
Wed, 05 Dec 2012 21:29:01 -0500
changeset 115152 7ad2846f3ece3174e9ceb7678a8d4055d58012b7
parent 115151 c7d448fde422b0034e7625ce59926bb25afc7145
child 115153 3399897304da595848f9626d32cc9f14982d4038
push id23973
push useremorley@mozilla.com
push dateThu, 06 Dec 2012 10:04:18 +0000
treeherdermozilla-central@ddda5400c826 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs685470
milestone20.0a1
backs out5a1ff68f37d983f75e9b213fca17fd78d55fc7d8
eed8b79a4803cbd745df0088f599f2a24f62a24e
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
Backed out changesets 5a1ff68f37d9 and eed8b79a4803 (bug 685470) for mochitest-other timeouts.
layout/xul/base/src/nsXULTooltipListener.cpp
layout/xul/test/Makefile.in
layout/xul/test/browser_bug685470.js
--- a/layout/xul/base/src/nsXULTooltipListener.cpp
+++ b/layout/xul/base/src/nsXULTooltipListener.cpp
@@ -234,20 +234,16 @@ nsXULTooltipListener::HandleEvent(nsIDOM
   nsAutoString type;
   aEvent->GetType(type);
   if (type.EqualsLiteral("DOMMouseScroll") ||
       type.EqualsLiteral("keydown") ||
       type.EqualsLiteral("mousedown") ||
       type.EqualsLiteral("mouseup") ||
       type.EqualsLiteral("dragstart")) {
     HideTooltip();
-#ifdef MOZ_XUL
-    if (!mIsSourceTree)
-      mTooltipShownOnce = true;
-#endif
     return NS_OK;
   }
 
   if (type.EqualsLiteral("popuphiding")) {
     DestroyTooltip();
     return NS_OK;
   }
 
@@ -302,36 +298,30 @@ nsXULTooltipListener::AddTooltipSupport(
 {
   if (!aNode)
     return NS_ERROR_NULL_POINTER;
 
   aNode->AddSystemEventListener(NS_LITERAL_STRING("mouseout"), this,
                                 false, false);
   aNode->AddSystemEventListener(NS_LITERAL_STRING("mousemove"), this,
                                 false, false);
-  aNode->AddSystemEventListener(NS_LITERAL_STRING("mousedown"), this,
-                                false, false);
-  aNode->AddSystemEventListener(NS_LITERAL_STRING("mouseup"), this,
-                                false, false);
   aNode->AddSystemEventListener(NS_LITERAL_STRING("dragstart"), this,
                                 true, false);
 
   return NS_OK;
 }
 
 nsresult
 nsXULTooltipListener::RemoveTooltipSupport(nsIContent* aNode)
 {
   if (!aNode)
     return NS_ERROR_NULL_POINTER;
 
   aNode->RemoveSystemEventListener(NS_LITERAL_STRING("mouseout"), this, false);
   aNode->RemoveSystemEventListener(NS_LITERAL_STRING("mousemove"), this, false);
-  aNode->RemoveSystemEventListener(NS_LITERAL_STRING("mousedown"), this, false);
-  aNode->RemoveSystemEventListener(NS_LITERAL_STRING("mouseup"), this, false);
   aNode->RemoveSystemEventListener(NS_LITERAL_STRING("dragstart"), this, true);
 
   return NS_OK;
 }
 
 #ifdef MOZ_XUL
 void
 nsXULTooltipListener::CheckTreeBodyMove(nsIDOMMouseEvent* aMouseEvent)
--- a/layout/xul/test/Makefile.in
+++ b/layout/xul/test/Makefile.in
@@ -21,14 +21,13 @@ MOCHITEST_CHROME_FILES = \
 		test_bug159346.xul \
 		test_bug372685.xul \
 		test_bug398982-1.xul \
 		test_bug398982-2.xul \
 		test_bug703150.xul \
 		$(NULL)
 
 MOCHITEST_BROWSER_FILES = \
-		browser_bug685470.js \
 		browser_bug703210.js \
 		browser_bug706743.js \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/layout/xul/test/browser_bug685470.js
+++ /dev/null
@@ -1,56 +0,0 @@
-function test() {
-  waitForExplicitFinish();
-
-  gBrowser.selectedTab = gBrowser.addTab();
-
-  SpecialPowers.setIntPref("ui.tooltipDelay", 0);
-
-  var popup = false;
-  var doc;
-  var win;
-  var p1;
-
-  let onPopupShown = function(aEvent) {
-    popup = true;
-  }
-
-  // test that a mouse click prior to the tooltip appearing blocks it and
-  // mouse movement without leaving the target doesn't show it
-  let runTest = function() {
-    var rc = p1.getBoundingClientRect();
-
-    EventUtils.synthesizeMouseAtCenter(p1, { type: "mousemove" }, win);
-    EventUtils.sendMouseEvent({type:'mousedown'}, p1, win);
-    EventUtils.sendMouseEvent({type:'mouseup'}, p1, win);
-    EventUtils.synthesizeMouse(p1, rc.left, rc.top, { type: "mousemove" }, win);
-
-    setTimeout(function() {
-      is(popup, false, "shouldn't get tooltip after click and mouse move " +
-                       "within target");
-
-      document.removeEventListener("popupshown", onPopupShown, true);
-      SpecialPowers.clearUserPref("ui.tooltipDelay");
-
-      gBrowser.removeCurrentTab();
-      finish();
-    }, 200);
-  }
-
-  let onLoad = function (aEvent) {
-    doc = gBrowser.contentDocument;
-    win = gBrowser.contentWindow;
-    p1 = doc.getElementById("p1");
-
-    document.addEventListener("popupshown", onPopupShown, true);
-
-    runTest();
-  }
-
-  gBrowser.selectedBrowser.addEventListener("load", function loadListener() {
-    gBrowser.selectedBrowser.removeEventListener("load", loadListener, true);
-    setTimeout(onLoad, 0);
-  }, true);
-
-  content.location = "data:text/html," +
-    "<p id=\"p1\" title=\"tooltip is here\">This paragraph has a tooltip.</p>";
-}