Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 659990 - Remove nsIDOMNSHTMLHRElement; r=peterv

Browse Source
This commit is contained in:
Ms2ger 2011-05-28 09:43:44 +02:00
parent b6dd9d3e21
commit 849d9d3048
6 changed files with 11 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
content/html/content/src/nsHTMLHRElement.cpp
View File

@ -34,10 +34,11 @@
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "nsIDOMHTMLHRElement.h"
#include "nsIDOMNSHTMLHRElement.h"
#include "nsIDOMEventTarget.h"
#include "nsGenericHTMLElement.h"
#include "nsIDOMHTMLHRElement.h"
#include "nsIDOMEventTarget.h"
#include "nsGkAtoms.h"
#include "nsStyleConsts.h"
#include "nsPresContext.h"
@ -46,8 +47,7 @@
#include "nsCSSProps.h"
class nsHTMLHRElement : public nsGenericHTMLElement,
public nsIDOMHTMLHRElement,
public nsIDOMNSHTMLHRElement
public nsIDOMHTMLHRElement
{
public:
nsHTMLHRElement(already_AddRefed<nsINodeInfo> aNodeInfo);
@ -68,9 +68,6 @@ public:
// nsIDOMHTMLHRElement
NS_DECL_NSIDOMHTMLHRELEMENT
// nsIDOMNSHTMLHRElement
NS_DECL_NSIDOMNSHTMLHRELEMENT
virtual PRBool ParseAttribute(PRInt32 aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
@ -103,9 +100,8 @@ DOMCI_NODE_DATA(HTMLHRElement, nsHTMLHRElement)
// QueryInterface implementation for nsHTMLHRElement
NS_INTERFACE_TABLE_HEAD(nsHTMLHRElement)
NS_HTML_CONTENT_INTERFACE_TABLE2(nsHTMLHRElement,
nsIDOMHTMLHRElement,
nsIDOMNSHTMLHRElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLHRElement,
nsIDOMHTMLHRElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(nsHTMLHRElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLHRElement)

2
dom/base/nsDOMClassInfo.cpp
View File

@ -278,7 +278,6 @@
#include "nsIDOMHTMLFrameSetElement.h"
#include "nsIDOMNSHTMLFrameElement.h"
#include "nsIDOMHTMLHRElement.h"
#include "nsIDOMNSHTMLHRElement.h"
#include "nsIDOMHTMLHeadElement.h"
#include "nsIDOMHTMLHeadingElement.h"
#include "nsIDOMHTMLHtmlElement.h"
@ -2768,7 +2767,6 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_BEGIN(HTMLHRElement, nsIDOMHTMLHRElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLHRElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSHTMLHRElement)
DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
DOM_CLASSINFO_MAP_END

1
dom/interfaces/html/Makefile.in
View File

@ -124,7 +124,6 @@ XPIDLSRCS = \
nsIDOMNSHTMLElement.idl \
nsIDOMNSHTMLFormElement.idl \
nsIDOMNSHTMLFrameElement.idl \
nsIDOMNSHTMLHRElement.idl \
nsIDOMNSHTMLOptionCollectn.idl \
nsIDOMNSHTMLTextAreaElement.idl \
$(NULL)

4
dom/interfaces/html/nsIDOMHTMLHRElement.idl
View File

@ -22,6 +22,7 @@
* Contributor(s):
* Vidur Apparao <vidur@netscape.com> (original author)
* Johnny Stenback <jst@netscape.com>
* Ian Hickson <ian@hixie.ch>
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
@ -50,11 +51,12 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
[scriptable, uuid(b72f9f2d-4c6c-4264-a713-4423724379c0)]
[scriptable, uuid(32342e24-b209-4f50-8518-f7af339d4ae2)]
interface nsIDOMHTMLHRElement : nsIDOMHTMLElement
{
attribute DOMString align;
attribute boolean noShade;
attribute DOMString size;
attribute DOMString width;
attribute DOMString color;
};

49
dom/interfaces/html/nsIDOMNSHTMLHRElement.idl
View File

@ -1,49 +0,0 @@
/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is
* Ian Hickson <ian@hixie.ch>.
* Portions created by the Initial Developer are Copyright (C) 2003
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "nsISupports.idl"
/**
* The nsIDOMNSHTMLHRElement interface contains extensions to the
* interface for [X]HTML hr elements, for compatibility with IE.
*/
[scriptable, uuid(63c0ae1b-8aa7-4e72-82a1-aff486bfdaf5)]
interface nsIDOMNSHTMLHRElement : nsISupports
{
attribute DOMString color;
};

7
layout/generic/nsFrame.cpp
View File

@ -73,12 +73,7 @@
#include "nsIAccessible.h"
#endif
#include "nsIDOMText.h"
#include "nsIDOMHTMLAnchorElement.h"
#include "nsIDOMHTMLAreaElement.h"
#include "nsIDOMHTMLImageElement.h"
#include "nsIDOMHTMLHRElement.h"
#include "nsIDOMHTMLInputElement.h"
#include "nsIDOMNode.h"
#include "nsIEditorDocShell.h"
#include "nsEventStateManager.h"
#include "nsISelection.h"