From 2988515b8d9406336be8d14a04ce5d629eda13b6 Mon Sep 17 00:00:00 2001
From: David Zbarsky <dzbarsky@gmail.com>
Date: Thu, 18 Apr 2013 21:06:57 -0400
Subject: [PATCH] Bug 836176 Part 1.5: Fix nsIDocument::AsHTMLDocument() r=bz

---
 content/base/public/nsIDocument.h          | 2 +-
 content/base/src/nsDocument.cpp            | 6 ------
 content/html/document/src/nsHTMLDocument.h | 2 ++
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/content/base/public/nsIDocument.h b/content/base/public/nsIDocument.h
index 403b91ffc183..e18a2e95ec8b 100644
--- a/content/base/public/nsIDocument.h
+++ b/content/base/public/nsIDocument.h
@@ -2103,7 +2103,7 @@ public:
   already_AddRefed<nsIDOMTouchList>
     CreateTouchList(const mozilla::dom::Sequence<nsRefPtr<nsIDOMTouch> >& aTouches);
 
-  nsHTMLDocument* AsHTMLDocument();
+  virtual nsHTMLDocument* AsHTMLDocument() { return nullptr; }
 
 private:
   uint64_t mWarnedAbout;
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index f0e2f999e31d..664e865172f3 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -1906,12 +1906,6 @@ nsDocument::Init()
   return NS_OK;
 }
 
-nsHTMLDocument*
-nsIDocument::AsHTMLDocument()
-{
-  return IsHTML() ? static_cast<nsHTMLDocument*>(this) : nullptr;
-}
-
 void
 nsIDocument::DeleteAllProperties()
 {
diff --git a/content/html/document/src/nsHTMLDocument.h b/content/html/document/src/nsHTMLDocument.h
index 6a8649d9e662..b5bd18764545 100644
--- a/content/html/document/src/nsHTMLDocument.h
+++ b/content/html/document/src/nsHTMLDocument.h
@@ -255,6 +255,8 @@ public:
     return nsIDocument::GetLocation();
   }
 
+  virtual nsHTMLDocument* AsHTMLDocument() { return this; }
+
 protected:
   nsresult GetBodySize(int32_t* aWidth,
                        int32_t* aHeight);