    return nsEditorEventListener::MouseDown(aMouseEvent);
  }
  
- nsresult
- nsHTMLEditorEventListener::MouseClick(nsIDOMMouseEvent* aMouseEvent)
- {
-   nsCOMPtr<nsIDOMEventTarget> target;
-   nsresult rv = aMouseEvent->GetTarget(getter_AddRefs(target));
-diff --git a/editor/libeditor/nsHTMLEditorEventListener.h b/editor/libeditor/nsHTMLEditorEventListener.h
---- a/editor/libeditor/nsHTMLEditorEventListener.h
-+++ b/editor/libeditor/nsHTMLEditorEventListener.h
-@@ -29,14 +29,15 @@ public:
-   // WARNING: You must be use nsHTMLEditor or its sub class for this class.
-   virtual nsresult Connect(nsEditor* aEditor) override;
- #endif
- 
- protected:
+diff -r fec90cbfbaad editor/libeditor/nsHTMLEditorEventListener.h
+--- a/editor/libeditor/nsHTMLEditorEventListener.h	Thu Apr 09 22:57:56 2015 -0400
++++ b/editor/libeditor/nsHTMLEditorEventListener.h	Thu Jan 28 19:20:47 2016 +0100
+@@ -34,6 +34,7 @@
    virtual nsresult MouseDown(nsIDOMMouseEvent* aMouseEvent) override;
    virtual nsresult MouseUp(nsIDOMMouseEvent* aMouseEvent) override;
    virtual nsresult MouseClick(nsIDOMMouseEvent* aMouseEvent) override;

         if (aFlags & nsIScriptSecurityManager::ALLOW_CHROME) {
 
             // For now, don't change behavior for resource:// or moz-icon:// and
             // just allow them.
             if (!targetScheme.EqualsLiteral("chrome")) {
                 return NS_OK;
             }
 
@@ -800,16 +801,17 @@ nsScriptSecurityManager::CheckLoadURIWit
     }
 
     // Check for target URI pointing to a file
     rv = NS_URIChainHasFlags(targetBaseURI,
                              nsIProtocolHandler::URI_IS_LOCAL_FILE,
                              &hasFlags);
     NS_ENSURE_SUCCESS(rv, rv);
     if (hasFlags) {

   nsAutoString outStateString;
   switch (firstAlign)
   {
@@ -967,7 +1001,14 @@
   nsCOMPtr<nsIHTMLEditor> htmlEditor = do_QueryInterface(aEditor);
   NS_ENSURE_TRUE(htmlEditor, NS_ERROR_FAILURE);
 
