Bug 824823 part 1. Rename nsHTMLAnchorElement to mozilla::dom::HTMLAnchorElement. r=peterv
authorBoris Zbarsky <bzbarsky@mit.edu>
Fri, 04 Jan 2013 12:02:13 -0500
changeset 126727 ce3ac746bfca1bd3d018d4a2e1346185d706a86a
parent 126726 85b25729546921285cf6b71e07ba920b5cd13829
child 126728 3a73a1fa423b415204a325624a9228cd923b0561
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspeterv
bugs824823
milestone20.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 824823 part 1. Rename nsHTMLAnchorElement to mozilla::dom::HTMLAnchorElement. r=peterv
content/html/content/src/HTMLAnchorElement.cpp
content/html/content/src/HTMLAnchorElement.h
content/html/content/src/Makefile.in
content/html/content/src/nsHTMLAnchorElement.cpp
rename from content/html/content/src/nsHTMLAnchorElement.cpp
rename to content/html/content/src/HTMLAnchorElement.cpp
--- a/content/html/content/src/nsHTMLAnchorElement.cpp
+++ b/content/html/content/src/HTMLAnchorElement.cpp
@@ -1,111 +1,29 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim:set tw=80 expandtab softtabstop=2 ts=2 sw=2: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "nsGenericHTMLElement.h"
-#include "nsIDOMHTMLAnchorElement.h"
-#include "nsILink.h"
-#include "Link.h"
+#include "mozilla/dom/HTMLAnchorElement.h"
 
 #include "nsCOMPtr.h"
 #include "nsContentUtils.h"
 #include "nsGkAtoms.h"
 #include "nsIPresShell.h"
 #include "nsIDocument.h"
 #include "nsPresContext.h"
 #include "nsHTMLDNSPrefetch.h"
 
-using namespace mozilla::dom;
-
-class nsHTMLAnchorElement : public nsGenericHTMLElement,
-                            public nsIDOMHTMLAnchorElement,
-                            public nsILink,
-                            public Link
-{
-public:
-  using Element::GetText;
-  using Element::SetText;
-
-  nsHTMLAnchorElement(already_AddRefed<nsINodeInfo> aNodeInfo);
-  virtual ~nsHTMLAnchorElement();
-
-  // nsISupports
-  NS_DECL_ISUPPORTS_INHERITED
-
-  // nsIDOMNode
-  NS_FORWARD_NSIDOMNODE_TO_NSINODE
-
-  // nsIDOMElement
-  NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
-
-  // nsIDOMHTMLElement
-  NS_FORWARD_NSIDOMHTMLELEMENT_TO_GENERIC
-
-  virtual int32_t TabIndexDefault() MOZ_OVERRIDE;
-  virtual bool Draggable() const MOZ_OVERRIDE;
-
-  // nsIDOMHTMLAnchorElement
-  NS_DECL_NSIDOMHTMLANCHORELEMENT
-
-  // DOM memory reporter participant
-  NS_DECL_SIZEOF_EXCLUDING_THIS
-
-  // nsILink
-  NS_IMETHOD LinkAdded() { return NS_OK; }
-  NS_IMETHOD LinkRemoved() { return NS_OK; }
+NS_IMPL_NS_NEW_HTML_ELEMENT(Anchor)
+DOMCI_NODE_DATA(HTMLAnchorElement, mozilla::dom::HTMLAnchorElement)
 
-  virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
-                              nsIContent* aBindingParent,
-                              bool aCompileEventHandlers);
-  virtual void UnbindFromTree(bool aDeep = true,
-                              bool aNullParent = true);
-  virtual bool IsHTMLFocusable(bool aWithMouse, bool *aIsFocusable, int32_t *aTabIndex);
-
-  virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
-  virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor);
-  virtual bool IsLink(nsIURI** aURI) const;
-  virtual void GetLinkTarget(nsAString& aTarget);
-  virtual nsLinkState GetLinkState() const;
-  virtual already_AddRefed<nsIURI> GetHrefURI() const;
-
-  nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
-                   const nsAString& aValue, bool aNotify)
-  {
-    return SetAttr(aNameSpaceID, aName, nullptr, aValue, aNotify);
-  }
-  virtual nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
-                           nsIAtom* aPrefix, const nsAString& aValue,
-                           bool aNotify);
-  virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
-                             bool aNotify);
-  virtual bool ParseAttribute(int32_t aNamespaceID,
-                                nsIAtom* aAttribute,
-                                const nsAString& aValue,
-                                nsAttrValue& aResult);
-
-  virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
-
-  virtual nsEventStates IntrinsicState() const;
-
-  virtual nsXPCClassInfo* GetClassInfo();
-
-  virtual nsIDOMNode* AsDOMNode() { return this; }
-
-  virtual void OnDNSPrefetchDeferred();
-  virtual void OnDNSPrefetchRequested();
-  virtual bool HasDeferredDNSPrefetchRequest();
-
-protected:
-  virtual void GetItemValueText(nsAString& text);
-  virtual void SetItemValueText(const nsAString& text);
-};
+namespace mozilla {
+namespace dom {
 
 #define ANCHOR_ELEMENT_FLAG_BIT(n_) NODE_FLAG_BIT(ELEMENT_TYPE_SPECIFIC_BITS_OFFSET + (n_))
 
 // Anchor element specific bits
 enum {
   // Indicates that a DNS Prefetch has been requested from this Anchor elem
   HTML_ANCHOR_DNS_PREFETCH_REQUESTED =    ANCHOR_ELEMENT_FLAG_BIT(0),
 
@@ -113,116 +31,104 @@ enum {
   HTML_ANCHOR_DNS_PREFETCH_DEFERRED =     ANCHOR_ELEMENT_FLAG_BIT(1)
 };
 
 // Make sure we have enough space for those bits
 PR_STATIC_ASSERT(ELEMENT_TYPE_SPECIFIC_BITS_OFFSET + 1 < 32);
 
 #undef ANCHOR_ELEMENT_FLAG_BIT
 
-NS_IMPL_NS_NEW_HTML_ELEMENT(Anchor)
-
-nsHTMLAnchorElement::nsHTMLAnchorElement(already_AddRefed<nsINodeInfo> aNodeInfo)
-  : nsGenericHTMLElement(aNodeInfo)
-  , Link(this)
-{
-}
-
-nsHTMLAnchorElement::~nsHTMLAnchorElement()
+HTMLAnchorElement::~HTMLAnchorElement()
 {
 }
 
-
-NS_IMPL_ADDREF_INHERITED(nsHTMLAnchorElement, Element)
-NS_IMPL_RELEASE_INHERITED(nsHTMLAnchorElement, Element)
-
+NS_IMPL_ADDREF_INHERITED(HTMLAnchorElement, Element)
+NS_IMPL_RELEASE_INHERITED(HTMLAnchorElement, Element)
 
-DOMCI_NODE_DATA(HTMLAnchorElement, nsHTMLAnchorElement)
-
-// QueryInterface implementation for nsHTMLAnchorElement
-NS_INTERFACE_TABLE_HEAD(nsHTMLAnchorElement)
-  NS_HTML_CONTENT_INTERFACE_TABLE3(nsHTMLAnchorElement,
+// QueryInterface implementation for HTMLAnchorElement
+NS_INTERFACE_TABLE_HEAD(HTMLAnchorElement)
+  NS_HTML_CONTENT_INTERFACE_TABLE3(HTMLAnchorElement,
                                    nsIDOMHTMLAnchorElement,
                                    nsILink,
                                    Link)
-  NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(nsHTMLAnchorElement,
+  NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLAnchorElement,
                                                nsGenericHTMLElement)
 NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLAnchorElement)
 
 
-NS_IMPL_ELEMENT_CLONE(nsHTMLAnchorElement)
+NS_IMPL_ELEMENT_CLONE(HTMLAnchorElement)
 
 
-NS_IMPL_STRING_ATTR(nsHTMLAnchorElement, Charset, charset)
-NS_IMPL_STRING_ATTR(nsHTMLAnchorElement, Coords, coords)
-NS_IMPL_URI_ATTR(nsHTMLAnchorElement, Href, href)
-NS_IMPL_STRING_ATTR(nsHTMLAnchorElement, Hreflang, hreflang)
-NS_IMPL_STRING_ATTR(nsHTMLAnchorElement, Name, name)
-NS_IMPL_STRING_ATTR(nsHTMLAnchorElement, Rel, rel)
-NS_IMPL_STRING_ATTR(nsHTMLAnchorElement, Rev, rev)
-NS_IMPL_STRING_ATTR(nsHTMLAnchorElement, Shape, shape)
-NS_IMPL_STRING_ATTR(nsHTMLAnchorElement, Type, type)
-NS_IMPL_STRING_ATTR(nsHTMLAnchorElement, Download, download)
+NS_IMPL_STRING_ATTR(HTMLAnchorElement, Charset, charset)
+NS_IMPL_STRING_ATTR(HTMLAnchorElement, Coords, coords)
+NS_IMPL_URI_ATTR(HTMLAnchorElement, Href, href)
+NS_IMPL_STRING_ATTR(HTMLAnchorElement, Hreflang, hreflang)
+NS_IMPL_STRING_ATTR(HTMLAnchorElement, Name, name)
+NS_IMPL_STRING_ATTR(HTMLAnchorElement, Rel, rel)
+NS_IMPL_STRING_ATTR(HTMLAnchorElement, Rev, rev)
+NS_IMPL_STRING_ATTR(HTMLAnchorElement, Shape, shape)
+NS_IMPL_STRING_ATTR(HTMLAnchorElement, Type, type)
+NS_IMPL_STRING_ATTR(HTMLAnchorElement, Download, download)
 
 int32_t
-nsHTMLAnchorElement::TabIndexDefault()
+HTMLAnchorElement::TabIndexDefault()
 {
   return 0;
 }
 
 void
-nsHTMLAnchorElement::GetItemValueText(nsAString& aValue)
+HTMLAnchorElement::GetItemValueText(nsAString& aValue)
 {
   GetHref(aValue);
 }
 
 void
-nsHTMLAnchorElement::SetItemValueText(const nsAString& aValue)
+HTMLAnchorElement::SetItemValueText(const nsAString& aValue)
 {
   SetHref(aValue);
 }
 
 bool
-nsHTMLAnchorElement::Draggable() const
+HTMLAnchorElement::Draggable() const
 {
   // links can be dragged as long as there is an href and the
   // draggable attribute isn't false
   if (!HasAttr(kNameSpaceID_None, nsGkAtoms::href)) {
     // no href, so just use the same behavior as other elements
     return nsGenericHTMLElement::Draggable();
   }
 
   return !AttrValueIs(kNameSpaceID_None, nsGkAtoms::draggable,
                       nsGkAtoms::_false, eIgnoreCase);
 }
 
 void
-nsHTMLAnchorElement::OnDNSPrefetchRequested()
+HTMLAnchorElement::OnDNSPrefetchRequested()
 {
   UnsetFlags(HTML_ANCHOR_DNS_PREFETCH_DEFERRED);
   SetFlags(HTML_ANCHOR_DNS_PREFETCH_REQUESTED);
 }
 
 void
-nsHTMLAnchorElement::OnDNSPrefetchDeferred()
+HTMLAnchorElement::OnDNSPrefetchDeferred()
 {
   UnsetFlags(HTML_ANCHOR_DNS_PREFETCH_REQUESTED);
   SetFlags(HTML_ANCHOR_DNS_PREFETCH_DEFERRED);
 }
 
 bool
-nsHTMLAnchorElement::HasDeferredDNSPrefetchRequest()
+HTMLAnchorElement::HasDeferredDNSPrefetchRequest()
 {
   return HasFlag(HTML_ANCHOR_DNS_PREFETCH_DEFERRED);
 }
 
 nsresult
-nsHTMLAnchorElement::BindToTree(nsIDocument* aDocument, nsIContent* aParent,
-                                nsIContent* aBindingParent,
-                                bool aCompileEventHandlers)
+HTMLAnchorElement::BindToTree(nsIDocument* aDocument, nsIContent* aParent,
+                              nsIContent* aBindingParent,
+                              bool aCompileEventHandlers)
 {
   Link::ResetLinkState(false, Link::ElementHasHref());
 
   nsresult rv = nsGenericHTMLElement::BindToTree(aDocument, aParent,
                                                  aBindingParent,
                                                  aCompileEventHandlers);
   NS_ENSURE_SUCCESS(rv, rv);
 
@@ -233,17 +139,17 @@ nsHTMLAnchorElement::BindToTree(nsIDocum
       nsHTMLDNSPrefetch::PrefetchLow(this);
     }
   }
 
   return rv;
 }
 
 void
-nsHTMLAnchorElement::UnbindFromTree(bool aDeep, bool aNullParent)
+HTMLAnchorElement::UnbindFromTree(bool aDeep, bool aNullParent)
 {
   // Cancel any DNS prefetches
   // Note: Must come before ResetLinkState.  If called after, it will recreate
   // mCachedURI based on data that is invalid - due to a call to GetHostname.
 
   // If prefetch was deferred, clear flag and move on
   if (HasFlag(HTML_ANCHOR_DNS_PREFETCH_DEFERRED))
     UnsetFlags(HTML_ANCHOR_DNS_PREFETCH_DEFERRED);
@@ -263,18 +169,18 @@ nsHTMLAnchorElement::UnbindFromTree(bool
   if (doc) {
     doc->UnregisterPendingLinkUpdate(this);
   }
 
   nsGenericHTMLElement::UnbindFromTree(aDeep, aNullParent);
 }
 
 bool
-nsHTMLAnchorElement::IsHTMLFocusable(bool aWithMouse,
-                                     bool *aIsFocusable, int32_t *aTabIndex)
+HTMLAnchorElement::IsHTMLFocusable(bool aWithMouse,
+                                   bool *aIsFocusable, int32_t *aTabIndex)
 {
   if (nsGenericHTMLElement::IsHTMLFocusable(aWithMouse, aIsFocusable, aTabIndex)) {
     return true;
   }
 
   // cannot focus links if there is no link handler
   nsIDocument* doc = GetCurrentDoc();
   if (doc) {
@@ -318,132 +224,132 @@ nsHTMLAnchorElement::IsHTMLFocusable(boo
   }
 
   *aIsFocusable = true;
 
   return false;
 }
 
 nsresult
-nsHTMLAnchorElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor)
+HTMLAnchorElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor)
 {
   return PreHandleEventForAnchors(aVisitor);
 }
 
 nsresult
-nsHTMLAnchorElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
+HTMLAnchorElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
 {
   return PostHandleEventForAnchors(aVisitor);
 }
 
 bool
-nsHTMLAnchorElement::IsLink(nsIURI** aURI) const
+HTMLAnchorElement::IsLink(nsIURI** aURI) const
 {
   return IsHTMLLink(aURI);
 }
 
 void
-nsHTMLAnchorElement::GetLinkTarget(nsAString& aTarget)
+HTMLAnchorElement::GetLinkTarget(nsAString& aTarget)
 {
   GetAttr(kNameSpaceID_None, nsGkAtoms::target, aTarget);
   if (aTarget.IsEmpty()) {
     GetBaseTarget(aTarget);
   }
 }
 
 NS_IMETHODIMP
-nsHTMLAnchorElement::GetTarget(nsAString& aValue)
+HTMLAnchorElement::GetTarget(nsAString& aValue)
 {
   if (!GetAttr(kNameSpaceID_None, nsGkAtoms::target, aValue)) {
     GetBaseTarget(aValue);
   }
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsHTMLAnchorElement::SetTarget(const nsAString& aValue)
+HTMLAnchorElement::SetTarget(const nsAString& aValue)
 {
   return SetAttr(kNameSpaceID_None, nsGkAtoms::target, aValue, true);
 }
 
 #define IMPL_URI_PART(_part)                                 \
   NS_IMETHODIMP                                              \
-  nsHTMLAnchorElement::Get##_part(nsAString& a##_part)       \
+  HTMLAnchorElement::Get##_part(nsAString& a##_part)         \
   {                                                          \
     return Link::Get##_part(a##_part);                       \
   }                                                          \
   NS_IMETHODIMP                                              \
-  nsHTMLAnchorElement::Set##_part(const nsAString& a##_part) \
+  HTMLAnchorElement::Set##_part(const nsAString& a##_part)   \
   {                                                          \
     return Link::Set##_part(a##_part);                       \
   }
 
 IMPL_URI_PART(Protocol)
 IMPL_URI_PART(Host)
 IMPL_URI_PART(Hostname)
 IMPL_URI_PART(Pathname)
 IMPL_URI_PART(Search)
 IMPL_URI_PART(Port)
 IMPL_URI_PART(Hash)
 
 #undef IMPL_URI_PART
 
 NS_IMETHODIMP    
-nsHTMLAnchorElement::GetText(nsAString& aText)
+HTMLAnchorElement::GetText(nsAString& aText)
 {
   nsContentUtils::GetNodeTextContent(this, true, aText);
   return NS_OK;
 }
 
 NS_IMETHODIMP    
-nsHTMLAnchorElement::SetText(const nsAString& aText)
+HTMLAnchorElement::SetText(const nsAString& aText)
 {
   return nsContentUtils::SetNodeTextContent(this, aText, false);
 }
 
 NS_IMETHODIMP
-nsHTMLAnchorElement::ToString(nsAString& aSource)
+HTMLAnchorElement::ToString(nsAString& aSource)
 {
   return GetHref(aSource);
 }
 
 NS_IMETHODIMP    
-nsHTMLAnchorElement::GetPing(nsAString& aValue)
+HTMLAnchorElement::GetPing(nsAString& aValue)
 {
   return GetURIListAttr(nsGkAtoms::ping, aValue);
 }
 
 NS_IMETHODIMP
-nsHTMLAnchorElement::SetPing(const nsAString& aValue)
+HTMLAnchorElement::SetPing(const nsAString& aValue)
 {
   return SetAttr(kNameSpaceID_None, nsGkAtoms::ping, aValue, true);
 }
 
 nsLinkState
-nsHTMLAnchorElement::GetLinkState() const
+HTMLAnchorElement::GetLinkState() const
 {
   return Link::GetLinkState();
 }
 
 already_AddRefed<nsIURI>
-nsHTMLAnchorElement::GetHrefURI() const
+HTMLAnchorElement::GetHrefURI() const
 {
   nsIURI* uri = Link::GetCachedURI();
   if (uri) {
     NS_ADDREF(uri);
     return uri;
   }
 
   return GetHrefURIForAnchors();
 }
 
 nsresult
-nsHTMLAnchorElement::SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
-                             nsIAtom* aPrefix, const nsAString& aValue,
-                             bool aNotify)
+HTMLAnchorElement::SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
+                           nsIAtom* aPrefix, const nsAString& aValue,
+                           bool aNotify)
 {
   bool reset = false;
   if (aName == nsGkAtoms::href && kNameSpaceID_None == aNameSpaceID) {
     // If we do not have a cached URI, we have some value here so we must reset
     // our link state after calling the parent.
     if (!Link::HasCachedURI()) {
       reset = true;
     }
@@ -468,18 +374,18 @@ nsHTMLAnchorElement::SetAttr(int32_t aNa
   if (reset) {
     Link::ResetLinkState(!!aNotify, true);
   }
 
   return rv;
 }
 
 nsresult
-nsHTMLAnchorElement::UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
-                               bool aNotify)
+HTMLAnchorElement::UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
+                             bool aNotify)
 {
   nsresult rv = nsGenericHTMLElement::UnsetAttr(aNameSpaceID, aAttribute,
                                                 aNotify);
 
   // The ordering of the parent class's UnsetAttr call and Link::ResetLinkState
   // is important here!  The attribute is not unset until UnsetAttr returns, and
   // we will need the updated attribute value because notifying the document
   // that content states have changed will call IntrinsicState, which will try
@@ -487,30 +393,32 @@ nsHTMLAnchorElement::UnsetAttr(int32_t a
   if (aAttribute == nsGkAtoms::href && kNameSpaceID_None == aNameSpaceID) {
     Link::ResetLinkState(!!aNotify, false);
   }
 
   return rv;
 }
 
 bool
-nsHTMLAnchorElement::ParseAttribute(int32_t aNamespaceID,
-                                    nsIAtom* aAttribute,
-                                    const nsAString& aValue,
-                                    nsAttrValue& aResult)
+HTMLAnchorElement::ParseAttribute(int32_t aNamespaceID,
+                                  nsIAtom* aAttribute,
+                                  const nsAString& aValue,
+                                  nsAttrValue& aResult)
 {
   return nsGenericHTMLElement::ParseAttribute(aNamespaceID, aAttribute, aValue,
                                               aResult);
 }
 
 nsEventStates
-nsHTMLAnchorElement::IntrinsicState() const
+HTMLAnchorElement::IntrinsicState() const
 {
   return Link::LinkState() | nsGenericHTMLElement::IntrinsicState();
 }
 
 size_t
-nsHTMLAnchorElement::SizeOfExcludingThis(nsMallocSizeOfFun aMallocSizeOf) const
+HTMLAnchorElement::SizeOfExcludingThis(nsMallocSizeOfFun aMallocSizeOf) const
 {
   return nsGenericHTMLElement::SizeOfExcludingThis(aMallocSizeOf) +
          Link::SizeOfExcludingThis(aMallocSizeOf);
 }
 
+} // namespace mozilla
+} // namespace dom
copy from content/html/content/src/nsHTMLAnchorElement.cpp
copy to content/html/content/src/HTMLAnchorElement.h
--- a/content/html/content/src/nsHTMLAnchorElement.cpp
+++ b/content/html/content/src/HTMLAnchorElement.h
@@ -1,40 +1,40 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim:set tw=80 expandtab softtabstop=2 ts=2 sw=2: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#ifndef mozilla_dom_HTMLAnchorElement_h
+#define mozilla_dom_HTMLAnchorElement_h
+
 #include "nsGenericHTMLElement.h"
 #include "nsIDOMHTMLAnchorElement.h"
 #include "nsILink.h"
 #include "Link.h"
 
-#include "nsCOMPtr.h"
-#include "nsContentUtils.h"
-#include "nsGkAtoms.h"
-#include "nsIPresShell.h"
-#include "nsIDocument.h"
-#include "nsPresContext.h"
-#include "nsHTMLDNSPrefetch.h"
+namespace mozilla {
+namespace dom {
 
-using namespace mozilla::dom;
-
-class nsHTMLAnchorElement : public nsGenericHTMLElement,
-                            public nsIDOMHTMLAnchorElement,
-                            public nsILink,
-                            public Link
+class HTMLAnchorElement : public nsGenericHTMLElement,
+                          public nsIDOMHTMLAnchorElement,
+                          public nsILink,
+                          public Link
 {
 public:
   using Element::GetText;
   using Element::SetText;
 
-  nsHTMLAnchorElement(already_AddRefed<nsINodeInfo> aNodeInfo);
-  virtual ~nsHTMLAnchorElement();
+  HTMLAnchorElement(already_AddRefed<nsINodeInfo> aNodeInfo)
+    : nsGenericHTMLElement(aNodeInfo)
+    , Link(this)
+  {
+  }
+  virtual ~HTMLAnchorElement();
 
   // nsISupports
   NS_DECL_ISUPPORTS_INHERITED
 
   // nsIDOMNode
   NS_FORWARD_NSIDOMNODE_TO_NSINODE
 
   // nsIDOMElement
@@ -97,420 +97,12 @@ public:
   virtual void OnDNSPrefetchRequested();
   virtual bool HasDeferredDNSPrefetchRequest();
 
 protected:
   virtual void GetItemValueText(nsAString& text);
   virtual void SetItemValueText(const nsAString& text);
 };
 
-#define ANCHOR_ELEMENT_FLAG_BIT(n_) NODE_FLAG_BIT(ELEMENT_TYPE_SPECIFIC_BITS_OFFSET + (n_))
-
-// Anchor element specific bits
-enum {
-  // Indicates that a DNS Prefetch has been requested from this Anchor elem
-  HTML_ANCHOR_DNS_PREFETCH_REQUESTED =    ANCHOR_ELEMENT_FLAG_BIT(0),
-
-  // Indicates that a DNS Prefetch was added to the deferral queue
-  HTML_ANCHOR_DNS_PREFETCH_DEFERRED =     ANCHOR_ELEMENT_FLAG_BIT(1)
-};
-
-// Make sure we have enough space for those bits
-PR_STATIC_ASSERT(ELEMENT_TYPE_SPECIFIC_BITS_OFFSET + 1 < 32);
-
-#undef ANCHOR_ELEMENT_FLAG_BIT
-
-NS_IMPL_NS_NEW_HTML_ELEMENT(Anchor)
-
-nsHTMLAnchorElement::nsHTMLAnchorElement(already_AddRefed<nsINodeInfo> aNodeInfo)
-  : nsGenericHTMLElement(aNodeInfo)
-  , Link(this)
-{
-}
-
-nsHTMLAnchorElement::~nsHTMLAnchorElement()
-{
-}
-
-
-NS_IMPL_ADDREF_INHERITED(nsHTMLAnchorElement, Element)
-NS_IMPL_RELEASE_INHERITED(nsHTMLAnchorElement, Element)
-
-
-DOMCI_NODE_DATA(HTMLAnchorElement, nsHTMLAnchorElement)
-
-// QueryInterface implementation for nsHTMLAnchorElement
-NS_INTERFACE_TABLE_HEAD(nsHTMLAnchorElement)
-  NS_HTML_CONTENT_INTERFACE_TABLE3(nsHTMLAnchorElement,
-                                   nsIDOMHTMLAnchorElement,
-                                   nsILink,
-                                   Link)
-  NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(nsHTMLAnchorElement,
-                                               nsGenericHTMLElement)
-NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLAnchorElement)
-
-
-NS_IMPL_ELEMENT_CLONE(nsHTMLAnchorElement)
-
-
-NS_IMPL_STRING_ATTR(nsHTMLAnchorElement, Charset, charset)
-NS_IMPL_STRING_ATTR(nsHTMLAnchorElement, Coords, coords)
-NS_IMPL_URI_ATTR(nsHTMLAnchorElement, Href, href)
-NS_IMPL_STRING_ATTR(nsHTMLAnchorElement, Hreflang, hreflang)
-NS_IMPL_STRING_ATTR(nsHTMLAnchorElement, Name, name)
-NS_IMPL_STRING_ATTR(nsHTMLAnchorElement, Rel, rel)
-NS_IMPL_STRING_ATTR(nsHTMLAnchorElement, Rev, rev)
-NS_IMPL_STRING_ATTR(nsHTMLAnchorElement, Shape, shape)
-NS_IMPL_STRING_ATTR(nsHTMLAnchorElement, Type, type)
-NS_IMPL_STRING_ATTR(nsHTMLAnchorElement, Download, download)
-
-int32_t
-nsHTMLAnchorElement::TabIndexDefault()
-{
-  return 0;
-}
-
-void
-nsHTMLAnchorElement::GetItemValueText(nsAString& aValue)
-{
-  GetHref(aValue);
-}
-
-void
-nsHTMLAnchorElement::SetItemValueText(const nsAString& aValue)
-{
-  SetHref(aValue);
-}
-
-bool
-nsHTMLAnchorElement::Draggable() const
-{
-  // links can be dragged as long as there is an href and the
-  // draggable attribute isn't false
-  if (!HasAttr(kNameSpaceID_None, nsGkAtoms::href)) {
-    // no href, so just use the same behavior as other elements
-    return nsGenericHTMLElement::Draggable();
-  }
-
-  return !AttrValueIs(kNameSpaceID_None, nsGkAtoms::draggable,
-                      nsGkAtoms::_false, eIgnoreCase);
-}
-
-void
-nsHTMLAnchorElement::OnDNSPrefetchRequested()
-{
-  UnsetFlags(HTML_ANCHOR_DNS_PREFETCH_DEFERRED);
-  SetFlags(HTML_ANCHOR_DNS_PREFETCH_REQUESTED);
-}
-
-void
-nsHTMLAnchorElement::OnDNSPrefetchDeferred()
-{
-  UnsetFlags(HTML_ANCHOR_DNS_PREFETCH_REQUESTED);
-  SetFlags(HTML_ANCHOR_DNS_PREFETCH_DEFERRED);
-}
-
-bool
-nsHTMLAnchorElement::HasDeferredDNSPrefetchRequest()
-{
-  return HasFlag(HTML_ANCHOR_DNS_PREFETCH_DEFERRED);
-}
-
-nsresult
-nsHTMLAnchorElement::BindToTree(nsIDocument* aDocument, nsIContent* aParent,
-                                nsIContent* aBindingParent,
-                                bool aCompileEventHandlers)
-{
-  Link::ResetLinkState(false, Link::ElementHasHref());
-
-  nsresult rv = nsGenericHTMLElement::BindToTree(aDocument, aParent,
-                                                 aBindingParent,
-                                                 aCompileEventHandlers);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // Prefetch links
-  if (aDocument) {
-    aDocument->RegisterPendingLinkUpdate(this);
-    if (nsHTMLDNSPrefetch::IsAllowed(OwnerDoc())) {
-      nsHTMLDNSPrefetch::PrefetchLow(this);
-    }
-  }
-
-  return rv;
-}
-
-void
-nsHTMLAnchorElement::UnbindFromTree(bool aDeep, bool aNullParent)
-{
-  // Cancel any DNS prefetches
-  // Note: Must come before ResetLinkState.  If called after, it will recreate
-  // mCachedURI based on data that is invalid - due to a call to GetHostname.
-
-  // If prefetch was deferred, clear flag and move on
-  if (HasFlag(HTML_ANCHOR_DNS_PREFETCH_DEFERRED))
-    UnsetFlags(HTML_ANCHOR_DNS_PREFETCH_DEFERRED);
-  // Else if prefetch was requested, clear flag and send cancellation
-  else if (HasFlag(HTML_ANCHOR_DNS_PREFETCH_REQUESTED)) {
-    UnsetFlags(HTML_ANCHOR_DNS_PREFETCH_REQUESTED);
-    // Possible that hostname could have changed since binding, but since this
-    // covers common cases, most DNS prefetch requests will be canceled
-    nsHTMLDNSPrefetch::CancelPrefetchLow(this, NS_ERROR_ABORT);
-  }
-  
-  // If this link is ever reinserted into a document, it might
-  // be under a different xml:base, so forget the cached state now.
-  Link::ResetLinkState(false, Link::ElementHasHref());
-  
-  nsIDocument* doc = GetCurrentDoc();
-  if (doc) {
-    doc->UnregisterPendingLinkUpdate(this);
-  }
-
-  nsGenericHTMLElement::UnbindFromTree(aDeep, aNullParent);
-}
-
-bool
-nsHTMLAnchorElement::IsHTMLFocusable(bool aWithMouse,
-                                     bool *aIsFocusable, int32_t *aTabIndex)
-{
-  if (nsGenericHTMLElement::IsHTMLFocusable(aWithMouse, aIsFocusable, aTabIndex)) {
-    return true;
-  }
-
-  // cannot focus links if there is no link handler
-  nsIDocument* doc = GetCurrentDoc();
-  if (doc) {
-    nsIPresShell* presShell = doc->GetShell();
-    if (presShell) {
-      nsPresContext* presContext = presShell->GetPresContext();
-      if (presContext && !presContext->GetLinkHandler()) {
-        *aIsFocusable = false;
-        return false;
-      }
-    }
-  }
-
-  if (IsEditable()) {
-    if (aTabIndex) {
-      *aTabIndex = -1;
-    }
-
-    *aIsFocusable = false;
-
-    return true;
-  }
-
-  if (!HasAttr(kNameSpaceID_None, nsGkAtoms::tabindex)) {
-    // check whether we're actually a link
-    if (!Link::HasURI()) {
-      // Not tabbable or focusable without href (bug 17605), unless
-      // forced to be via presence of nonnegative tabindex attribute
-      if (aTabIndex) {
-        *aTabIndex = -1;
-      }
+} // namespace dom
+} // namespace mozilla
 
-      *aIsFocusable = false;
-
-      return false;
-    }
-  }
-
-  if (aTabIndex && (sTabFocusModel & eTabFocus_linksMask) == 0) {
-    *aTabIndex = -1;
-  }
-
-  *aIsFocusable = true;
-
-  return false;
-}
-
-nsresult
-nsHTMLAnchorElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor)
-{
-  return PreHandleEventForAnchors(aVisitor);
-}
-
-nsresult
-nsHTMLAnchorElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
-{
-  return PostHandleEventForAnchors(aVisitor);
-}
-
-bool
-nsHTMLAnchorElement::IsLink(nsIURI** aURI) const
-{
-  return IsHTMLLink(aURI);
-}
-
-void
-nsHTMLAnchorElement::GetLinkTarget(nsAString& aTarget)
-{
-  GetAttr(kNameSpaceID_None, nsGkAtoms::target, aTarget);
-  if (aTarget.IsEmpty()) {
-    GetBaseTarget(aTarget);
-  }
-}
-
-NS_IMETHODIMP
-nsHTMLAnchorElement::GetTarget(nsAString& aValue)
-{
-  if (!GetAttr(kNameSpaceID_None, nsGkAtoms::target, aValue)) {
-    GetBaseTarget(aValue);
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsHTMLAnchorElement::SetTarget(const nsAString& aValue)
-{
-  return SetAttr(kNameSpaceID_None, nsGkAtoms::target, aValue, true);
-}
-
-#define IMPL_URI_PART(_part)                                 \
-  NS_IMETHODIMP                                              \
-  nsHTMLAnchorElement::Get##_part(nsAString& a##_part)       \
-  {                                                          \
-    return Link::Get##_part(a##_part);                       \
-  }                                                          \
-  NS_IMETHODIMP                                              \
-  nsHTMLAnchorElement::Set##_part(const nsAString& a##_part) \
-  {                                                          \
-    return Link::Set##_part(a##_part);                       \
-  }
-
-IMPL_URI_PART(Protocol)
-IMPL_URI_PART(Host)
-IMPL_URI_PART(Hostname)
-IMPL_URI_PART(Pathname)
-IMPL_URI_PART(Search)
-IMPL_URI_PART(Port)
-IMPL_URI_PART(Hash)
-
-#undef IMPL_URI_PART
-
-NS_IMETHODIMP    
-nsHTMLAnchorElement::GetText(nsAString& aText)
-{
-  nsContentUtils::GetNodeTextContent(this, true, aText);
-  return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsHTMLAnchorElement::SetText(const nsAString& aText)
-{
-  return nsContentUtils::SetNodeTextContent(this, aText, false);
-}
-
-NS_IMETHODIMP
-nsHTMLAnchorElement::ToString(nsAString& aSource)
-{
-  return GetHref(aSource);
-}
-
-NS_IMETHODIMP    
-nsHTMLAnchorElement::GetPing(nsAString& aValue)
-{
-  return GetURIListAttr(nsGkAtoms::ping, aValue);
-}
-
-NS_IMETHODIMP
-nsHTMLAnchorElement::SetPing(const nsAString& aValue)
-{
-  return SetAttr(kNameSpaceID_None, nsGkAtoms::ping, aValue, true);
-}
-
-nsLinkState
-nsHTMLAnchorElement::GetLinkState() const
-{
-  return Link::GetLinkState();
-}
-
-already_AddRefed<nsIURI>
-nsHTMLAnchorElement::GetHrefURI() const
-{
-  nsIURI* uri = Link::GetCachedURI();
-  if (uri) {
-    NS_ADDREF(uri);
-    return uri;
-  }
-
-  return GetHrefURIForAnchors();
-}
-
-nsresult
-nsHTMLAnchorElement::SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
-                             nsIAtom* aPrefix, const nsAString& aValue,
-                             bool aNotify)
-{
-  bool reset = false;
-  if (aName == nsGkAtoms::href && kNameSpaceID_None == aNameSpaceID) {
-    // If we do not have a cached URI, we have some value here so we must reset
-    // our link state after calling the parent.
-    if (!Link::HasCachedURI()) {
-      reset = true;
-    }
-    // However, if we have a cached URI, we'll want to see if the value changed.
-    else {
-      nsAutoString val;
-      GetHref(val);
-      if (!val.Equals(aValue)) {
-        reset = true;
-      }
-    }
-  }
-
-  nsresult rv = nsGenericHTMLElement::SetAttr(aNameSpaceID, aName, aPrefix,
-                                              aValue, aNotify);
-
-  // The ordering of the parent class's SetAttr call and Link::ResetLinkState
-  // is important here!  The attribute is not set until SetAttr returns, and
-  // we will need the updated attribute value because notifying the document
-  // that content states have changed will call IntrinsicState, which will try
-  // to get updated information about the visitedness from Link.
-  if (reset) {
-    Link::ResetLinkState(!!aNotify, true);
-  }
-
-  return rv;
-}
-
-nsresult
-nsHTMLAnchorElement::UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
-                               bool aNotify)
-{
-  nsresult rv = nsGenericHTMLElement::UnsetAttr(aNameSpaceID, aAttribute,
-                                                aNotify);
-
-  // The ordering of the parent class's UnsetAttr call and Link::ResetLinkState
-  // is important here!  The attribute is not unset until UnsetAttr returns, and
-  // we will need the updated attribute value because notifying the document
-  // that content states have changed will call IntrinsicState, which will try
-  // to get updated information about the visitedness from Link.
-  if (aAttribute == nsGkAtoms::href && kNameSpaceID_None == aNameSpaceID) {
-    Link::ResetLinkState(!!aNotify, false);
-  }
-
-  return rv;
-}
-
-bool
-nsHTMLAnchorElement::ParseAttribute(int32_t aNamespaceID,
-                                    nsIAtom* aAttribute,
-                                    const nsAString& aValue,
-                                    nsAttrValue& aResult)
-{
-  return nsGenericHTMLElement::ParseAttribute(aNamespaceID, aAttribute, aValue,
-                                              aResult);
-}
-
-nsEventStates
-nsHTMLAnchorElement::IntrinsicState() const
-{
-  return Link::LinkState() | nsGenericHTMLElement::IntrinsicState();
-}
-
-size_t
-nsHTMLAnchorElement::SizeOfExcludingThis(nsMallocSizeOfFun aMallocSizeOf) const
-{
-  return nsGenericHTMLElement::SizeOfExcludingThis(aMallocSizeOf) +
-         Link::SizeOfExcludingThis(aMallocSizeOf);
-}
-
+#endif // mozilla_dom_HTMLAnchorElement_h
--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@@ -25,16 +25,17 @@ EXPORTS		= \
 		nsClientRect.h \
 		nsHTMLDNSPrefetch.h \
 		nsTimeRanges.h \
 		$(NULL)
 
 EXPORTS_NAMESPACES = mozilla/dom
 
 EXPORTS_mozilla/dom = \
+		HTMLAnchorElement.h \
 		HTMLBodyElement.h \
 		HTMLDataListElement.h \
 		HTMLDivElement.h \
 		HTMLFontElement.h \
 		HTMLFrameSetElement.h \
 		HTMLHeadingElement.h \
 		HTMLImageElement.h \
 		HTMLLabelElement.h \
@@ -45,17 +46,17 @@ CPPSRCS		= \
 		HTMLPropertiesCollection.cpp \
 		nsClientRect.cpp \
 		nsHTMLDNSPrefetch.cpp \
 		nsGenericHTMLElement.cpp \
 		nsGenericHTMLFrameElement.cpp \
 		nsFormSubmission.cpp \
 		nsTextEditorState.cpp \
 		HTMLElement.cpp \
-		nsHTMLAnchorElement.cpp \
+		HTMLAnchorElement.cpp \
 		nsHTMLAreaElement.cpp \
 		nsHTMLBRElement.cpp \
 		HTMLBodyElement.cpp \
 		nsHTMLButtonElement.cpp \
 		HTMLCanvasElement.cpp \
 		HTMLDataListElement.cpp \
 		HTMLDivElement.cpp \
 		nsHTMLFieldSetElement.cpp \