      // click
      case NS_MOUSE_CLICK: {
        nsCOMPtr<nsIDOMMouseEvent> mouseEvent = do_QueryInterface(aEvent);
-       NS_ENSURE_TRUE(mouseEvent, NS_OK);
-       // If the preceding mousedown event or mouseup event was consumed,
-       // editor shouldn't handle this click event.
-       if (mMouseDownOrUpConsumedByIME) {
-         mMouseDownOrUpConsumedByIME = false;
-diff --git a/editor/libeditor/nsEditorEventListener.h b/editor/libeditor/nsEditorEventListener.h
---- a/editor/libeditor/nsEditorEventListener.h
-+++ b/editor/libeditor/nsEditorEventListener.h
-@@ -58,16 +58,17 @@ protected:
-   nsresult KeyUp(nsIDOMKeyEvent* aKeyEvent);
- #endif
-   nsresult KeyPress(nsIDOMKeyEvent* aKeyEvent);
-   nsresult HandleText(nsIDOMEvent* aTextEvent);
-   nsresult HandleStartComposition(nsIDOMEvent* aCompositionEvent);
+diff -r fec90cbfbaad editor/libeditor/nsEditorEventListener.h
+--- a/editor/libeditor/nsEditorEventListener.h	Thu Apr 09 22:57:56 2015 -0400
++++ b/editor/libeditor/nsEditorEventListener.h	Thu Jan 28 19:20:47 2016 +0100
+@@ -63,6 +63,7 @@
    void HandleEndComposition(nsIDOMEvent* aCompositionEvent);
    virtual nsresult MouseDown(nsIDOMMouseEvent* aMouseEvent);
    virtual nsresult MouseUp(nsIDOMMouseEvent* aMouseEvent) { return NS_OK; }

 
       if (!startContent) {
         // otherwise, just use the root content as the starting point
         startContent = rootContent;
         NS_ENSURE_TRUE(startContent, NS_OK);
       }
     }

                               bool *_retval)
 {
   NS_PRECONDITION(aError && aSourceText && aErrorText, "Check arguments!!!");
@@ -1373,7 +1375,15 @@
                                    MOZ_UTF16("href=\"chrome://global/locale/intl.css\" type=\"text/css\""));
   NS_ENSURE_SUCCESS(rv, rv);
 
