From 10b836489b4f352580b962d5606616fb1324e8f5 Mon Sep 17 00:00:00 2001 From: Robert O'Callahan Date: Mon, 2 Aug 2010 15:20:05 +1200 Subject: [PATCH] Backed out changeset edd01aafe372 --- .../html/content/src/nsHTMLImageElement.cpp | 8 ++- dom/base/nsDOMClassInfo.cpp | 2 + dom/interfaces/html/Makefile.in | 1 + .../html/nsIDOMHTMLImageElement.idl | 31 ++++------- .../html/nsIDOMNSHTMLImageElement.idl | 55 +++++++++++++++++++ js/src/xpconnect/src/dom_quickstubs.qsconf | 2 +- 6 files changed, 78 insertions(+), 21 deletions(-) diff --git a/content/html/content/src/nsHTMLImageElement.cpp b/content/html/content/src/nsHTMLImageElement.cpp index 53eb894e829f..c9cc0295ac3d 100644 --- a/content/html/content/src/nsHTMLImageElement.cpp +++ b/content/html/content/src/nsHTMLImageElement.cpp @@ -35,6 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLImageElement.h" +#include "nsIDOMNSHTMLImageElement.h" #include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsImageLoadingContent.h" @@ -80,6 +81,7 @@ class nsHTMLImageElement : public nsGenericHTMLElement, public nsImageLoadingContent, public nsIDOMHTMLImageElement, + public nsIDOMNSHTMLImageElement, public nsIJSNativeInitializer { public: @@ -101,6 +103,9 @@ public: // nsIDOMHTMLImageElement NS_DECL_NSIDOMHTMLIMAGEELEMENT + // nsIDOMNSHTMLImageElement + NS_DECL_NSIDOMNSHTMLIMAGEELEMENT + // override from nsGenericHTMLElement NS_IMETHOD GetDraggable(PRBool* aDraggable); @@ -193,8 +198,9 @@ DOMCI_NODE_DATA(HTMLImageElement, nsHTMLImageElement) // QueryInterface implementation for nsHTMLImageElement NS_INTERFACE_TABLE_HEAD(nsHTMLImageElement) - NS_HTML_CONTENT_INTERFACE_TABLE5(nsHTMLImageElement, + NS_HTML_CONTENT_INTERFACE_TABLE6(nsHTMLImageElement, nsIDOMHTMLImageElement, + nsIDOMNSHTMLImageElement, nsIJSNativeInitializer, imgIDecoderObserver, nsIImageLoadingContent, diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp index ba1dcb2d0ed6..242fc9028d7d 100644 --- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -275,6 +275,7 @@ #include "nsIDOMHTMLHtmlElement.h" #include "nsIDOMHTMLIFrameElement.h" #include "nsIDOMHTMLImageElement.h" +#include "nsIDOMNSHTMLImageElement.h" #include "nsIDOMHTMLInputElement.h" #include "nsIDOMNSHTMLInputElement.h" #include "nsIDOMHTMLIsIndexElement.h" @@ -2547,6 +2548,7 @@ 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 diff --git a/dom/interfaces/html/Makefile.in b/dom/interfaces/html/Makefile.in index d99511c0b2db..5910b2805b70 100644 --- a/dom/interfaces/html/Makefile.in +++ b/dom/interfaces/html/Makefile.in @@ -71,6 +71,7 @@ SDK_XPIDLSRCS = \ nsIDOMHTMLHeadingElement.idl \ nsIDOMHTMLHtmlElement.idl \ nsIDOMHTMLIFrameElement.idl \ + nsIDOMHTMLImageElement.idl \ nsIDOMHTMLInputElement.idl \ nsIDOMHTMLIsIndexElement.idl \ nsIDOMHTMLLIElement.idl \ diff --git a/dom/interfaces/html/nsIDOMHTMLImageElement.idl b/dom/interfaces/html/nsIDOMHTMLImageElement.idl index b807c47eefa9..587ddf077854 100644 --- a/dom/interfaces/html/nsIDOMHTMLImageElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLImageElement.idl @@ -47,30 +47,23 @@ * http://www.w3.org/TR/DOM-Level-2-HTML/ */ -[scriptable, uuid(3fc9c313-49b9-4315-b39f-7166cf362e10)] +[scriptable, uuid(a6cf90ab-15b3-11d2-932e-00805f8add32)] interface nsIDOMHTMLImageElement : nsIDOMHTMLElement { - attribute DOMString alt; - attribute DOMString src; - attribute DOMString useMap; - 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 alt; attribute DOMString border; - attribute long hspace; + // 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; - 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; + // Modified in DOM Level 2: + attribute long width; }; diff --git a/dom/interfaces/html/nsIDOMNSHTMLImageElement.idl b/dom/interfaces/html/nsIDOMNSHTMLImageElement.idl index e69de29bb2d1..1fee3951d9b0 100644 --- a/dom/interfaces/html/nsIDOMNSHTMLImageElement.idl +++ b/dom/interfaces/html/nsIDOMNSHTMLImageElement.idl @@ -0,0 +1,55 @@ +/* -*- 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 (original author) + * Johnny Stenback + * + * 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; +}; diff --git a/js/src/xpconnect/src/dom_quickstubs.qsconf b/js/src/xpconnect/src/dom_quickstubs.qsconf index 7ca807930950..329005c4158a 100644 --- a/js/src/xpconnect/src/dom_quickstubs.qsconf +++ b/js/src/xpconnect/src/dom_quickstubs.qsconf @@ -257,7 +257,6 @@ members = [ 'nsIDOMHTMLImageElement.name', 'nsIDOMHTMLImageElement.height', 'nsIDOMHTMLImageElement.width', - 'nsIDOMHTMLImageElement.complete', 'nsIDOMHTMLInputElement.defaultChecked', 'nsIDOMHTMLInputElement.disabled', 'nsIDOMHTMLInputElement.select', @@ -344,6 +343,7 @@ members = [ 'nsIDOMNSHTMLElement.offsetWidth', 'nsIDOMNSHTMLElement.scrollIntoView', 'nsIDOMNSHTMLFrameElement.contentWindow', + 'nsIDOMNSHTMLImageElement.complete', 'nsIDOMNSHTMLInputElement.files', 'nsIDOMNSHTMLInputElement.textLength', 'nsIDOMNSHTMLInputElement.selectionStart',