Backed out changeset a372a90a9475 (bug 1119126) for gaia-js-integrati…

…on-8 failures
mozilla-spidermonkey · Feb 9, 2015 · 9977133 · 9977133
1 parent 5c39c8b
commit 9977133
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 15 deletions.
diff --git a/dom/browser-element/BrowserElementChildPreload.js b/dom/browser-element/BrowserElementChildPreload.js
@@ -638,8 +638,6 @@ BrowserElementChild.prototype = {
     // We clear selectionStateChangedTarget if selection carets are invisible.
     if (e.visible && !isCollapsed) {
       this._selectionStateChangedTarget = e.target;
-    } else if (canPaste && isCollapsed) {
-      this._selectionStateChangedTarget = e.target;
     } else {
       this._selectionStateChangedTarget = null;
     }
@@ -1146,7 +1144,6 @@ BrowserElementChild.prototype = {
 
   _recvDoCommand: function(data) {
     if (this._isCommandEnabled(data.json.command)) {
-      this._selectionStateChangedTarget = null;
       docShell.doCommand(COMMAND_MAP[data.json.command]);
     }
   },

diff --git a/layout/base/SelectionCarets.cpp b/layout/base/SelectionCarets.cpp
@@ -1220,12 +1220,6 @@ SelectionCarets::ScrollPositionChanged()
                                            SelectionState::Updateposition);
       }
     }
-  } else {
-    nsRefPtr<dom::Selection> selection = GetSelection();
-    if (selection && selection->RangeCount() && selection->IsCollapsed()) {
-      DispatchSelectionStateChangedEvent(selection,
-                                         SelectionState::Updateposition);
-    }
   }
 }
 
@@ -1323,12 +1317,6 @@ SelectionCarets::Reflow(DOMHighResTimeStamp aStart, DOMHighResTimeStamp aEnd)
       DispatchSelectionStateChangedEvent(GetSelection(),
                                          SelectionState::Updateposition);
     }
-  } else {
-    nsRefPtr<dom::Selection> selection = GetSelection();
-    if (selection && selection->RangeCount() && selection->IsCollapsed()) {
-      DispatchSelectionStateChangedEvent(selection,
-                                         SelectionState::Updateposition);
-    }
   }
   return NS_OK;
 }