Merge inbound to central, a=merge

2016-08-12 13:44:29 -07:00
parent fb066b6566 335b0e62f6
commit b9d5a32ad5
456 changed files with 5349 additions and 3566 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -9502,7 +9502,7 @@ public:
  {
  }

-  NS_IMETHODIMP
+  NS_IMETHOD
  OnComplete(nsIURI* aFaviconURI, uint32_t aDataLen,
             const uint8_t* aData, const nsACString& aMimeType) override
  {