зеркало из https://github.com/mozilla/gecko-dev.git
Bug 582303. Move nsIDOMNSHTMLImageElement into nsIDOMHTMLImageElement. r=jst
This commit is contained in:
David Zbarsky
Родитель
104ade3438
Коммит
d434e271cb
|
|
@ -35,7 +35,6 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
#include "nsIDOMHTMLImageElement.h"
|
||||
#include "nsIDOMNSHTMLImageElement.h"
|
||||
#include "nsIDOMEventTarget.h"
|
||||
#include "nsGenericHTMLElement.h"
|
||||
#include "nsImageLoadingContent.h"
|
||||
|
|
@ -81,7 +80,6 @@
|
|||
class nsHTMLImageElement : public nsGenericHTMLElement,
|
||||
public nsImageLoadingContent,
|
||||
public nsIDOMHTMLImageElement,
|
||||
public nsIDOMNSHTMLImageElement,
|
||||
public nsIJSNativeInitializer
|
||||
{
|
||||
public:
|
||||
|
|
@ -103,9 +101,6 @@ public:
|
|||
// nsIDOMHTMLImageElement
|
||||
NS_DECL_NSIDOMHTMLIMAGEELEMENT
|
||||
|
||||
// nsIDOMNSHTMLImageElement
|
||||
NS_DECL_NSIDOMNSHTMLIMAGEELEMENT
|
||||
|
||||
// override from nsGenericHTMLElement
|
||||
NS_IMETHOD GetDraggable(PRBool* aDraggable);
|
||||
|
||||
|
|
@ -198,9 +193,8 @@ DOMCI_NODE_DATA(HTMLImageElement, nsHTMLImageElement)
|
|||
|
||||
// QueryInterface implementation for nsHTMLImageElement
|
||||
NS_INTERFACE_TABLE_HEAD(nsHTMLImageElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE6(nsHTMLImageElement,
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE5(nsHTMLImageElement,
|
||||
nsIDOMHTMLImageElement,
|
||||
nsIDOMNSHTMLImageElement,
|
||||
nsIJSNativeInitializer,
|
||||
imgIDecoderObserver,
|
||||
nsIImageLoadingContent,
|
||||
|
|
|
|||
|
|
@ -275,7 +275,6 @@
|
|||
#include "nsIDOMHTMLHtmlElement.h"
|
||||
#include "nsIDOMHTMLIFrameElement.h"
|
||||
#include "nsIDOMHTMLImageElement.h"
|
||||
#include "nsIDOMNSHTMLImageElement.h"
|
||||
#include "nsIDOMHTMLInputElement.h"
|
||||
#include "nsIDOMNSHTMLInputElement.h"
|
||||
#include "nsIDOMHTMLIsIndexElement.h"
|
||||
|
|
@ -2548,7 +2547,6 @@ nsDOMClassInfo::Init()
|
|||
|
||||
DOM_CLASSINFO_MAP_BEGIN(HTMLImageElement, nsIDOMHTMLImageElement)
|
||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLImageElement)
|
||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSHTMLImageElement)
|
||||
DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
|
||||
DOM_CLASSINFO_MAP_END
|
||||
|
||||
|
|
|
|||
|
|
@ -71,7 +71,6 @@ SDK_XPIDLSRCS = \
|
|||
nsIDOMHTMLHeadingElement.idl \
|
||||
nsIDOMHTMLHtmlElement.idl \
|
||||
nsIDOMHTMLIFrameElement.idl \
|
||||
nsIDOMHTMLImageElement.idl \
|
||||
nsIDOMHTMLInputElement.idl \
|
||||
nsIDOMHTMLIsIndexElement.idl \
|
||||
nsIDOMHTMLLIElement.idl \
|
||||
|
|
|
|||
|
|
@ -47,23 +47,30 @@
|
|||
* http://www.w3.org/TR/DOM-Level-2-HTML/
|
||||
*/
|
||||
|
||||
[scriptable, uuid(a6cf90ab-15b3-11d2-932e-00805f8add32)]
|
||||
[scriptable, uuid(3fc9c313-49b9-4315-b39f-7166cf362e10)]
|
||||
interface nsIDOMHTMLImageElement : nsIDOMHTMLElement
|
||||
{
|
||||
attribute DOMString name;
|
||||
attribute DOMString align;
|
||||
attribute DOMString alt;
|
||||
attribute DOMString border;
|
||||
// Modified in DOM Level 2:
|
||||
attribute long height;
|
||||
// Modified in DOM Level 2:
|
||||
attribute long hspace;
|
||||
attribute boolean isMap;
|
||||
attribute DOMString longDesc;
|
||||
attribute DOMString src;
|
||||
attribute DOMString useMap;
|
||||
// Modified in DOM Level 2:
|
||||
attribute long vspace;
|
||||
// Modified in DOM Level 2:
|
||||
attribute boolean isMap;
|
||||
attribute long width;
|
||||
attribute long height;
|
||||
readonly attribute long naturalWidth;
|
||||
readonly attribute long naturalHeight;
|
||||
readonly attribute boolean complete;
|
||||
|
||||
|
||||
attribute DOMString name;
|
||||
attribute DOMString align;
|
||||
attribute DOMString border;
|
||||
attribute long hspace;
|
||||
attribute DOMString longDesc;
|
||||
attribute long vspace;
|
||||
attribute DOMString lowsrc;
|
||||
|
||||
// These attributes are offsets from the closest view (to mimic
|
||||
// NS4's "offset-from-layer" behavior).
|
||||
readonly attribute long x;
|
||||
readonly attribute long y;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,55 +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) 2000
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Vidur Apparao <vidur@netscape.com> (original author)
|
||||
* Johnny Stenback <jst@netscape.com>
|
||||
*
|
||||
* 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 "domstubs.idl"
|
||||
|
||||
[scriptable, uuid(a6cf90c7-15b3-11d2-932e-00805f8add32)]
|
||||
interface nsIDOMNSHTMLImageElement : nsISupports
|
||||
{
|
||||
attribute DOMString lowsrc;
|
||||
readonly attribute boolean complete;
|
||||
|
||||
readonly attribute long naturalHeight;
|
||||
readonly attribute long naturalWidth;
|
||||
|
||||
// These attributes are offsets from the closest view (to mimic
|
||||
// NS4's "offset-from-layer" behavior).
|
||||
readonly attribute long x;
|
||||
readonly attribute long y;
|
||||
};
|
||||
|
|
@ -257,6 +257,7 @@ members = [
|
|||
'nsIDOMHTMLImageElement.name',
|
||||
'nsIDOMHTMLImageElement.height',
|
||||
'nsIDOMHTMLImageElement.width',
|
||||
'nsIDOMHTMLImageElement.complete',
|
||||
'nsIDOMHTMLInputElement.defaultChecked',
|
||||
'nsIDOMHTMLInputElement.disabled',
|
||||
'nsIDOMHTMLInputElement.select',
|
||||
|
|
@ -343,7 +344,6 @@ members = [
|
|||
'nsIDOMNSHTMLElement.offsetWidth',
|
||||
'nsIDOMNSHTMLElement.scrollIntoView',
|
||||
'nsIDOMNSHTMLFrameElement.contentWindow',
|
||||
'nsIDOMNSHTMLImageElement.complete',
|
||||
'nsIDOMNSHTMLInputElement.files',
|
||||
'nsIDOMNSHTMLInputElement.textLength',
|
||||
'nsIDOMNSHTMLInputElement.selectionStart',
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче