Backout changeset 83b6f03bb285 (bug 674770) because mochitest-3 orange on Windows
authorEhsan Akhgari <ehsan@mozilla.com>
Mon, 15 Aug 2011 22:30:23 -0400
changeset 75351 0220740e0bea2a14429e37355a4c2e7080c6e3ae
parent 75350 36b6ae568a9878a8c925e4e33855fe485d0e06cf
child 75352 2e887d0eb40aa4f1ca04f1ed9a42c684471f93ed
push id2
push userbsmedberg@mozilla.com
push dateFri, 19 Aug 2011 14:38:13 +0000
bugs674770
milestone8.0a1
backs out83b6f03bb285260bc9a0e07b8973c51386c9f99c
Backout changeset 83b6f03bb285 (bug 674770) because mochitest-3 orange on Windows
editor/libeditor/base/nsEditorEventListener.cpp
editor/libeditor/html/tests/Makefile.in
editor/libeditor/html/tests/file_bug674770.html
editor/libeditor/html/tests/test_bug674770.html
--- a/editor/libeditor/base/nsEditorEventListener.cpp
+++ b/editor/libeditor/base/nsEditorEventListener.cpp
@@ -384,26 +384,16 @@ nsEditorEventListener::MouseClick(nsIDOM
   nsCOMPtr<nsIDOMNSEvent> nsevent = do_QueryInterface(aMouseEvent);
   PRBool isTrusted = PR_FALSE;
   if (!mouseEvent || !nsevent ||
       NS_FAILED(nsevent->GetIsTrusted(&isTrusted)) || !isTrusted) {
     // Non-ui or non-trusted event passed in. Bad things.
     return NS_OK;
   }
 
-  nsCOMPtr<nsIDOMEventTarget> target;
-  aMouseEvent->GetTarget(getter_AddRefs(target));
-  nsCOMPtr<nsIDOMNode> node = do_QueryInterface(target);
-  NS_ENSURE_TRUE(node, NS_ERROR_FAILURE);
-
-  if (!mEditor->IsModifiableNode(node)) {
-    // We shouldn't handle the event for non-editable content.
-    return NS_OK;
-  }
-
   nsresult rv;
   nsCOMPtr<nsIDOMNSUIEvent> nsuiEvent = do_QueryInterface(aMouseEvent);
   NS_ENSURE_TRUE(nsuiEvent, NS_ERROR_NULL_POINTER);
 
   PRBool preventDefault;
   rv = nsuiEvent->GetPreventDefault(&preventDefault);
   if (NS_FAILED(rv) || preventDefault)
   {
--- a/editor/libeditor/html/tests/Makefile.in
+++ b/editor/libeditor/html/tests/Makefile.in
@@ -79,18 +79,16 @@ include $(topsrcdir)/config/rules.mk
 		test_bug607584.html \
 		test_bug611182.html \
 		test_bug612447.html \
 		test_bug620906.html \
 		test_bug622371.html \
 		test_bug629845.html \
 		test_bug640321.html \
 		test_bug668599.html \
-		test_bug674770.html \
-		file_bug674770.html \
 		test_bug674861.html \
 		test_CF_HTML_clipboard.html \
 		test_contenteditable_focus.html \
 		test_htmleditor_keyevent_handling.html \
 		test_select_all_without_body.html \
 		file_select_all_without_body.html \
 		test_root_element_replacement.html \
 		$(NULL)
deleted file mode 100644
--- a/editor/libeditor/html/tests/file_bug674770.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE>
-<script>
-  localStorage["clicked"] = "true";
-  close();
-</script>
deleted file mode 100644
--- a/editor/libeditor/html/tests/test_bug674770.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=674770
--->
-<head>
-  <title>Test for Bug 674770</title>
-  <script type="application/javascript" src="/MochiKit/packed.js"></script>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=674770">Mozilla Bug 674770</a>
-<p id="display"></p>
-<div id="content">
-<a href="file_bug674770.html" id="link1">test</a>
-<div contenteditable>
-<a href="file_bug674770.html" id="link2">test</a>
-</div>
-</div>
-<pre id="test">
-<script type="application/javascript">
-
-/** Test for Bug 674770 **/
-SimpleTest.waitForExplicitFinish();
-SimpleTest.waitForFocus(function() {
-  SpecialPowers.setBoolPref("middlemouse.paste", true);
-  localStorage.removeItem("clicked");
-  window.linkWasClicked = false;
-
-  var link = document.querySelector("#link1");
-  addEventListener("storage", function(e) {
-    is(e.key, "clicked", "Correct event");
-    is(e.newValue, "true", "Correct value");
-    window.linkWasClicked = true;
-  }, false);
-  synthesizeMouseAtCenter(link, {button: 1});
-
-  hitEventLoop(function() {
-    ok(window.linkWasClicked, "The click operation worked successfully");
-    window.linkWasClicked = false;
-
-    link = document.querySelector("#link2");
-    localStorage.removeItem("clicked");
-    synthesizeMouseAtCenter(link, {button: 1});
-
-    hitEventLoop(function() {
-      ok(!window.linkWasClicked, "The click operation shouldn't work in the contenteditable area");
-
-      localStorage.removeItem("clicked");
-      SpecialPowers.clearUserPref("middlemouse.paste");
-      SimpleTest.finish();
-    }, 100);
-  }, 100);
-});
-
-function hitEventLoop(func, times) {
-  if (times > 0) {
-    setTimeout(hitEventLoop, 0, func, times - 1);
-  } else {
-    setTimeout(func, 0);
-  }
-}
-
-</script>
-</pre>
-</body>
-</html>