зеркало из https://github.com/mozilla/gecko-dev.git
Remove unneeded nsIDOMNSHTMLOptionElement interface by merging it into nsIDOMHTMLOptionElement. (Bug 582303) r=jst
This commit is contained in:
David Zbarsky
Родитель
5cfc5b0e6d
Коммит
3756ea9487
|
|
@ -38,7 +38,6 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include "nsIDOMNSHTMLOptionElement.h"
|
||||
#include "nsHTMLOptionElement.h"
|
||||
#include "nsIDOMHTMLOptGroupElement.h"
|
||||
#include "nsIDOMHTMLFormElement.h"
|
||||
|
|
@ -117,9 +116,8 @@ DOMCI_NODE_DATA(HTMLOptionElement, nsHTMLOptionElement)
|
|||
|
||||
// QueryInterface implementation for nsHTMLOptionElement
|
||||
NS_INTERFACE_TABLE_HEAD(nsHTMLOptionElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE3(nsHTMLOptionElement,
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE2(nsHTMLOptionElement,
|
||||
nsIDOMHTMLOptionElement,
|
||||
nsIDOMNSHTMLOptionElement,
|
||||
nsIJSNativeInitializer)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(nsHTMLOptionElement,
|
||||
nsGenericHTMLElement)
|
||||
|
|
|
|||
|
|
@ -43,12 +43,10 @@
|
|||
|
||||
#include "nsGenericHTMLElement.h"
|
||||
#include "nsIDOMHTMLOptionElement.h"
|
||||
#include "nsIDOMNSHTMLOptionElement.h"
|
||||
#include "nsIJSNativeInitializer.h"
|
||||
|
||||
class nsHTMLOptionElement : public nsGenericHTMLElement,
|
||||
public nsIDOMHTMLOptionElement,
|
||||
public nsIDOMNSHTMLOptionElement,
|
||||
public nsIJSNativeInitializer
|
||||
{
|
||||
public:
|
||||
|
|
@ -78,9 +76,6 @@ public:
|
|||
// nsIDOMHTMLOptionElement
|
||||
NS_DECL_NSIDOMHTMLOPTIONELEMENT
|
||||
|
||||
// nsIDOMNSHTMLOptionElement
|
||||
NS_IMETHOD SetText(const nsAString & aText);
|
||||
|
||||
// nsIJSNativeInitializer
|
||||
NS_IMETHOD Initialize(nsISupports* aOwner, JSContext* aContext,
|
||||
JSObject *aObj, PRUint32 argc, jsval *argv);
|
||||
|
|
|
|||
|
|
@ -154,7 +154,6 @@
|
|||
|
||||
// HTMLOptionsCollection includes
|
||||
#include "nsIDOMHTMLOptionElement.h"
|
||||
#include "nsIDOMNSHTMLOptionElement.h"
|
||||
#include "nsIDOMHTMLOptionsCollection.h"
|
||||
#include "nsIDOMNSHTMLOptionCollectn.h"
|
||||
|
||||
|
|
@ -2629,9 +2628,6 @@ nsDOMClassInfo::Init()
|
|||
DOM_CLASSINFO_MAP_END
|
||||
|
||||
DOM_CLASSINFO_MAP_BEGIN(HTMLOptionElement, nsIDOMHTMLOptionElement)
|
||||
// Order is significant. nsIDOMNSHTMLOptionElement.text shdaows
|
||||
// nsIDOMHTMLOptionElement.text, which is readonly.
|
||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSHTMLOptionElement)
|
||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLOptionElement)
|
||||
DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
|
||||
DOM_CLASSINFO_MAP_END
|
||||
|
|
|
|||
|
|
@ -129,7 +129,6 @@ XPIDLSRCS = \
|
|||
nsIDOMNSHTMLImageElement.idl \
|
||||
nsIDOMNSHTMLInputElement.idl \
|
||||
nsIDOMNSHTMLOptionCollectn.idl \
|
||||
nsIDOMNSHTMLOptionElement.idl \
|
||||
nsIDOMNSHTMLSelectElement.idl \
|
||||
nsIDOMNSHTMLTextAreaElement.idl \
|
||||
$(NULL)
|
||||
|
|
|
|||
|
|
@ -47,17 +47,16 @@
|
|||
* http://www.w3.org/TR/DOM-Level-2-HTML/
|
||||
*/
|
||||
|
||||
[scriptable, uuid(a6cf9092-15b3-11d2-932e-00805f8add32)]
|
||||
[scriptable, uuid(611d00f5-1eb8-4571-b995-2a2019d2d11c)]
|
||||
interface nsIDOMHTMLOptionElement : nsIDOMHTMLElement
|
||||
{
|
||||
readonly attribute nsIDOMHTMLFormElement form;
|
||||
// Modified in DOM Level 2:
|
||||
attribute boolean defaultSelected;
|
||||
readonly attribute DOMString text;
|
||||
// Modified in DOM Level 2:
|
||||
readonly attribute long index;
|
||||
attribute boolean disabled;
|
||||
readonly attribute nsIDOMHTMLFormElement form;
|
||||
attribute DOMString label;
|
||||
attribute boolean defaultSelected;
|
||||
attribute boolean selected;
|
||||
attribute DOMString value;
|
||||
|
||||
attribute DOMString text;
|
||||
readonly attribute long index;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,46 +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
|
||||
* Netscape Communications Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2003
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Johnny Stenback <jst@netscape.com>
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either 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 "nsIDOMHTMLElement.idl"
|
||||
|
||||
[scriptable, uuid(e2dfc89c-7ae0-4651-8aee-7f5edc2aa626)]
|
||||
interface nsIDOMNSHTMLOptionElement : nsISupports
|
||||
{
|
||||
// Settable version of the text attribute.
|
||||
attribute DOMString text;
|
||||
};
|
||||
|
|
@ -270,8 +270,7 @@ members = [
|
|||
'nsIDOMHTMLOptionElement.index',
|
||||
'nsIDOMHTMLOptionElement.selected',
|
||||
'nsIDOMHTMLOptionElement.form',
|
||||
# Readonly, shadowed by nsIDOMNSHTMLOptionElement.text (below).
|
||||
#'nsIDOMHTMLOptionElement.text',
|
||||
'nsIDOMHTMLOptionElement.text',
|
||||
'nsIDOMHTMLOptionElement.defaultSelected',
|
||||
'nsIDOMHTMLOptionElement.value',
|
||||
'nsIDOMHTMLOptionElement.label',
|
||||
|
|
@ -351,7 +350,6 @@ members = [
|
|||
'nsIDOMNSHTMLInputElement.setSelectionRange',
|
||||
'nsIDOMNSHTMLOptionCollection.selectedIndex',
|
||||
'nsIDOMNSHTMLOptionCollection.add',
|
||||
'nsIDOMNSHTMLOptionElement.text',
|
||||
'nsIDOMNSHTMLSelectElement.item',
|
||||
'nsIDOMNSHTMLTextAreaElement.setSelectionRange',
|
||||
'nsIDOMNSHTMLTextAreaElement.selectionStart',
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче