+2007-08-24 Sam Weinig <sam@webkit.org>
+
+ Revert r25216 which renamed the COM DOM bindings to use Deprecated prefix.
+
2007-08-24 Ada Chan <adachan@apple.com>
<rdar://problem/5147315> and <rdar://problem/5183935>
#include <WebCore/PlatformString.h>
#pragma warning(pop)
-// DeprecatedDOMCSSStyleDeclaration - DeprecatedDOMCSSStyleDeclaration ----------------------------
+// DOMCSSStyleDeclaration - DOMCSSStyleDeclaration ----------------------------
-DeprecatedDOMCSSStyleDeclaration::DeprecatedDOMCSSStyleDeclaration(WebCore::CSSStyleDeclaration* s)
+DOMCSSStyleDeclaration::DOMCSSStyleDeclaration(WebCore::CSSStyleDeclaration* s)
: m_style(0)
{
if (s)
m_style = s;
}
-DeprecatedDOMCSSStyleDeclaration::~DeprecatedDOMCSSStyleDeclaration()
+DOMCSSStyleDeclaration::~DOMCSSStyleDeclaration()
{
if (m_style)
m_style->deref();
}
-IDeprecatedDOMCSSStyleDeclaration* DeprecatedDOMCSSStyleDeclaration::createInstance(WebCore::CSSStyleDeclaration* s)
+IDOMCSSStyleDeclaration* DOMCSSStyleDeclaration::createInstance(WebCore::CSSStyleDeclaration* s)
{
if (!s)
return 0;
HRESULT hr;
- IDeprecatedDOMCSSStyleDeclaration* domStyle = 0;
+ IDOMCSSStyleDeclaration* domStyle = 0;
- DeprecatedDOMCSSStyleDeclaration* newStyle = new DeprecatedDOMCSSStyleDeclaration(s);
- hr = newStyle->QueryInterface(IID_IDeprecatedDOMCSSStyleDeclaration, (void**)&domStyle);
+ DOMCSSStyleDeclaration* newStyle = new DOMCSSStyleDeclaration(s);
+ hr = newStyle->QueryInterface(IID_IDOMCSSStyleDeclaration, (void**)&domStyle);
if (FAILED(hr))
return 0;
return domStyle;
}
-// DeprecatedDOMCSSStyleDeclaration - IUnknown ------------------------------------------
+// DOMCSSStyleDeclaration - IUnknown ------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMCSSStyleDeclaration::QueryInterface(REFIID riid, void** ppvObject)
+HRESULT STDMETHODCALLTYPE DOMCSSStyleDeclaration::QueryInterface(REFIID riid, void** ppvObject)
{
*ppvObject = 0;
- if (IsEqualGUID(riid, IID_IDeprecatedDOMCSSStyleDeclaration))
- *ppvObject = static_cast<IDeprecatedDOMCSSStyleDeclaration*>(this);
+ if (IsEqualGUID(riid, IID_IDOMCSSStyleDeclaration))
+ *ppvObject = static_cast<IDOMCSSStyleDeclaration*>(this);
else
- return DeprecatedDOMObject::QueryInterface(riid, ppvObject);
+ return DOMObject::QueryInterface(riid, ppvObject);
AddRef();
return S_OK;
}
-// DeprecatedDOMCSSStyleDeclaration - IDeprecatedDOMCSSStyleDeclaration ---------------------------
+// DOMCSSStyleDeclaration - IDOMCSSStyleDeclaration ---------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMCSSStyleDeclaration::cssText(
+HRESULT STDMETHODCALLTYPE DOMCSSStyleDeclaration::cssText(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMCSSStyleDeclaration::setCssText(
+HRESULT STDMETHODCALLTYPE DOMCSSStyleDeclaration::setCssText(
/* [in] */ BSTR cssText)
{
WebCore::String cssTextString(cssText);
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMCSSStyleDeclaration::getPropertyValue(
+HRESULT STDMETHODCALLTYPE DOMCSSStyleDeclaration::getPropertyValue(
/* [in] */ BSTR propertyName,
/* [retval][out] */ BSTR* result)
{
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMCSSStyleDeclaration::getPropertyCSSValue(
+HRESULT STDMETHODCALLTYPE DOMCSSStyleDeclaration::getPropertyCSSValue(
/* [in] */ BSTR /*propertyName*/,
- /* [retval][out] */ IDeprecatedDOMCSSValue** /*result*/)
+ /* [retval][out] */ IDOMCSSValue** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMCSSStyleDeclaration::removeProperty(
+HRESULT STDMETHODCALLTYPE DOMCSSStyleDeclaration::removeProperty(
/* [in] */ BSTR /*propertyName*/,
/* [retval][out] */ BSTR* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMCSSStyleDeclaration::getPropertyPriority(
+HRESULT STDMETHODCALLTYPE DOMCSSStyleDeclaration::getPropertyPriority(
/* [in] */ BSTR /*propertyName*/,
/* [retval][out] */ BSTR* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMCSSStyleDeclaration::setProperty(
+HRESULT STDMETHODCALLTYPE DOMCSSStyleDeclaration::setProperty(
/* [in] */ BSTR propertyName,
/* [in] */ BSTR value,
/* [in] */ BSTR priority)
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMCSSStyleDeclaration::length(
+HRESULT STDMETHODCALLTYPE DOMCSSStyleDeclaration::length(
/* [retval][out] */ UINT* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMCSSStyleDeclaration::item(
+HRESULT STDMETHODCALLTYPE DOMCSSStyleDeclaration::item(
/* [in] */ UINT /*index*/,
/* [retval][out] */ BSTR* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMCSSStyleDeclaration::parentRule(
- /* [retval][out] */ IDeprecatedDOMCSSRule** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMCSSStyleDeclaration::parentRule(
+ /* [retval][out] */ IDOMCSSRule** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
#include <WebCore/CSSStyleDeclaration.h>
-class DeprecatedDOMCSSStyleDeclaration : public DeprecatedDOMObject, public IDeprecatedDOMCSSStyleDeclaration
+class DOMCSSStyleDeclaration : public DOMObject, public IDOMCSSStyleDeclaration
{
protected:
- DeprecatedDOMCSSStyleDeclaration(WebCore::CSSStyleDeclaration* d);
- ~DeprecatedDOMCSSStyleDeclaration();
+ DOMCSSStyleDeclaration(WebCore::CSSStyleDeclaration* d);
+ ~DOMCSSStyleDeclaration();
public:
- static IDeprecatedDOMCSSStyleDeclaration* createInstance(WebCore::CSSStyleDeclaration* d);
+ static IDOMCSSStyleDeclaration* createInstance(WebCore::CSSStyleDeclaration* d);
public:
// IUnknown
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
- virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DeprecatedDOMObject::AddRef(); }
- virtual ULONG STDMETHODCALLTYPE Release(void) { return DeprecatedDOMObject::Release(); }
+ virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DOMObject::AddRef(); }
+ virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMObject::Release(); }
// IWebScriptObject
virtual HRESULT STDMETHODCALLTYPE throwException(
/* [in] */ BSTR exceptionMessage,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMObject::throwException(exceptionMessage, result); }
+ /* [retval][out] */ BOOL *result) { return DOMObject::throwException(exceptionMessage, result); }
virtual HRESULT STDMETHODCALLTYPE callWebScriptMethod(
/* [in] */ BSTR name,
/* [size_is][in] */ const VARIANT args[ ],
/* [in] */ int cArgs,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMObject::callWebScriptMethod(name, args, cArgs, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMObject::callWebScriptMethod(name, args, cArgs, result); }
virtual HRESULT STDMETHODCALLTYPE evaluateWebScript(
/* [in] */ BSTR script,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMObject::evaluateWebScript(script, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMObject::evaluateWebScript(script, result); }
virtual HRESULT STDMETHODCALLTYPE removeWebScriptKey(
- /* [in] */ BSTR name) { return DeprecatedDOMObject::removeWebScriptKey(name); }
+ /* [in] */ BSTR name) { return DOMObject::removeWebScriptKey(name); }
virtual HRESULT STDMETHODCALLTYPE stringRepresentation(
- /* [retval][out] */ BSTR* stringRepresentation) { return DeprecatedDOMObject::stringRepresentation(stringRepresentation); }
+ /* [retval][out] */ BSTR* stringRepresentation) { return DOMObject::stringRepresentation(stringRepresentation); }
virtual HRESULT STDMETHODCALLTYPE webScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMObject::webScriptValueAtIndex(index, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMObject::webScriptValueAtIndex(index, result); }
virtual HRESULT STDMETHODCALLTYPE setWebScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [in] */ VARIANT val) { return DeprecatedDOMObject::setWebScriptValueAtIndex(index, val); }
+ /* [in] */ VARIANT val) { return DOMObject::setWebScriptValueAtIndex(index, val); }
virtual HRESULT STDMETHODCALLTYPE setException(
- /* [in] */ BSTR description) { return DeprecatedDOMObject::setException(description); }
+ /* [in] */ BSTR description) { return DOMObject::setException(description); }
- // IDeprecatedDOMCSSStyleDeclaration
+ // IDOMCSSStyleDeclaration
virtual HRESULT STDMETHODCALLTYPE cssText(
/* [retval][out] */ BSTR *result);
virtual HRESULT STDMETHODCALLTYPE getPropertyCSSValue(
/* [in] */ BSTR propertyName,
- /* [retval][out] */ IDeprecatedDOMCSSValue **result);
+ /* [retval][out] */ IDOMCSSValue **result);
virtual HRESULT STDMETHODCALLTYPE removeProperty(
/* [in] */ BSTR propertyName,
/* [retval][out] */ BSTR *result);
virtual HRESULT STDMETHODCALLTYPE parentRule(
- /* [retval][out] */ IDeprecatedDOMCSSRule **result);
+ /* [retval][out] */ IDOMCSSRule **result);
protected:
ULONG m_refCount;
#include <initguid.h>
// {79A193A5-D783-4c73-9AD9-D10678B943DE}
-DEFINE_GUID(IID_DeprecatedDOMNode, 0x79a193a5, 0xd783, 0x4c73, 0x9a, 0xd9, 0xd1, 0x6, 0x78, 0xb9, 0x43, 0xde);
+DEFINE_GUID(IID_DOMNode, 0x79a193a5, 0xd783, 0x4c73, 0x9a, 0xd9, 0xd1, 0x6, 0x78, 0xb9, 0x43, 0xde);
// {3B0C0EFF-478B-4b0b-8290-D2321E08E23E}
-DEFINE_GUID(IID_DeprecatedDOMElement, 0x3b0c0eff, 0x478b, 0x4b0b, 0x82, 0x90, 0xd2, 0x32, 0x1e, 0x8, 0xe2, 0x3e);
+DEFINE_GUID(IID_DOMElement, 0x3b0c0eff, 0x478b, 0x4b0b, 0x82, 0x90, 0xd2, 0x32, 0x1e, 0x8, 0xe2, 0x3e);
using namespace WebCore;
using namespace HTMLNames;
-// DeprecatedDOMObject - IUnknown -------------------------------------------------------
+// DOMObject - IUnknown -------------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMObject::QueryInterface(REFIID riid, void** ppvObject)
+HRESULT STDMETHODCALLTYPE DOMObject::QueryInterface(REFIID riid, void** ppvObject)
{
*ppvObject = 0;
- if (IsEqualGUID(riid, IID_IDeprecatedDOMObject))
- *ppvObject = static_cast<IDeprecatedDOMObject*>(this);
+ if (IsEqualGUID(riid, IID_IDOMObject))
+ *ppvObject = static_cast<IDOMObject*>(this);
else
return WebScriptObject::QueryInterface(riid, ppvObject);
return S_OK;
}
-// DeprecatedDOMNode - IUnknown ---------------------------------------------------------
+// DOMNode - IUnknown ---------------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::QueryInterface(REFIID riid, void** ppvObject)
+HRESULT STDMETHODCALLTYPE DOMNode::QueryInterface(REFIID riid, void** ppvObject)
{
*ppvObject = 0;
- if (IsEqualGUID(riid, IID_IDeprecatedDOMNode))
- *ppvObject = static_cast<IDeprecatedDOMNode*>(this);
- else if (IsEqualGUID(riid, IID_DeprecatedDOMNode))
- *ppvObject = static_cast<DeprecatedDOMNode*>(this);
+ if (IsEqualGUID(riid, IID_IDOMNode))
+ *ppvObject = static_cast<IDOMNode*>(this);
+ else if (IsEqualGUID(riid, IID_DOMNode))
+ *ppvObject = static_cast<DOMNode*>(this);
else
- return DeprecatedDOMObject::QueryInterface(riid, ppvObject);
+ return DOMObject::QueryInterface(riid, ppvObject);
AddRef();
return S_OK;
}
-// DeprecatedDOMNode --------------------------------------------------------------------
+// DOMNode --------------------------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::nodeName(
+HRESULT STDMETHODCALLTYPE DOMNode::nodeName(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::nodeValue(
+HRESULT STDMETHODCALLTYPE DOMNode::nodeValue(
/* [retval][out] */ BSTR* result)
{
if (!m_node)
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::setNodeValue(
+HRESULT STDMETHODCALLTYPE DOMNode::setNodeValue(
/* [in] */ BSTR /*value*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::nodeType(
+HRESULT STDMETHODCALLTYPE DOMNode::nodeType(
/* [retval][out] */ unsigned short* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::parentNode(
- /* [retval][out] */ IDeprecatedDOMNode** result)
+HRESULT STDMETHODCALLTYPE DOMNode::parentNode(
+ /* [retval][out] */ IDOMNode** result)
{
*result = 0;
if (!m_node || !m_node->parentNode())
return E_FAIL;
- *result = DeprecatedDOMNode::createInstance(m_node->parentNode());
+ *result = DOMNode::createInstance(m_node->parentNode());
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::childNodes(
- /* [retval][out] */ IDeprecatedDOMNodeList** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMNode::childNodes(
+ /* [retval][out] */ IDOMNodeList** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::firstChild(
- /* [retval][out] */ IDeprecatedDOMNode** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMNode::firstChild(
+ /* [retval][out] */ IDOMNode** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::lastChild(
- /* [retval][out] */ IDeprecatedDOMNode** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMNode::lastChild(
+ /* [retval][out] */ IDOMNode** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::previousSibling(
- /* [retval][out] */ IDeprecatedDOMNode** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMNode::previousSibling(
+ /* [retval][out] */ IDOMNode** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::nextSibling(
- /* [retval][out] */ IDeprecatedDOMNode** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMNode::nextSibling(
+ /* [retval][out] */ IDOMNode** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::attributes(
- /* [retval][out] */ IDeprecatedDOMNamedNodeMap** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMNode::attributes(
+ /* [retval][out] */ IDOMNamedNodeMap** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::ownerDocument(
- /* [retval][out] */ IDeprecatedDOMDocument** result)
+HRESULT STDMETHODCALLTYPE DOMNode::ownerDocument(
+ /* [retval][out] */ IDOMDocument** result)
{
if (!result)
return E_POINTER;
*result = 0;
if (!m_node)
return E_FAIL;
- *result = DeprecatedDOMDocument::createInstance(m_node->ownerDocument());
+ *result = DOMDocument::createInstance(m_node->ownerDocument());
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::insertBefore(
- /* [in] */ IDeprecatedDOMNode* /*newChild*/,
- /* [in] */ IDeprecatedDOMNode* /*refChild*/,
- /* [retval][out] */ IDeprecatedDOMNode** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMNode::insertBefore(
+ /* [in] */ IDOMNode* /*newChild*/,
+ /* [in] */ IDOMNode* /*refChild*/,
+ /* [retval][out] */ IDOMNode** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::replaceChild(
- /* [in] */ IDeprecatedDOMNode* /*newChild*/,
- /* [in] */ IDeprecatedDOMNode* /*oldChild*/,
- /* [retval][out] */ IDeprecatedDOMNode** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMNode::replaceChild(
+ /* [in] */ IDOMNode* /*newChild*/,
+ /* [in] */ IDOMNode* /*oldChild*/,
+ /* [retval][out] */ IDOMNode** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::removeChild(
- /* [in] */ IDeprecatedDOMNode* /*oldChild*/,
- /* [retval][out] */ IDeprecatedDOMNode** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMNode::removeChild(
+ /* [in] */ IDOMNode* /*oldChild*/,
+ /* [retval][out] */ IDOMNode** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::appendChild(
- /* [in] */ IDeprecatedDOMNode* /*oldChild*/,
- /* [retval][out] */ IDeprecatedDOMNode** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMNode::appendChild(
+ /* [in] */ IDOMNode* /*oldChild*/,
+ /* [retval][out] */ IDOMNode** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::hasChildNodes(
+HRESULT STDMETHODCALLTYPE DOMNode::hasChildNodes(
/* [retval][out] */ BOOL* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::cloneNode(
+HRESULT STDMETHODCALLTYPE DOMNode::cloneNode(
/* [in] */ BOOL /*deep*/,
- /* [retval][out] */ IDeprecatedDOMNode** /*result*/)
+ /* [retval][out] */ IDOMNode** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::normalize( void)
+HRESULT STDMETHODCALLTYPE DOMNode::normalize( void)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::isSupported(
+HRESULT STDMETHODCALLTYPE DOMNode::isSupported(
/* [in] */ BSTR /*feature*/,
/* [in] */ BSTR /*version*/,
/* [retval][out] */ BOOL* /*result*/)
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::namespaceURI(
+HRESULT STDMETHODCALLTYPE DOMNode::namespaceURI(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::prefix(
+HRESULT STDMETHODCALLTYPE DOMNode::prefix(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::setPrefix(
+HRESULT STDMETHODCALLTYPE DOMNode::setPrefix(
/* [in] */ BSTR /*prefix*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::localName(
+HRESULT STDMETHODCALLTYPE DOMNode::localName(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::hasAttributes(
+HRESULT STDMETHODCALLTYPE DOMNode::hasAttributes(
/* [retval][out] */ BOOL* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::isSameNode(
- /* [in] */ IDeprecatedDOMNode* other,
+HRESULT STDMETHODCALLTYPE DOMNode::isSameNode(
+ /* [in] */ IDOMNode* other,
/* [retval][out] */ BOOL* result)
{
if (!result) {
if (!other)
return E_POINTER;
- COMPtr<DeprecatedDOMNode> domOther;
- HRESULT hr = other->QueryInterface(IID_DeprecatedDOMNode, (void**)&domOther);
+ COMPtr<DOMNode> domOther;
+ HRESULT hr = other->QueryInterface(IID_DOMNode, (void**)&domOther);
if (FAILED(hr))
return hr;
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::isEqualNode(
- /* [in] */ IDeprecatedDOMNode* /*other*/,
+HRESULT STDMETHODCALLTYPE DOMNode::isEqualNode(
+ /* [in] */ IDOMNode* /*other*/,
/* [retval][out] */ BOOL* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::textContent(
+HRESULT STDMETHODCALLTYPE DOMNode::textContent(
/* [retval][out] */ BSTR* result)
{
if (!result)
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::setTextContent(
+HRESULT STDMETHODCALLTYPE DOMNode::setTextContent(
/* [in] */ BSTR /*text*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-// DeprecatedDOMNode - IDeprecatedDOMEventTarget --------------------------------------------------
+// DOMNode - IDOMEventTarget --------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::addEventListener(
+HRESULT STDMETHODCALLTYPE DOMNode::addEventListener(
/* [in] */ BSTR /*type*/,
- /* [in] */ IDeprecatedDOMEventListener* /*listener*/,
+ /* [in] */ IDOMEventListener* /*listener*/,
/* [in] */ BOOL /*useCapture*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::removeEventListener(
+HRESULT STDMETHODCALLTYPE DOMNode::removeEventListener(
/* [in] */ BSTR /*type*/,
- /* [in] */ IDeprecatedDOMEventListener* /*listener*/,
+ /* [in] */ IDOMEventListener* /*listener*/,
/* [in] */ BOOL /*useCapture*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNode::dispatchEvent(
- /* [in] */ IDeprecatedDOMEvent* evt,
+HRESULT STDMETHODCALLTYPE DOMNode::dispatchEvent(
+ /* [in] */ IDOMEvent* evt,
/* [retval][out] */ BOOL* result)
{
if (!m_node || !evt)
WebCore::raiseDOMException(DOM_NOT_SUPPORTED_ERR);
#endif
- COMPtr<DeprecatedDOMEvent> domEvent;
- HRESULT hr = evt->QueryInterface(IID_DeprecatedDOMEvent, (void**) &domEvent);
+ COMPtr<DOMEvent> domEvent;
+ HRESULT hr = evt->QueryInterface(IID_DOMEvent, (void**) &domEvent);
if (FAILED(hr))
return hr;
return S_OK;
}
-// DeprecatedDOMNode - DeprecatedDOMNode ----------------------------------------------------------
+// DOMNode - DOMNode ----------------------------------------------------------
-DeprecatedDOMNode::DeprecatedDOMNode(WebCore::Node* n)
+DOMNode::DOMNode(WebCore::Node* n)
: m_node(0)
{
if (n)
m_node = n;
}
-DeprecatedDOMNode::~DeprecatedDOMNode()
+DOMNode::~DOMNode()
{
if (m_node)
m_node->deref();
}
-IDeprecatedDOMNode* DeprecatedDOMNode::createInstance(WebCore::Node* n)
+IDOMNode* DOMNode::createInstance(WebCore::Node* n)
{
if (!n)
return 0;
HRESULT hr = S_OK;
- IDeprecatedDOMNode* domNode = 0;
+ IDOMNode* domNode = 0;
WebCore::Node::NodeType nodeType = n->nodeType();
switch (nodeType) {
case WebCore::Node::ELEMENT_NODE:
{
- IDeprecatedDOMElement* newElement = DeprecatedDOMElement::createInstance(static_cast<WebCore::Element*>(n));
+ IDOMElement* newElement = DOMElement::createInstance(static_cast<WebCore::Element*>(n));
if (newElement) {
- hr = newElement->QueryInterface(IID_IDeprecatedDOMNode, (void**)&domNode);
+ hr = newElement->QueryInterface(IID_IDOMNode, (void**)&domNode);
newElement->Release();
}
}
break;
case WebCore::Node::DOCUMENT_NODE:
{
- IDeprecatedDOMDocument* newDocument = DeprecatedDOMDocument::createInstance(n->document());
+ IDOMDocument* newDocument = DOMDocument::createInstance(n->document());
if (newDocument) {
- hr = newDocument->QueryInterface(IID_IDeprecatedDOMNode, (void**)&domNode);
+ hr = newDocument->QueryInterface(IID_IDOMNode, (void**)&domNode);
newDocument->Release();
}
}
break;
default:
{
- DeprecatedDOMNode* newNode = new DeprecatedDOMNode(n);
- hr = newNode->QueryInterface(IID_IDeprecatedDOMNode, (void**)&domNode);
+ DOMNode* newNode = new DOMNode(n);
+ hr = newNode->QueryInterface(IID_IDOMNode, (void**)&domNode);
}
break;
}
return domNode;
}
-// DeprecatedDOMNodeList - IUnknown -----------------------------------------------------
+// DOMNodeList - IUnknown -----------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNodeList::QueryInterface(REFIID riid, void** ppvObject)
+HRESULT STDMETHODCALLTYPE DOMNodeList::QueryInterface(REFIID riid, void** ppvObject)
{
*ppvObject = 0;
- if (IsEqualGUID(riid, IID_IDeprecatedDOMNodeList))
- *ppvObject = static_cast<IDeprecatedDOMNodeList*>(this);
+ if (IsEqualGUID(riid, IID_IDOMNodeList))
+ *ppvObject = static_cast<IDOMNodeList*>(this);
else
- return DeprecatedDOMObject::QueryInterface(riid, ppvObject);
+ return DOMObject::QueryInterface(riid, ppvObject);
AddRef();
return S_OK;
}
-// IDeprecatedDOMNodeList ---------------------------------------------------------------
+// IDOMNodeList ---------------------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNodeList::item(
+HRESULT STDMETHODCALLTYPE DOMNodeList::item(
/* [in] */ UINT index,
- /* [retval][out] */ IDeprecatedDOMNode **result)
+ /* [retval][out] */ IDOMNode **result)
{
*result = 0;
if (!m_nodeList)
if (!itemNode)
return E_FAIL;
- *result = DeprecatedDOMNode::createInstance(itemNode);
+ *result = DOMNode::createInstance(itemNode);
if (!(*result))
return E_FAIL;
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMNodeList::length(
+HRESULT STDMETHODCALLTYPE DOMNodeList::length(
/* [retval][out] */ UINT *result)
{
*result = 0;
return S_OK;
}
-// DeprecatedDOMNodeList - DeprecatedDOMNodeList --------------------------------------------------
+// DOMNodeList - DOMNodeList --------------------------------------------------
-DeprecatedDOMNodeList::DeprecatedDOMNodeList(WebCore::NodeList* l)
+DOMNodeList::DOMNodeList(WebCore::NodeList* l)
: m_nodeList(0)
{
if (l)
m_nodeList = l;
}
-DeprecatedDOMNodeList::~DeprecatedDOMNodeList()
+DOMNodeList::~DOMNodeList()
{
if (m_nodeList)
m_nodeList->deref();
}
-IDeprecatedDOMNodeList* DeprecatedDOMNodeList::createInstance(WebCore::NodeList* l)
+IDOMNodeList* DOMNodeList::createInstance(WebCore::NodeList* l)
{
if (!l)
return 0;
- IDeprecatedDOMNodeList* domNodeList = 0;
- DeprecatedDOMNodeList* newNodeList = new DeprecatedDOMNodeList(l);
- if (FAILED(newNodeList->QueryInterface(IID_IDeprecatedDOMNodeList, (void**)&domNodeList)))
+ IDOMNodeList* domNodeList = 0;
+ DOMNodeList* newNodeList = new DOMNodeList(l);
+ if (FAILED(newNodeList->QueryInterface(IID_IDOMNodeList, (void**)&domNodeList)))
return 0;
return domNodeList;
}
-// DeprecatedDOMDocument - IUnknown -----------------------------------------------------
+// DOMDocument - IUnknown -----------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMDocument::QueryInterface(REFIID riid, void** ppvObject)
+HRESULT STDMETHODCALLTYPE DOMDocument::QueryInterface(REFIID riid, void** ppvObject)
{
*ppvObject = 0;
- if (IsEqualGUID(riid, IID_IDeprecatedDOMDocument))
- *ppvObject = static_cast<IDeprecatedDOMDocument*>(this);
- else if (IsEqualGUID(riid, IID_IDeprecatedDOMViewCSS))
- *ppvObject = static_cast<IDeprecatedDOMViewCSS*>(this);
- else if (IsEqualGUID(riid, IID_IDeprecatedDOMDocumentEvent))
- *ppvObject = static_cast<IDeprecatedDOMDocumentEvent*>(this);
+ if (IsEqualGUID(riid, IID_IDOMDocument))
+ *ppvObject = static_cast<IDOMDocument*>(this);
+ else if (IsEqualGUID(riid, IID_IDOMViewCSS))
+ *ppvObject = static_cast<IDOMViewCSS*>(this);
+ else if (IsEqualGUID(riid, IID_IDOMDocumentEvent))
+ *ppvObject = static_cast<IDOMDocumentEvent*>(this);
else
- return DeprecatedDOMNode::QueryInterface(riid, ppvObject);
+ return DOMNode::QueryInterface(riid, ppvObject);
AddRef();
return S_OK;
}
-// DeprecatedDOMDocument ----------------------------------------------------------------
+// DOMDocument ----------------------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMDocument::doctype(
- /* [retval][out] */ IDeprecatedDOMDocumentType** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMDocument::doctype(
+ /* [retval][out] */ IDOMDocumentType** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMDocument::implementation(
- /* [retval][out] */ IDeprecatedDOMImplementation** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMDocument::implementation(
+ /* [retval][out] */ IDOMImplementation** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMDocument::documentElement(
- /* [retval][out] */ IDeprecatedDOMElement** result)
+HRESULT STDMETHODCALLTYPE DOMDocument::documentElement(
+ /* [retval][out] */ IDOMElement** result)
{
- *result = DeprecatedDOMElement::createInstance(m_document->documentElement());
+ *result = DOMElement::createInstance(m_document->documentElement());
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMDocument::createElement(
+HRESULT STDMETHODCALLTYPE DOMDocument::createElement(
/* [in] */ BSTR tagName,
- /* [retval][out] */ IDeprecatedDOMElement** result)
+ /* [retval][out] */ IDOMElement** result)
{
if (!m_document)
return E_FAIL;
String tagNameString(tagName);
ExceptionCode ec;
- *result = DeprecatedDOMElement::createInstance(m_document->createElement(tagNameString, ec).get());
+ *result = DOMElement::createInstance(m_document->createElement(tagNameString, ec).get());
if (!(*result))
return E_FAIL;
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMDocument::createDocumentFragment(
- /* [retval][out] */ IDeprecatedDOMDocumentFragment** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMDocument::createDocumentFragment(
+ /* [retval][out] */ IDOMDocumentFragment** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMDocument::createTextNode(
+HRESULT STDMETHODCALLTYPE DOMDocument::createTextNode(
/* [in] */ BSTR /*data*/,
- /* [retval][out] */ IDeprecatedDOMText** /*result*/)
+ /* [retval][out] */ IDOMText** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMDocument::createComment(
+HRESULT STDMETHODCALLTYPE DOMDocument::createComment(
/* [in] */ BSTR /*data*/,
- /* [retval][out] */ IDeprecatedDOMComment** /*result*/)
+ /* [retval][out] */ IDOMComment** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMDocument::createCDATASection(
+HRESULT STDMETHODCALLTYPE DOMDocument::createCDATASection(
/* [in] */ BSTR /*data*/,
- /* [retval][out] */ IDeprecatedDOMCDATASection** /*result*/)
+ /* [retval][out] */ IDOMCDATASection** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMDocument::createProcessingInstruction(
+HRESULT STDMETHODCALLTYPE DOMDocument::createProcessingInstruction(
/* [in] */ BSTR /*target*/,
/* [in] */ BSTR /*data*/,
- /* [retval][out] */ IDeprecatedDOMProcessingInstruction** /*result*/)
+ /* [retval][out] */ IDOMProcessingInstruction** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMDocument::createAttribute(
+HRESULT STDMETHODCALLTYPE DOMDocument::createAttribute(
/* [in] */ BSTR /*name*/,
- /* [retval][out] */ IDeprecatedDOMAttr** /*result*/)
+ /* [retval][out] */ IDOMAttr** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMDocument::createEntityReference(
+HRESULT STDMETHODCALLTYPE DOMDocument::createEntityReference(
/* [in] */ BSTR /*name*/,
- /* [retval][out] */ IDeprecatedDOMEntityReference** /*result*/)
+ /* [retval][out] */ IDOMEntityReference** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMDocument::getElementsByTagName(
+HRESULT STDMETHODCALLTYPE DOMDocument::getElementsByTagName(
/* [in] */ BSTR tagName,
- /* [retval][out] */ IDeprecatedDOMNodeList** result)
+ /* [retval][out] */ IDOMNodeList** result)
{
if (!m_document)
return E_FAIL;
String tagNameString(tagName);
- *result = DeprecatedDOMNodeList::createInstance(m_document->getElementsByTagName(tagNameString).get());
+ *result = DOMNodeList::createInstance(m_document->getElementsByTagName(tagNameString).get());
if (!(*result))
return E_FAIL;
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMDocument::importNode(
- /* [in] */ IDeprecatedDOMNode* /*importedNode*/,
+HRESULT STDMETHODCALLTYPE DOMDocument::importNode(
+ /* [in] */ IDOMNode* /*importedNode*/,
/* [in] */ BOOL /*deep*/,
- /* [retval][out] */ IDeprecatedDOMNode** /*result*/)
+ /* [retval][out] */ IDOMNode** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMDocument::createElementNS(
+HRESULT STDMETHODCALLTYPE DOMDocument::createElementNS(
/* [in] */ BSTR /*namespaceURI*/,
/* [in] */ BSTR /*qualifiedName*/,
- /* [retval][out] */ IDeprecatedDOMElement** /*result*/)
+ /* [retval][out] */ IDOMElement** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMDocument::createAttributeNS(
+HRESULT STDMETHODCALLTYPE DOMDocument::createAttributeNS(
/* [in] */ BSTR /*namespaceURI*/,
/* [in] */ BSTR /*qualifiedName*/,
- /* [retval][out] */ IDeprecatedDOMAttr** /*result*/)
+ /* [retval][out] */ IDOMAttr** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMDocument::getElementsByTagNameNS(
+HRESULT STDMETHODCALLTYPE DOMDocument::getElementsByTagNameNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR localName,
- /* [retval][out] */ IDeprecatedDOMNodeList** result)
+ /* [retval][out] */ IDOMNodeList** result)
{
if (!m_document)
return E_FAIL;
String namespaceURIString(namespaceURI);
String localNameString(localName);
- *result = DeprecatedDOMNodeList::createInstance(m_document->getElementsByTagNameNS(namespaceURIString, localNameString).get());
+ *result = DOMNodeList::createInstance(m_document->getElementsByTagNameNS(namespaceURIString, localNameString).get());
if (!(*result))
return E_FAIL;
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMDocument::getElementById(
+HRESULT STDMETHODCALLTYPE DOMDocument::getElementById(
/* [in] */ BSTR /*elementId*/,
- /* [retval][out] */ IDeprecatedDOMElement** /*result*/)
+ /* [retval][out] */ IDOMElement** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-// DeprecatedDOMDocument - IDeprecatedDOMViewCSS --------------------------------------------------
+// DOMDocument - IDOMViewCSS --------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMDocument::getComputedStyle(
- /* [in] */ IDeprecatedDOMElement* elt,
+HRESULT STDMETHODCALLTYPE DOMDocument::getComputedStyle(
+ /* [in] */ IDOMElement* elt,
/* [in] */ BSTR pseudoElt,
- /* [retval][out] */ IDeprecatedDOMCSSStyleDeclaration** result)
+ /* [retval][out] */ IDOMCSSStyleDeclaration** result)
{
if (!elt || !result)
return E_POINTER;
- COMPtr<DeprecatedDOMElement> domEle;
- HRESULT hr = elt->QueryInterface(IID_DeprecatedDOMElement, (void**)&domEle);
+ COMPtr<DOMElement> domEle;
+ HRESULT hr = elt->QueryInterface(IID_DOMElement, (void**)&domEle);
if (FAILED(hr))
return hr;
Element* element = domEle->element();
if (!dv)
return E_FAIL;
- *result = DeprecatedDOMCSSStyleDeclaration::createInstance(dv->getComputedStyle(element, pseudoEltString.impl()).get());
+ *result = DOMCSSStyleDeclaration::createInstance(dv->getComputedStyle(element, pseudoEltString.impl()).get());
return S_OK;
}
-// DeprecatedDOMDocument - IDeprecatedDOMDocumentEvent --------------------------------------------
+// DOMDocument - IDOMDocumentEvent --------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMDocument::createEvent(
+HRESULT STDMETHODCALLTYPE DOMDocument::createEvent(
/* [in] */ BSTR eventType,
- /* [retval][out] */ IDeprecatedDOMEvent **result)
+ /* [retval][out] */ IDOMEvent **result)
{
String eventTypeString(eventType, SysStringLen(eventType));
WebCore::ExceptionCode ec = 0;
- *result = DeprecatedDOMEvent::createInstance(m_document->createEvent(eventTypeString, ec));
+ *result = DOMEvent::createInstance(m_document->createEvent(eventTypeString, ec));
return S_OK;
}
-// DeprecatedDOMDocument - DeprecatedDOMDocument --------------------------------------------------
+// DOMDocument - DOMDocument --------------------------------------------------
-DeprecatedDOMDocument::DeprecatedDOMDocument(WebCore::Document* d)
-: DeprecatedDOMNode(d)
+DOMDocument::DOMDocument(WebCore::Document* d)
+: DOMNode(d)
, m_document(d)
{
}
-DeprecatedDOMDocument::~DeprecatedDOMDocument()
+DOMDocument::~DOMDocument()
{
}
-IDeprecatedDOMDocument* DeprecatedDOMDocument::createInstance(WebCore::Document* d)
+IDOMDocument* DOMDocument::createInstance(WebCore::Document* d)
{
if (!d)
return 0;
HRESULT hr;
- IDeprecatedDOMDocument* domDocument = 0;
+ IDOMDocument* domDocument = 0;
if (d->isHTMLDocument()) {
- DeprecatedDOMHTMLDocument* newDocument = new DeprecatedDOMHTMLDocument(d);
- hr = newDocument->QueryInterface(IID_IDeprecatedDOMDocument, (void**)&domDocument);
+ DOMHTMLDocument* newDocument = new DOMHTMLDocument(d);
+ hr = newDocument->QueryInterface(IID_IDOMDocument, (void**)&domDocument);
} else {
- DeprecatedDOMDocument* newDocument = new DeprecatedDOMDocument(d);
- hr = newDocument->QueryInterface(IID_IDeprecatedDOMDocument, (void**)&domDocument);
+ DOMDocument* newDocument = new DOMDocument(d);
+ hr = newDocument->QueryInterface(IID_IDOMDocument, (void**)&domDocument);
}
if (FAILED(hr))
return domDocument;
}
-// DeprecatedDOMElement - IUnknown ------------------------------------------------------
+// DOMElement - IUnknown ------------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::QueryInterface(REFIID riid, void** ppvObject)
+HRESULT STDMETHODCALLTYPE DOMElement::QueryInterface(REFIID riid, void** ppvObject)
{
*ppvObject = 0;
- if (IsEqualGUID(riid, IID_IDeprecatedDOMElement))
- *ppvObject = static_cast<IDeprecatedDOMElement*>(this);
- else if (IsEqualGUID(riid, IID_DeprecatedDOMElement))
- *ppvObject = static_cast<DeprecatedDOMElement*>(this);
- else if (IsEqualGUID(riid, IID_IDeprecatedDOMElementPrivate))
- *ppvObject = static_cast<IDeprecatedDOMElementPrivate*>(this);
- else if (IsEqualGUID(riid, IID_IDeprecatedDOMNodeExtensions))
- *ppvObject = static_cast<IDeprecatedDOMNodeExtensions*>(this);
- else if (IsEqualGUID(riid, IID_IDeprecatedDOMElementCSSInlineStyle))
- *ppvObject = static_cast<IDeprecatedDOMElementCSSInlineStyle*>(this);
- else if (IsEqualGUID(riid, IID_IDeprecatedDOMElementExtensions))
- *ppvObject = static_cast<IDeprecatedDOMElementExtensions*>(this);
+ if (IsEqualGUID(riid, IID_IDOMElement))
+ *ppvObject = static_cast<IDOMElement*>(this);
+ else if (IsEqualGUID(riid, IID_DOMElement))
+ *ppvObject = static_cast<DOMElement*>(this);
+ else if (IsEqualGUID(riid, IID_IDOMElementPrivate))
+ *ppvObject = static_cast<IDOMElementPrivate*>(this);
+ else if (IsEqualGUID(riid, IID_IDOMNodeExtensions))
+ *ppvObject = static_cast<IDOMNodeExtensions*>(this);
+ else if (IsEqualGUID(riid, IID_IDOMElementCSSInlineStyle))
+ *ppvObject = static_cast<IDOMElementCSSInlineStyle*>(this);
+ else if (IsEqualGUID(riid, IID_IDOMElementExtensions))
+ *ppvObject = static_cast<IDOMElementExtensions*>(this);
else
- return DeprecatedDOMNode::QueryInterface(riid, ppvObject);
+ return DOMNode::QueryInterface(riid, ppvObject);
AddRef();
return S_OK;
}
-// DeprecatedDOMElement - IDeprecatedDOMNodeExtensions---------------------------------------------
+// DOMElement - IDOMNodeExtensions---------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::boundingBox(
+HRESULT STDMETHODCALLTYPE DOMElement::boundingBox(
/* [retval][out] */ LPRECT rect)
{
::SetRectEmpty(rect);
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::lineBoxRects(
+HRESULT STDMETHODCALLTYPE DOMElement::lineBoxRects(
/* [size_is][in] */ RECT* /*rects*/,
/* [in] */ int /*cRects*/)
{
return E_NOTIMPL;
}
-// IDeprecatedDOMElement ----------------------------------------------------------------
+// IDOMElement ----------------------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::tagName(
+HRESULT STDMETHODCALLTYPE DOMElement::tagName(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::getAttribute(
+HRESULT STDMETHODCALLTYPE DOMElement::getAttribute(
/* [in] */ BSTR name,
/* [retval][out] */ BSTR* result)
{
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::setAttribute(
+HRESULT STDMETHODCALLTYPE DOMElement::setAttribute(
/* [in] */ BSTR name,
/* [in] */ BSTR value)
{
return ec ? E_FAIL : S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::removeAttribute(
+HRESULT STDMETHODCALLTYPE DOMElement::removeAttribute(
/* [in] */ BSTR /*name*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::getAttributeNode(
+HRESULT STDMETHODCALLTYPE DOMElement::getAttributeNode(
/* [in] */ BSTR /*name*/,
- /* [retval][out] */ IDeprecatedDOMAttr** /*result*/)
+ /* [retval][out] */ IDOMAttr** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::setAttributeNode(
- /* [in] */ IDeprecatedDOMAttr* /*newAttr*/,
- /* [retval][out] */ IDeprecatedDOMAttr** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMElement::setAttributeNode(
+ /* [in] */ IDOMAttr* /*newAttr*/,
+ /* [retval][out] */ IDOMAttr** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::removeAttributeNode(
- /* [in] */ IDeprecatedDOMAttr* /*oldAttr*/,
- /* [retval][out] */ IDeprecatedDOMAttr** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMElement::removeAttributeNode(
+ /* [in] */ IDOMAttr* /*oldAttr*/,
+ /* [retval][out] */ IDOMAttr** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::getElementsByTagName(
+HRESULT STDMETHODCALLTYPE DOMElement::getElementsByTagName(
/* [in] */ BSTR /*name*/,
- /* [retval][out] */ IDeprecatedDOMNodeList** /*result*/)
+ /* [retval][out] */ IDOMNodeList** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::getAttributeNS(
+HRESULT STDMETHODCALLTYPE DOMElement::getAttributeNS(
/* [in] */ BSTR /*namespaceURI*/,
/* [in] */ BSTR /*localName*/,
/* [retval][out] */ BSTR* /*result*/)
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::setAttributeNS(
+HRESULT STDMETHODCALLTYPE DOMElement::setAttributeNS(
/* [in] */ BSTR /*namespaceURI*/,
/* [in] */ BSTR /*qualifiedName*/,
/* [in] */ BSTR /*value*/)
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::removeAttributeNS(
+HRESULT STDMETHODCALLTYPE DOMElement::removeAttributeNS(
/* [in] */ BSTR /*namespaceURI*/,
/* [in] */ BSTR /*localName*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::getAttributeNodeNS(
+HRESULT STDMETHODCALLTYPE DOMElement::getAttributeNodeNS(
/* [in] */ BSTR /*namespaceURI*/,
/* [in] */ BSTR /*localName*/,
- /* [retval][out] */ IDeprecatedDOMAttr** /*result*/)
+ /* [retval][out] */ IDOMAttr** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::setAttributeNodeNS(
- /* [in] */ IDeprecatedDOMAttr* /*newAttr*/,
- /* [retval][out] */ IDeprecatedDOMAttr** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMElement::setAttributeNodeNS(
+ /* [in] */ IDOMAttr* /*newAttr*/,
+ /* [retval][out] */ IDOMAttr** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::getElementsByTagNameNS(
+HRESULT STDMETHODCALLTYPE DOMElement::getElementsByTagNameNS(
/* [in] */ BSTR /*namespaceURI*/,
/* [in] */ BSTR /*localName*/,
- /* [retval][out] */ IDeprecatedDOMNodeList** /*result*/)
+ /* [retval][out] */ IDOMNodeList** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::hasAttribute(
+HRESULT STDMETHODCALLTYPE DOMElement::hasAttribute(
/* [in] */ BSTR /*name*/,
/* [retval][out] */ BOOL* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::hasAttributeNS(
+HRESULT STDMETHODCALLTYPE DOMElement::hasAttributeNS(
/* [in] */ BSTR /*namespaceURI*/,
/* [in] */ BSTR /*localName*/,
/* [retval][out] */ BOOL* /*result*/)
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::focus( void)
+HRESULT STDMETHODCALLTYPE DOMElement::focus( void)
{
if (!m_element)
return E_FAIL;
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::blur( void)
+HRESULT STDMETHODCALLTYPE DOMElement::blur( void)
{
if (!m_element)
return E_FAIL;
return S_OK;
}
-// IDeprecatedDOMElementPrivate ---------------------------------------------------------
+// IDOMElementPrivate ---------------------------------------------------------
-HRESULT DeprecatedDOMElement::coreElement(void **element)
+HRESULT DOMElement::coreElement(void **element)
{
if (!m_element)
return E_FAIL;
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::isEqual(
- /* [in] */ IDeprecatedDOMElement *other,
+HRESULT STDMETHODCALLTYPE DOMElement::isEqual(
+ /* [in] */ IDOMElement *other,
/* [retval][out] */ BOOL *result)
{
*result = FALSE;
if (!other || !result)
return E_POINTER;
- IDeprecatedDOMElementPrivate* otherPriv;
- HRESULT hr = other->QueryInterface(IID_IDeprecatedDOMElementPrivate, (void**) &otherPriv);
+ IDOMElementPrivate* otherPriv;
+ HRESULT hr = other->QueryInterface(IID_IDOMElementPrivate, (void**) &otherPriv);
if (FAILED(hr))
return hr;
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::isFocused(
+HRESULT STDMETHODCALLTYPE DOMElement::isFocused(
/* [retval][out] */ BOOL *result)
{
if (!m_element)
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::innerText(
+HRESULT STDMETHODCALLTYPE DOMElement::innerText(
/* [retval][out] */ BSTR* result)
{
if (!result) {
return S_OK;
}
-// IDeprecatedDOMElementCSSInlineStyle --------------------------------------------------
+// IDOMElementCSSInlineStyle --------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::style(
- /* [retval][out] */ IDeprecatedDOMCSSStyleDeclaration** result)
+HRESULT STDMETHODCALLTYPE DOMElement::style(
+ /* [retval][out] */ IDOMCSSStyleDeclaration** result)
{
if (!result)
return E_POINTER;
if (!style)
return E_FAIL;
- *result = DeprecatedDOMCSSStyleDeclaration::createInstance(style);
+ *result = DOMCSSStyleDeclaration::createInstance(style);
return S_OK;
}
-// IDeprecatedDOMElementExtensions ------------------------------------------------------
+// IDOMElementExtensions ------------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::offsetLeft(
+HRESULT STDMETHODCALLTYPE DOMElement::offsetLeft(
/* [retval][out] */ int* result)
{
if (!m_element)
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::offsetTop(
+HRESULT STDMETHODCALLTYPE DOMElement::offsetTop(
/* [retval][out] */ int* result)
{
if (!m_element)
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::offsetWidth(
+HRESULT STDMETHODCALLTYPE DOMElement::offsetWidth(
/* [retval][out] */ int* result)
{
if (!m_element)
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::offsetHeight(
+HRESULT STDMETHODCALLTYPE DOMElement::offsetHeight(
/* [retval][out] */ int* result)
{
if (!m_element)
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::offsetParent(
- /* [retval][out] */ IDeprecatedDOMElement** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMElement::offsetParent(
+ /* [retval][out] */ IDOMElement** /*result*/)
{
// FIXME
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::clientWidth(
+HRESULT STDMETHODCALLTYPE DOMElement::clientWidth(
/* [retval][out] */ int* result)
{
if (!m_element)
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::clientHeight(
+HRESULT STDMETHODCALLTYPE DOMElement::clientHeight(
/* [retval][out] */ int* result)
{
if (!m_element)
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::scrollLeft(
+HRESULT STDMETHODCALLTYPE DOMElement::scrollLeft(
/* [retval][out] */ int* result)
{
if (!m_element)
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::setScrollLeft(
+HRESULT STDMETHODCALLTYPE DOMElement::setScrollLeft(
/* [in] */ int /*newScrollLeft*/)
{
// FIXME
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::scrollTop(
+HRESULT STDMETHODCALLTYPE DOMElement::scrollTop(
/* [retval][out] */ int* result)
{
if (!m_element)
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::setScrollTop(
+HRESULT STDMETHODCALLTYPE DOMElement::setScrollTop(
/* [in] */ int /*newScrollTop*/)
{
// FIXME
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::scrollWidth(
+HRESULT STDMETHODCALLTYPE DOMElement::scrollWidth(
/* [retval][out] */ int* result)
{
if (!m_element)
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::scrollHeight(
+HRESULT STDMETHODCALLTYPE DOMElement::scrollHeight(
/* [retval][out] */ int* result)
{
if (!m_element)
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::scrollIntoView(
+HRESULT STDMETHODCALLTYPE DOMElement::scrollIntoView(
/* [in] */ BOOL alignWithTop)
{
if (!m_element)
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMElement::scrollIntoViewIfNeeded(
+HRESULT STDMETHODCALLTYPE DOMElement::scrollIntoViewIfNeeded(
/* [in] */ BOOL centerIfNeeded)
{
if (!m_element)
return S_OK;
}
-// DeprecatedDOMElement -----------------------------------------------------------------
+// DOMElement -----------------------------------------------------------------
-DeprecatedDOMElement::DeprecatedDOMElement(WebCore::Element* e)
-: DeprecatedDOMNode(e)
+DOMElement::DOMElement(WebCore::Element* e)
+: DOMNode(e)
, m_element(e)
{
}
-DeprecatedDOMElement::~DeprecatedDOMElement()
+DOMElement::~DOMElement()
{
}
-IDeprecatedDOMElement* DeprecatedDOMElement::createInstance(WebCore::Element* e)
+IDOMElement* DOMElement::createInstance(WebCore::Element* e)
{
if (!e)
return 0;
HRESULT hr;
- IDeprecatedDOMElement* domElement = 0;
+ IDOMElement* domElement = 0;
if (e->hasTagName(formTag)) {
- DeprecatedDOMHTMLFormElement* newElement = new DeprecatedDOMHTMLFormElement(e);
- hr = newElement->QueryInterface(IID_IDeprecatedDOMElement, (void**)&domElement);
+ DOMHTMLFormElement* newElement = new DOMHTMLFormElement(e);
+ hr = newElement->QueryInterface(IID_IDOMElement, (void**)&domElement);
} else if (e->hasTagName(selectTag)) {
- DeprecatedDOMHTMLSelectElement* newElement = new DeprecatedDOMHTMLSelectElement(e);
- hr = newElement->QueryInterface(IID_IDeprecatedDOMElement, (void**)&domElement);
+ DOMHTMLSelectElement* newElement = new DOMHTMLSelectElement(e);
+ hr = newElement->QueryInterface(IID_IDOMElement, (void**)&domElement);
} else if (e->hasTagName(optionTag)) {
- DeprecatedDOMHTMLOptionElement* newElement = new DeprecatedDOMHTMLOptionElement(e);
- hr = newElement->QueryInterface(IID_IDeprecatedDOMElement, (void**)&domElement);
+ DOMHTMLOptionElement* newElement = new DOMHTMLOptionElement(e);
+ hr = newElement->QueryInterface(IID_IDOMElement, (void**)&domElement);
} else if (e->hasTagName(inputTag)) {
- DeprecatedDOMHTMLInputElement* newElement = new DeprecatedDOMHTMLInputElement(e);
- hr = newElement->QueryInterface(IID_IDeprecatedDOMElement, (void**)&domElement);
+ DOMHTMLInputElement* newElement = new DOMHTMLInputElement(e);
+ hr = newElement->QueryInterface(IID_IDOMElement, (void**)&domElement);
} else if (e->hasTagName(textareaTag)) {
- DeprecatedDOMHTMLTextAreaElement* newElement = new DeprecatedDOMHTMLTextAreaElement(e);
- hr = newElement->QueryInterface(IID_IDeprecatedDOMElement, (void**)&domElement);
+ DOMHTMLTextAreaElement* newElement = new DOMHTMLTextAreaElement(e);
+ hr = newElement->QueryInterface(IID_IDOMElement, (void**)&domElement);
} else if (e->isHTMLElement()) {
- DeprecatedDOMHTMLElement* newElement = new DeprecatedDOMHTMLElement(e);
- hr = newElement->QueryInterface(IID_IDeprecatedDOMElement, (void**)&domElement);
+ DOMHTMLElement* newElement = new DOMHTMLElement(e);
+ hr = newElement->QueryInterface(IID_IDOMElement, (void**)&domElement);
} else {
- DeprecatedDOMElement* newElement = new DeprecatedDOMElement(e);
- hr = newElement->QueryInterface(IID_IDeprecatedDOMElement, (void**)&domElement);
+ DOMElement* newElement = new DOMElement(e);
+ hr = newElement->QueryInterface(IID_IDOMElement, (void**)&domElement);
}
if (FAILED(hr))
#include "WebScriptObject.h"
// {79A193A5-D783-4c73-9AD9-D10678B943DE}
-DEFINE_GUID(IID_DeprecatedDOMNode, 0x79a193a5, 0xd783, 0x4c73, 0x9a, 0xd9, 0xd1, 0x6, 0x78, 0xb9, 0x43, 0xde);
+DEFINE_GUID(IID_DOMNode, 0x79a193a5, 0xd783, 0x4c73, 0x9a, 0xd9, 0xd1, 0x6, 0x78, 0xb9, 0x43, 0xde);
namespace WebCore {
class Element;
class NodeList;
}
-class DeprecatedDOMObject : public WebScriptObject, public IDeprecatedDOMObject
+class DOMObject : public WebScriptObject, public IDOMObject
{
public:
// IUnknown
/* [in] */ BSTR description) { return WebScriptObject::setException(description); }
};
-class DeprecatedDOMNode : public DeprecatedDOMObject, public IDeprecatedDOMNode, public IDeprecatedDOMEventTarget
+class DOMNode : public DOMObject, public IDOMNode, public IDOMEventTarget
{
protected:
- DeprecatedDOMNode(WebCore::Node* n);
- ~DeprecatedDOMNode();
+ DOMNode(WebCore::Node* n);
+ ~DOMNode();
public:
- static IDeprecatedDOMNode* createInstance(WebCore::Node* n);
+ static IDOMNode* createInstance(WebCore::Node* n);
public:
// IUnknown
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
- virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DeprecatedDOMObject::AddRef(); }
- virtual ULONG STDMETHODCALLTYPE Release(void) { return DeprecatedDOMObject::Release(); }
+ virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DOMObject::AddRef(); }
+ virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMObject::Release(); }
// IWebScriptObject
virtual HRESULT STDMETHODCALLTYPE throwException(
/* [in] */ BSTR exceptionMessage,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMObject::throwException(exceptionMessage, result); }
+ /* [retval][out] */ BOOL *result) { return DOMObject::throwException(exceptionMessage, result); }
virtual HRESULT STDMETHODCALLTYPE callWebScriptMethod(
/* [in] */ BSTR name,
/* [size_is][in] */ const VARIANT args[ ],
/* [in] */ int cArgs,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMObject::callWebScriptMethod(name, args, cArgs, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMObject::callWebScriptMethod(name, args, cArgs, result); }
virtual HRESULT STDMETHODCALLTYPE evaluateWebScript(
/* [in] */ BSTR script,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMObject::evaluateWebScript(script, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMObject::evaluateWebScript(script, result); }
virtual HRESULT STDMETHODCALLTYPE removeWebScriptKey(
- /* [in] */ BSTR name) { return DeprecatedDOMObject::removeWebScriptKey(name); }
+ /* [in] */ BSTR name) { return DOMObject::removeWebScriptKey(name); }
virtual HRESULT STDMETHODCALLTYPE stringRepresentation(
- /* [retval][out] */ BSTR* stringRepresentation) { return DeprecatedDOMObject::stringRepresentation(stringRepresentation); }
+ /* [retval][out] */ BSTR* stringRepresentation) { return DOMObject::stringRepresentation(stringRepresentation); }
virtual HRESULT STDMETHODCALLTYPE webScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMObject::webScriptValueAtIndex(index, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMObject::webScriptValueAtIndex(index, result); }
virtual HRESULT STDMETHODCALLTYPE setWebScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [in] */ VARIANT val) { return DeprecatedDOMObject::setWebScriptValueAtIndex(index, val); }
+ /* [in] */ VARIANT val) { return DOMObject::setWebScriptValueAtIndex(index, val); }
virtual HRESULT STDMETHODCALLTYPE setException(
- /* [in] */ BSTR description) { return DeprecatedDOMObject::setException(description); }
+ /* [in] */ BSTR description) { return DOMObject::setException(description); }
- // IDeprecatedDOMNode
+ // IDOMNode
virtual HRESULT STDMETHODCALLTYPE nodeName(
/* [retval][out] */ BSTR *result);
/* [retval][out] */ unsigned short *result);
virtual HRESULT STDMETHODCALLTYPE parentNode(
- /* [retval][out] */ IDeprecatedDOMNode **result);
+ /* [retval][out] */ IDOMNode **result);
virtual HRESULT STDMETHODCALLTYPE childNodes(
- /* [retval][out] */ IDeprecatedDOMNodeList **result);
+ /* [retval][out] */ IDOMNodeList **result);
virtual HRESULT STDMETHODCALLTYPE firstChild(
- /* [retval][out] */ IDeprecatedDOMNode **result);
+ /* [retval][out] */ IDOMNode **result);
virtual HRESULT STDMETHODCALLTYPE lastChild(
- /* [retval][out] */ IDeprecatedDOMNode **result);
+ /* [retval][out] */ IDOMNode **result);
virtual HRESULT STDMETHODCALLTYPE previousSibling(
- /* [retval][out] */ IDeprecatedDOMNode **result);
+ /* [retval][out] */ IDOMNode **result);
virtual HRESULT STDMETHODCALLTYPE nextSibling(
- /* [retval][out] */ IDeprecatedDOMNode **result);
+ /* [retval][out] */ IDOMNode **result);
virtual HRESULT STDMETHODCALLTYPE attributes(
- /* [retval][out] */ IDeprecatedDOMNamedNodeMap **result);
+ /* [retval][out] */ IDOMNamedNodeMap **result);
virtual HRESULT STDMETHODCALLTYPE ownerDocument(
- /* [retval][out] */ IDeprecatedDOMDocument **result);
+ /* [retval][out] */ IDOMDocument **result);
virtual HRESULT STDMETHODCALLTYPE insertBefore(
- /* [in] */ IDeprecatedDOMNode *newChild,
- /* [in] */ IDeprecatedDOMNode *refChild,
- /* [retval][out] */ IDeprecatedDOMNode **result);
+ /* [in] */ IDOMNode *newChild,
+ /* [in] */ IDOMNode *refChild,
+ /* [retval][out] */ IDOMNode **result);
virtual HRESULT STDMETHODCALLTYPE replaceChild(
- /* [in] */ IDeprecatedDOMNode *newChild,
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result);
+ /* [in] */ IDOMNode *newChild,
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result);
virtual HRESULT STDMETHODCALLTYPE removeChild(
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result);
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result);
virtual HRESULT STDMETHODCALLTYPE appendChild(
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result);
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result);
virtual HRESULT STDMETHODCALLTYPE hasChildNodes(
/* [retval][out] */ BOOL *result);
virtual HRESULT STDMETHODCALLTYPE cloneNode(
/* [in] */ BOOL deep,
- /* [retval][out] */ IDeprecatedDOMNode **result);
+ /* [retval][out] */ IDOMNode **result);
virtual HRESULT STDMETHODCALLTYPE normalize( void);
/* [retval][out] */ BOOL *result);
virtual HRESULT STDMETHODCALLTYPE isSameNode(
- /* [in] */ IDeprecatedDOMNode* other,
+ /* [in] */ IDOMNode* other,
/* [retval][out] */ BOOL* result);
virtual HRESULT STDMETHODCALLTYPE isEqualNode(
- /* [in] */ IDeprecatedDOMNode* other,
+ /* [in] */ IDOMNode* other,
/* [retval][out] */ BOOL* result);
virtual HRESULT STDMETHODCALLTYPE textContent(
virtual HRESULT STDMETHODCALLTYPE setTextContent(
/* [in] */ BSTR text);
- // IDeprecatedDOMEventTarget
+ // IDOMEventTarget
virtual HRESULT STDMETHODCALLTYPE addEventListener(
/* [in] */ BSTR type,
- /* [in] */ IDeprecatedDOMEventListener *listener,
+ /* [in] */ IDOMEventListener *listener,
/* [in] */ BOOL useCapture);
virtual HRESULT STDMETHODCALLTYPE removeEventListener(
/* [in] */ BSTR type,
- /* [in] */ IDeprecatedDOMEventListener *listener,
+ /* [in] */ IDOMEventListener *listener,
/* [in] */ BOOL useCapture);
virtual HRESULT STDMETHODCALLTYPE dispatchEvent(
- /* [in] */ IDeprecatedDOMEvent *evt,
+ /* [in] */ IDOMEvent *evt,
/* [retval][out] */ BOOL *result);
- // DeprecatedDOMNode
+ // DOMNode
WebCore::Node* node() const { return m_node; }
protected:
WebCore::Node* m_node;
};
-class DeprecatedDOMNodeList : public DeprecatedDOMObject, public IDeprecatedDOMNodeList
+class DOMNodeList : public DOMObject, public IDOMNodeList
{
protected:
- DeprecatedDOMNodeList(WebCore::NodeList* l);
- ~DeprecatedDOMNodeList();
+ DOMNodeList(WebCore::NodeList* l);
+ ~DOMNodeList();
public:
- static IDeprecatedDOMNodeList* createInstance(WebCore::NodeList* l);
+ static IDOMNodeList* createInstance(WebCore::NodeList* l);
public:
// IUnknown
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
- virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DeprecatedDOMObject::AddRef(); }
- virtual ULONG STDMETHODCALLTYPE Release(void) { return DeprecatedDOMObject::Release(); }
+ virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DOMObject::AddRef(); }
+ virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMObject::Release(); }
// IWebScriptObject
virtual HRESULT STDMETHODCALLTYPE throwException(
/* [in] */ BSTR exceptionMessage,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMObject::throwException(exceptionMessage, result); }
+ /* [retval][out] */ BOOL *result) { return DOMObject::throwException(exceptionMessage, result); }
virtual HRESULT STDMETHODCALLTYPE callWebScriptMethod(
/* [in] */ BSTR name,
/* [size_is][in] */ const VARIANT args[ ],
/* [in] */ int cArgs,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMObject::callWebScriptMethod(name, args, cArgs, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMObject::callWebScriptMethod(name, args, cArgs, result); }
virtual HRESULT STDMETHODCALLTYPE evaluateWebScript(
/* [in] */ BSTR script,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMObject::evaluateWebScript(script, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMObject::evaluateWebScript(script, result); }
virtual HRESULT STDMETHODCALLTYPE removeWebScriptKey(
- /* [in] */ BSTR name) { return DeprecatedDOMObject::removeWebScriptKey(name); }
+ /* [in] */ BSTR name) { return DOMObject::removeWebScriptKey(name); }
virtual HRESULT STDMETHODCALLTYPE stringRepresentation(
- /* [retval][out] */ BSTR* stringRepresentation) { return DeprecatedDOMObject::stringRepresentation(stringRepresentation); }
+ /* [retval][out] */ BSTR* stringRepresentation) { return DOMObject::stringRepresentation(stringRepresentation); }
virtual HRESULT STDMETHODCALLTYPE webScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMObject::webScriptValueAtIndex(index, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMObject::webScriptValueAtIndex(index, result); }
virtual HRESULT STDMETHODCALLTYPE setWebScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [in] */ VARIANT val) { return DeprecatedDOMObject::setWebScriptValueAtIndex(index, val); }
+ /* [in] */ VARIANT val) { return DOMObject::setWebScriptValueAtIndex(index, val); }
virtual HRESULT STDMETHODCALLTYPE setException(
- /* [in] */ BSTR description) { return DeprecatedDOMObject::setException(description); }
+ /* [in] */ BSTR description) { return DOMObject::setException(description); }
- // IDeprecatedDOMNodeList
+ // IDOMNodeList
virtual HRESULT STDMETHODCALLTYPE item(
/* [in] */ UINT index,
- /* [retval][out] */ IDeprecatedDOMNode **result);
+ /* [retval][out] */ IDOMNode **result);
virtual HRESULT STDMETHODCALLTYPE length(
/* [retval][out] */ UINT *result);
WebCore::NodeList* m_nodeList;
};
-class DeprecatedDOMDocument : public DeprecatedDOMNode, public IDeprecatedDOMDocument, public IDeprecatedDOMViewCSS, public IDeprecatedDOMDocumentEvent
+class DOMDocument : public DOMNode, public IDOMDocument, public IDOMViewCSS, public IDOMDocumentEvent
{
protected:
- DeprecatedDOMDocument(WebCore::Document* d);
- ~DeprecatedDOMDocument();
+ DOMDocument(WebCore::Document* d);
+ ~DOMDocument();
public:
- static IDeprecatedDOMDocument* createInstance(WebCore::Document* d);
+ static IDOMDocument* createInstance(WebCore::Document* d);
public:
// IUnknown
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
- virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DeprecatedDOMNode::AddRef(); }
- virtual ULONG STDMETHODCALLTYPE Release(void) { return DeprecatedDOMNode::Release(); }
+ virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DOMNode::AddRef(); }
+ virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMNode::Release(); }
// IWebScriptObject
virtual HRESULT STDMETHODCALLTYPE throwException(
/* [in] */ BSTR exceptionMessage,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMNode::throwException(exceptionMessage, result); }
+ /* [retval][out] */ BOOL *result) { return DOMNode::throwException(exceptionMessage, result); }
virtual HRESULT STDMETHODCALLTYPE callWebScriptMethod(
/* [in] */ BSTR name,
/* [size_is][in] */ const VARIANT args[ ],
/* [in] */ int cArgs,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMNode::callWebScriptMethod(name, args, cArgs, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMNode::callWebScriptMethod(name, args, cArgs, result); }
virtual HRESULT STDMETHODCALLTYPE evaluateWebScript(
/* [in] */ BSTR script,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMNode::evaluateWebScript(script, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMNode::evaluateWebScript(script, result); }
virtual HRESULT STDMETHODCALLTYPE removeWebScriptKey(
- /* [in] */ BSTR name) { return DeprecatedDOMNode::removeWebScriptKey(name); }
+ /* [in] */ BSTR name) { return DOMNode::removeWebScriptKey(name); }
virtual HRESULT STDMETHODCALLTYPE stringRepresentation(
- /* [retval][out] */ BSTR* stringRepresentation) { return DeprecatedDOMNode::stringRepresentation(stringRepresentation); }
+ /* [retval][out] */ BSTR* stringRepresentation) { return DOMNode::stringRepresentation(stringRepresentation); }
virtual HRESULT STDMETHODCALLTYPE webScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMNode::webScriptValueAtIndex(index, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMNode::webScriptValueAtIndex(index, result); }
virtual HRESULT STDMETHODCALLTYPE setWebScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [in] */ VARIANT val) { return DeprecatedDOMNode::setWebScriptValueAtIndex(index, val); }
+ /* [in] */ VARIANT val) { return DOMNode::setWebScriptValueAtIndex(index, val); }
virtual HRESULT STDMETHODCALLTYPE setException(
- /* [in] */ BSTR description) { return DeprecatedDOMNode::setException(description); }
+ /* [in] */ BSTR description) { return DOMNode::setException(description); }
- // IDeprecatedDOMNode
+ // IDOMNode
virtual HRESULT STDMETHODCALLTYPE nodeName(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMNode::nodeName(result); }
+ /* [retval][out] */ BSTR *result) { return DOMNode::nodeName(result); }
virtual HRESULT STDMETHODCALLTYPE nodeValue(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMNode::nodeValue(result); }
+ /* [retval][out] */ BSTR *result) { return DOMNode::nodeValue(result); }
virtual HRESULT STDMETHODCALLTYPE setNodeValue(
- /* [in] */ BSTR value) { return DeprecatedDOMNode::setNodeValue(value); }
+ /* [in] */ BSTR value) { return DOMNode::setNodeValue(value); }
virtual HRESULT STDMETHODCALLTYPE nodeType(
- /* [retval][out] */ unsigned short *result) { return DeprecatedDOMNode::nodeType(result); }
+ /* [retval][out] */ unsigned short *result) { return DOMNode::nodeType(result); }
virtual HRESULT STDMETHODCALLTYPE parentNode(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMNode::parentNode(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMNode::parentNode(result); }
virtual HRESULT STDMETHODCALLTYPE childNodes(
- /* [retval][out] */ IDeprecatedDOMNodeList **result) { return DeprecatedDOMNode::childNodes(result); }
+ /* [retval][out] */ IDOMNodeList **result) { return DOMNode::childNodes(result); }
virtual HRESULT STDMETHODCALLTYPE firstChild(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMNode::firstChild(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMNode::firstChild(result); }
virtual HRESULT STDMETHODCALLTYPE lastChild(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMNode::lastChild(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMNode::lastChild(result); }
virtual HRESULT STDMETHODCALLTYPE previousSibling(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMNode::previousSibling(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMNode::previousSibling(result); }
virtual HRESULT STDMETHODCALLTYPE nextSibling(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMNode::nextSibling(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMNode::nextSibling(result); }
virtual HRESULT STDMETHODCALLTYPE attributes(
- /* [retval][out] */ IDeprecatedDOMNamedNodeMap **result) { return DeprecatedDOMNode::attributes(result); }
+ /* [retval][out] */ IDOMNamedNodeMap **result) { return DOMNode::attributes(result); }
virtual HRESULT STDMETHODCALLTYPE ownerDocument(
- /* [retval][out] */ IDeprecatedDOMDocument **result) { return DeprecatedDOMNode::ownerDocument(result); }
+ /* [retval][out] */ IDOMDocument **result) { return DOMNode::ownerDocument(result); }
virtual HRESULT STDMETHODCALLTYPE insertBefore(
- /* [in] */ IDeprecatedDOMNode *newChild,
- /* [in] */ IDeprecatedDOMNode *refChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMNode::insertBefore(newChild, refChild, result); }
+ /* [in] */ IDOMNode *newChild,
+ /* [in] */ IDOMNode *refChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMNode::insertBefore(newChild, refChild, result); }
virtual HRESULT STDMETHODCALLTYPE replaceChild(
- /* [in] */ IDeprecatedDOMNode *newChild,
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMNode::replaceChild(newChild, oldChild, result); }
+ /* [in] */ IDOMNode *newChild,
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMNode::replaceChild(newChild, oldChild, result); }
virtual HRESULT STDMETHODCALLTYPE removeChild(
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMNode::removeChild(oldChild, result); }
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMNode::removeChild(oldChild, result); }
virtual HRESULT STDMETHODCALLTYPE appendChild(
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMNode::appendChild(oldChild, result); }
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMNode::appendChild(oldChild, result); }
virtual HRESULT STDMETHODCALLTYPE hasChildNodes(
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMNode::hasChildNodes(result); }
+ /* [retval][out] */ BOOL *result) { return DOMNode::hasChildNodes(result); }
virtual HRESULT STDMETHODCALLTYPE cloneNode(
/* [in] */ BOOL deep,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMNode::cloneNode(deep, result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMNode::cloneNode(deep, result); }
- virtual HRESULT STDMETHODCALLTYPE normalize( void) { return DeprecatedDOMNode::normalize(); }
+ virtual HRESULT STDMETHODCALLTYPE normalize( void) { return DOMNode::normalize(); }
virtual HRESULT STDMETHODCALLTYPE isSupported(
/* [in] */ BSTR feature,
/* [in] */ BSTR version,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMNode::isSupported(feature, version, result); }
+ /* [retval][out] */ BOOL *result) { return DOMNode::isSupported(feature, version, result); }
virtual HRESULT STDMETHODCALLTYPE namespaceURI(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMNode::namespaceURI(result); }
+ /* [retval][out] */ BSTR *result) { return DOMNode::namespaceURI(result); }
virtual HRESULT STDMETHODCALLTYPE prefix(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMNode::prefix(result); }
+ /* [retval][out] */ BSTR *result) { return DOMNode::prefix(result); }
virtual HRESULT STDMETHODCALLTYPE setPrefix(
- /* [in] */ BSTR prefix) { return DeprecatedDOMNode::setPrefix(prefix); }
+ /* [in] */ BSTR prefix) { return DOMNode::setPrefix(prefix); }
virtual HRESULT STDMETHODCALLTYPE localName(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMNode::localName(result); }
+ /* [retval][out] */ BSTR *result) { return DOMNode::localName(result); }
virtual HRESULT STDMETHODCALLTYPE hasAttributes(
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMNode::hasAttributes(result); }
+ /* [retval][out] */ BOOL *result) { return DOMNode::hasAttributes(result); }
virtual HRESULT STDMETHODCALLTYPE isSameNode(
- /* [in] */ IDeprecatedDOMNode* other,
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMNode::isSameNode(other, result); }
+ /* [in] */ IDOMNode* other,
+ /* [retval][out] */ BOOL* result) { return DOMNode::isSameNode(other, result); }
virtual HRESULT STDMETHODCALLTYPE isEqualNode(
- /* [in] */ IDeprecatedDOMNode* other,
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMNode::isEqualNode(other, result); }
+ /* [in] */ IDOMNode* other,
+ /* [retval][out] */ BOOL* result) { return DOMNode::isEqualNode(other, result); }
virtual HRESULT STDMETHODCALLTYPE textContent(
- /* [retval][out] */ BSTR* result) { return DeprecatedDOMNode::textContent(result); }
+ /* [retval][out] */ BSTR* result) { return DOMNode::textContent(result); }
virtual HRESULT STDMETHODCALLTYPE setTextContent(
- /* [in] */ BSTR text) { return DeprecatedDOMNode::setTextContent(text); }
+ /* [in] */ BSTR text) { return DOMNode::setTextContent(text); }
- // IDeprecatedDOMDocument
+ // IDOMDocument
virtual HRESULT STDMETHODCALLTYPE doctype(
- /* [retval][out] */ IDeprecatedDOMDocumentType **result);
+ /* [retval][out] */ IDOMDocumentType **result);
virtual HRESULT STDMETHODCALLTYPE implementation(
- /* [retval][out] */ IDeprecatedDOMImplementation **result);
+ /* [retval][out] */ IDOMImplementation **result);
virtual HRESULT STDMETHODCALLTYPE documentElement(
- /* [retval][out] */ IDeprecatedDOMElement **result);
+ /* [retval][out] */ IDOMElement **result);
virtual HRESULT STDMETHODCALLTYPE createElement(
/* [in] */ BSTR tagName,
- /* [retval][out] */ IDeprecatedDOMElement **result);
+ /* [retval][out] */ IDOMElement **result);
virtual HRESULT STDMETHODCALLTYPE createDocumentFragment(
- /* [retval][out] */ IDeprecatedDOMDocumentFragment **result);
+ /* [retval][out] */ IDOMDocumentFragment **result);
virtual HRESULT STDMETHODCALLTYPE createTextNode(
/* [in] */ BSTR data,
- /* [retval][out] */ IDeprecatedDOMText **result);
+ /* [retval][out] */ IDOMText **result);
virtual HRESULT STDMETHODCALLTYPE createComment(
/* [in] */ BSTR data,
- /* [retval][out] */ IDeprecatedDOMComment **result);
+ /* [retval][out] */ IDOMComment **result);
virtual HRESULT STDMETHODCALLTYPE createCDATASection(
/* [in] */ BSTR data,
- /* [retval][out] */ IDeprecatedDOMCDATASection **result);
+ /* [retval][out] */ IDOMCDATASection **result);
virtual HRESULT STDMETHODCALLTYPE createProcessingInstruction(
/* [in] */ BSTR target,
/* [in] */ BSTR data,
- /* [retval][out] */ IDeprecatedDOMProcessingInstruction **result);
+ /* [retval][out] */ IDOMProcessingInstruction **result);
virtual HRESULT STDMETHODCALLTYPE createAttribute(
/* [in] */ BSTR name,
- /* [retval][out] */ IDeprecatedDOMAttr **result);
+ /* [retval][out] */ IDOMAttr **result);
virtual HRESULT STDMETHODCALLTYPE createEntityReference(
/* [in] */ BSTR name,
- /* [retval][out] */ IDeprecatedDOMEntityReference **result);
+ /* [retval][out] */ IDOMEntityReference **result);
virtual HRESULT STDMETHODCALLTYPE getElementsByTagName(
/* [in] */ BSTR tagName,
- /* [retval][out] */ IDeprecatedDOMNodeList **result);
+ /* [retval][out] */ IDOMNodeList **result);
virtual HRESULT STDMETHODCALLTYPE importNode(
- /* [in] */ IDeprecatedDOMNode *importedNode,
+ /* [in] */ IDOMNode *importedNode,
/* [in] */ BOOL deep,
- /* [retval][out] */ IDeprecatedDOMNode **result);
+ /* [retval][out] */ IDOMNode **result);
virtual HRESULT STDMETHODCALLTYPE createElementNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR qualifiedName,
- /* [retval][out] */ IDeprecatedDOMElement **result);
+ /* [retval][out] */ IDOMElement **result);
virtual HRESULT STDMETHODCALLTYPE createAttributeNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR qualifiedName,
- /* [retval][out] */ IDeprecatedDOMAttr **result);
+ /* [retval][out] */ IDOMAttr **result);
virtual HRESULT STDMETHODCALLTYPE getElementsByTagNameNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR localName,
- /* [retval][out] */ IDeprecatedDOMNodeList **result);
+ /* [retval][out] */ IDOMNodeList **result);
virtual HRESULT STDMETHODCALLTYPE getElementById(
/* [in] */ BSTR elementId,
- /* [retval][out] */ IDeprecatedDOMElement **result);
+ /* [retval][out] */ IDOMElement **result);
- // IDeprecatedDOMViewCSS
+ // IDOMViewCSS
virtual HRESULT STDMETHODCALLTYPE getComputedStyle(
- /* [in] */ IDeprecatedDOMElement *elt,
+ /* [in] */ IDOMElement *elt,
/* [in] */ BSTR pseudoElt,
- /* [retval][out] */ IDeprecatedDOMCSSStyleDeclaration **result);
+ /* [retval][out] */ IDOMCSSStyleDeclaration **result);
- // IDeprecatedDOMDocumentEvent
+ // IDOMDocumentEvent
virtual HRESULT STDMETHODCALLTYPE createEvent(
/* [in] */ BSTR eventType,
- /* [retval][out] */ IDeprecatedDOMEvent **result);
+ /* [retval][out] */ IDOMEvent **result);
- // DeprecatedDOMDocument
+ // DOMDocument
WebCore::Document* document() { return m_document; }
protected:
WebCore::Document* m_document;
};
-class DeprecatedDOMElement : public DeprecatedDOMNode, public IDeprecatedDOMElement, public IDeprecatedDOMElementPrivate, public IDeprecatedDOMNodeExtensions, public IDeprecatedDOMElementCSSInlineStyle, public IDeprecatedDOMElementExtensions
+class DOMElement : public DOMNode, public IDOMElement, public IDOMElementPrivate, public IDOMNodeExtensions, public IDOMElementCSSInlineStyle, public IDOMElementExtensions
{
protected:
- DeprecatedDOMElement(WebCore::Element* e);
- ~DeprecatedDOMElement();
+ DOMElement(WebCore::Element* e);
+ ~DOMElement();
public:
- static IDeprecatedDOMElement* createInstance(WebCore::Element* e);
+ static IDOMElement* createInstance(WebCore::Element* e);
// IUnknown
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
- virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DeprecatedDOMNode::AddRef(); }
- virtual ULONG STDMETHODCALLTYPE Release(void) { return DeprecatedDOMNode::Release(); }
+ virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DOMNode::AddRef(); }
+ virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMNode::Release(); }
// IWebScriptObject
virtual HRESULT STDMETHODCALLTYPE throwException(
/* [in] */ BSTR exceptionMessage,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMNode::throwException(exceptionMessage, result); }
+ /* [retval][out] */ BOOL *result) { return DOMNode::throwException(exceptionMessage, result); }
virtual HRESULT STDMETHODCALLTYPE callWebScriptMethod(
/* [in] */ BSTR name,
/* [size_is][in] */ const VARIANT args[ ],
/* [in] */ int cArgs,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMNode::callWebScriptMethod(name, args, cArgs, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMNode::callWebScriptMethod(name, args, cArgs, result); }
virtual HRESULT STDMETHODCALLTYPE evaluateWebScript(
/* [in] */ BSTR script,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMNode::evaluateWebScript(script, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMNode::evaluateWebScript(script, result); }
virtual HRESULT STDMETHODCALLTYPE removeWebScriptKey(
- /* [in] */ BSTR name) { return DeprecatedDOMNode::removeWebScriptKey(name); }
+ /* [in] */ BSTR name) { return DOMNode::removeWebScriptKey(name); }
virtual HRESULT STDMETHODCALLTYPE stringRepresentation(
- /* [retval][out] */ BSTR* stringRepresentation) { return DeprecatedDOMNode::stringRepresentation(stringRepresentation); }
+ /* [retval][out] */ BSTR* stringRepresentation) { return DOMNode::stringRepresentation(stringRepresentation); }
virtual HRESULT STDMETHODCALLTYPE webScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMNode::webScriptValueAtIndex(index, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMNode::webScriptValueAtIndex(index, result); }
virtual HRESULT STDMETHODCALLTYPE setWebScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [in] */ VARIANT val) { return DeprecatedDOMNode::setWebScriptValueAtIndex(index, val); }
+ /* [in] */ VARIANT val) { return DOMNode::setWebScriptValueAtIndex(index, val); }
virtual HRESULT STDMETHODCALLTYPE setException(
- /* [in] */ BSTR description) { return DeprecatedDOMNode::setException(description); }
+ /* [in] */ BSTR description) { return DOMNode::setException(description); }
- // IDeprecatedDOMNode
+ // IDOMNode
virtual HRESULT STDMETHODCALLTYPE nodeName(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMNode::nodeName(result); }
+ /* [retval][out] */ BSTR *result) { return DOMNode::nodeName(result); }
virtual HRESULT STDMETHODCALLTYPE nodeValue(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMNode::nodeValue(result); }
+ /* [retval][out] */ BSTR *result) { return DOMNode::nodeValue(result); }
virtual HRESULT STDMETHODCALLTYPE setNodeValue(
- /* [in] */ BSTR value) { return DeprecatedDOMNode::setNodeValue(value); }
+ /* [in] */ BSTR value) { return DOMNode::setNodeValue(value); }
virtual HRESULT STDMETHODCALLTYPE nodeType(
- /* [retval][out] */ unsigned short *result) { return DeprecatedDOMNode::nodeType(result); }
+ /* [retval][out] */ unsigned short *result) { return DOMNode::nodeType(result); }
virtual HRESULT STDMETHODCALLTYPE parentNode(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMNode::parentNode(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMNode::parentNode(result); }
virtual HRESULT STDMETHODCALLTYPE childNodes(
- /* [retval][out] */ IDeprecatedDOMNodeList **result) { return DeprecatedDOMNode::childNodes(result); }
+ /* [retval][out] */ IDOMNodeList **result) { return DOMNode::childNodes(result); }
virtual HRESULT STDMETHODCALLTYPE firstChild(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMNode::firstChild(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMNode::firstChild(result); }
virtual HRESULT STDMETHODCALLTYPE lastChild(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMNode::lastChild(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMNode::lastChild(result); }
virtual HRESULT STDMETHODCALLTYPE previousSibling(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMNode::previousSibling(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMNode::previousSibling(result); }
virtual HRESULT STDMETHODCALLTYPE nextSibling(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMNode::nextSibling(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMNode::nextSibling(result); }
virtual HRESULT STDMETHODCALLTYPE attributes(
- /* [retval][out] */ IDeprecatedDOMNamedNodeMap **result) { return DeprecatedDOMNode::attributes(result); }
+ /* [retval][out] */ IDOMNamedNodeMap **result) { return DOMNode::attributes(result); }
virtual HRESULT STDMETHODCALLTYPE ownerDocument(
- /* [retval][out] */ IDeprecatedDOMDocument **result) { return DeprecatedDOMNode::ownerDocument(result); }
+ /* [retval][out] */ IDOMDocument **result) { return DOMNode::ownerDocument(result); }
virtual HRESULT STDMETHODCALLTYPE insertBefore(
- /* [in] */ IDeprecatedDOMNode *newChild,
- /* [in] */ IDeprecatedDOMNode *refChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMNode::insertBefore(newChild, refChild, result); }
+ /* [in] */ IDOMNode *newChild,
+ /* [in] */ IDOMNode *refChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMNode::insertBefore(newChild, refChild, result); }
virtual HRESULT STDMETHODCALLTYPE replaceChild(
- /* [in] */ IDeprecatedDOMNode *newChild,
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMNode::replaceChild(newChild, oldChild, result); }
+ /* [in] */ IDOMNode *newChild,
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMNode::replaceChild(newChild, oldChild, result); }
virtual HRESULT STDMETHODCALLTYPE removeChild(
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMNode::removeChild(oldChild, result); }
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMNode::removeChild(oldChild, result); }
virtual HRESULT STDMETHODCALLTYPE appendChild(
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMNode::appendChild(oldChild, result); }
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMNode::appendChild(oldChild, result); }
virtual HRESULT STDMETHODCALLTYPE hasChildNodes(
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMNode::hasChildNodes(result); }
+ /* [retval][out] */ BOOL *result) { return DOMNode::hasChildNodes(result); }
virtual HRESULT STDMETHODCALLTYPE cloneNode(
/* [in] */ BOOL deep,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMNode::cloneNode(deep, result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMNode::cloneNode(deep, result); }
- virtual HRESULT STDMETHODCALLTYPE normalize( void) { return DeprecatedDOMNode::normalize(); }
+ virtual HRESULT STDMETHODCALLTYPE normalize( void) { return DOMNode::normalize(); }
virtual HRESULT STDMETHODCALLTYPE isSupported(
/* [in] */ BSTR feature,
/* [in] */ BSTR version,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMNode::isSupported(feature, version, result); }
+ /* [retval][out] */ BOOL *result) { return DOMNode::isSupported(feature, version, result); }
virtual HRESULT STDMETHODCALLTYPE namespaceURI(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMNode::namespaceURI(result); }
+ /* [retval][out] */ BSTR *result) { return DOMNode::namespaceURI(result); }
virtual HRESULT STDMETHODCALLTYPE prefix(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMNode::prefix(result); }
+ /* [retval][out] */ BSTR *result) { return DOMNode::prefix(result); }
virtual HRESULT STDMETHODCALLTYPE setPrefix(
- /* [in] */ BSTR prefix) { return DeprecatedDOMNode::setPrefix(prefix); }
+ /* [in] */ BSTR prefix) { return DOMNode::setPrefix(prefix); }
virtual HRESULT STDMETHODCALLTYPE localName(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMNode::localName(result); }
+ /* [retval][out] */ BSTR *result) { return DOMNode::localName(result); }
virtual HRESULT STDMETHODCALLTYPE hasAttributes(
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMNode::hasAttributes(result); }
+ /* [retval][out] */ BOOL *result) { return DOMNode::hasAttributes(result); }
virtual HRESULT STDMETHODCALLTYPE isSameNode(
- /* [in] */ IDeprecatedDOMNode* other,
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMNode::isSameNode(other, result); }
+ /* [in] */ IDOMNode* other,
+ /* [retval][out] */ BOOL* result) { return DOMNode::isSameNode(other, result); }
virtual HRESULT STDMETHODCALLTYPE isEqualNode(
- /* [in] */ IDeprecatedDOMNode* other,
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMNode::isEqualNode(other, result); }
+ /* [in] */ IDOMNode* other,
+ /* [retval][out] */ BOOL* result) { return DOMNode::isEqualNode(other, result); }
virtual HRESULT STDMETHODCALLTYPE textContent(
- /* [retval][out] */ BSTR* result) { return DeprecatedDOMNode::textContent(result); }
+ /* [retval][out] */ BSTR* result) { return DOMNode::textContent(result); }
virtual HRESULT STDMETHODCALLTYPE setTextContent(
- /* [in] */ BSTR text) { return DeprecatedDOMNode::setTextContent(text); }
+ /* [in] */ BSTR text) { return DOMNode::setTextContent(text); }
- // IDeprecatedDOMElement
+ // IDOMElement
virtual HRESULT STDMETHODCALLTYPE tagName(
/* [retval][out] */ BSTR *result);
virtual HRESULT STDMETHODCALLTYPE getAttributeNode(
/* [in] */ BSTR name,
- /* [retval][out] */ IDeprecatedDOMAttr **result);
+ /* [retval][out] */ IDOMAttr **result);
virtual HRESULT STDMETHODCALLTYPE setAttributeNode(
- /* [in] */ IDeprecatedDOMAttr *newAttr,
- /* [retval][out] */ IDeprecatedDOMAttr **result);
+ /* [in] */ IDOMAttr *newAttr,
+ /* [retval][out] */ IDOMAttr **result);
virtual HRESULT STDMETHODCALLTYPE removeAttributeNode(
- /* [in] */ IDeprecatedDOMAttr *oldAttr,
- /* [retval][out] */ IDeprecatedDOMAttr **result);
+ /* [in] */ IDOMAttr *oldAttr,
+ /* [retval][out] */ IDOMAttr **result);
virtual HRESULT STDMETHODCALLTYPE getElementsByTagName(
/* [in] */ BSTR name,
- /* [retval][out] */ IDeprecatedDOMNodeList **result);
+ /* [retval][out] */ IDOMNodeList **result);
virtual HRESULT STDMETHODCALLTYPE getAttributeNS(
/* [in] */ BSTR namespaceURI,
virtual HRESULT STDMETHODCALLTYPE getAttributeNodeNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR localName,
- /* [retval][out] */ IDeprecatedDOMAttr **result);
+ /* [retval][out] */ IDOMAttr **result);
virtual HRESULT STDMETHODCALLTYPE setAttributeNodeNS(
- /* [in] */ IDeprecatedDOMAttr *newAttr,
- /* [retval][out] */ IDeprecatedDOMAttr **result);
+ /* [in] */ IDOMAttr *newAttr,
+ /* [retval][out] */ IDOMAttr **result);
virtual HRESULT STDMETHODCALLTYPE getElementsByTagNameNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR localName,
- /* [retval][out] */ IDeprecatedDOMNodeList **result);
+ /* [retval][out] */ IDOMNodeList **result);
virtual HRESULT STDMETHODCALLTYPE hasAttribute(
/* [in] */ BSTR name,
virtual HRESULT STDMETHODCALLTYPE blur( void);
- // IDeprecatedDOMNodeExtensions
+ // IDOMNodeExtensions
virtual HRESULT STDMETHODCALLTYPE boundingBox(
/* [retval][out] */ LPRECT rect);
/* [size_is][in] */ RECT* rects,
/* [in] */ int cRects);
- // IDeprecatedDOMElementPrivate
+ // IDOMElementPrivate
virtual HRESULT STDMETHODCALLTYPE coreElement(
void** element);
virtual HRESULT STDMETHODCALLTYPE isEqual(
- /* [in] */ IDeprecatedDOMElement *other,
+ /* [in] */ IDOMElement *other,
/* [retval][out] */ BOOL *result);
virtual HRESULT STDMETHODCALLTYPE isFocused(
virtual HRESULT STDMETHODCALLTYPE innerText(
/* [retval][out] */ BSTR* result);
- // IDeprecatedDOMElementCSSInlineStyle
+ // IDOMElementCSSInlineStyle
virtual HRESULT STDMETHODCALLTYPE style(
- /* [retval][out] */ IDeprecatedDOMCSSStyleDeclaration **result);
+ /* [retval][out] */ IDOMCSSStyleDeclaration **result);
- // IDeprecatedDOMElementExtensions
+ // IDOMElementExtensions
virtual HRESULT STDMETHODCALLTYPE offsetLeft(
/* [retval][out] */ int *result);
/* [retval][out] */ int *result);
virtual HRESULT STDMETHODCALLTYPE offsetParent(
- /* [retval][out] */ IDeprecatedDOMElement **result);
+ /* [retval][out] */ IDOMElement **result);
virtual HRESULT STDMETHODCALLTYPE clientWidth(
/* [retval][out] */ int *result);
virtual HRESULT STDMETHODCALLTYPE scrollIntoViewIfNeeded(
/* [in] */ BOOL centerIfNeeded);
- // DeprecatedDOMElement
+ // DOMElement
WebCore::Element* element() { return m_element; }
protected:
#include <WebCore/MouseEvent.h>
#pragma warning( pop )
-// DeprecatedDOMEventListener -----------------------------------------------------------
+// DOMEventListener -----------------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMEventListener::QueryInterface(const IID &riid, void** ppvObject)
+HRESULT STDMETHODCALLTYPE DOMEventListener::QueryInterface(const IID &riid, void** ppvObject)
{
*ppvObject = 0;
- if (IsEqualGUID(riid, IID_IDeprecatedDOMEventListener))
- *ppvObject = static_cast<IDeprecatedDOMEventListener*>(this);
+ if (IsEqualGUID(riid, IID_IDOMEventListener))
+ *ppvObject = static_cast<IDOMEventListener*>(this);
else
- return DeprecatedDOMObject::QueryInterface(riid, ppvObject);
+ return DOMObject::QueryInterface(riid, ppvObject);
AddRef();
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMEventListener::handleEvent(
- /* [in] */ IDeprecatedDOMEvent* /*evt*/)
+HRESULT STDMETHODCALLTYPE DOMEventListener::handleEvent(
+ /* [in] */ IDOMEvent* /*evt*/)
{
return E_NOTIMPL;
}
-// DeprecatedDOMEvent -------------------------------------------------------------------
+// DOMEvent -------------------------------------------------------------------
-DeprecatedDOMEvent::DeprecatedDOMEvent(PassRefPtr<WebCore::Event> e)
+DOMEvent::DOMEvent(PassRefPtr<WebCore::Event> e)
: m_event(0)
{
m_event = e;
}
-DeprecatedDOMEvent::~DeprecatedDOMEvent()
+DOMEvent::~DOMEvent()
{
}
-IDeprecatedDOMEvent* DeprecatedDOMEvent::createInstance(PassRefPtr<WebCore::Event> e)
+IDOMEvent* DOMEvent::createInstance(PassRefPtr<WebCore::Event> e)
{
if (!e)
return 0;
HRESULT hr;
- IDeprecatedDOMEvent* domEvent = 0;
+ IDOMEvent* domEvent = 0;
if (e->isKeyboardEvent()) {
- DeprecatedDOMKeyboardEvent* newEvent = new DeprecatedDOMKeyboardEvent(e);
- hr = newEvent->QueryInterface(IID_IDeprecatedDOMKeyboardEvent, (void**)&domEvent);
+ DOMKeyboardEvent* newEvent = new DOMKeyboardEvent(e);
+ hr = newEvent->QueryInterface(IID_IDOMKeyboardEvent, (void**)&domEvent);
} else if (e->isMouseEvent()) {
- DeprecatedDOMMouseEvent* newEvent = new DeprecatedDOMMouseEvent(e);
- hr = newEvent->QueryInterface(IID_IDeprecatedDOMMouseEvent, (void**)&domEvent);
+ DOMMouseEvent* newEvent = new DOMMouseEvent(e);
+ hr = newEvent->QueryInterface(IID_IDOMMouseEvent, (void**)&domEvent);
} else if (e->isMutationEvent()) {
- DeprecatedDOMMutationEvent* newEvent = new DeprecatedDOMMutationEvent(e);
- hr = newEvent->QueryInterface(IID_IDeprecatedDOMMutationEvent, (void**)&domEvent);
+ DOMMutationEvent* newEvent = new DOMMutationEvent(e);
+ hr = newEvent->QueryInterface(IID_IDOMMutationEvent, (void**)&domEvent);
} else if (e->isOverflowEvent()) {
- DeprecatedDOMOverflowEvent* newEvent = new DeprecatedDOMOverflowEvent(e);
- hr = newEvent->QueryInterface(IID_IDeprecatedDOMOverflowEvent, (void**)&domEvent);
+ DOMOverflowEvent* newEvent = new DOMOverflowEvent(e);
+ hr = newEvent->QueryInterface(IID_IDOMOverflowEvent, (void**)&domEvent);
} else if (e->isWheelEvent()) {
- DeprecatedDOMWheelEvent* newEvent = new DeprecatedDOMWheelEvent(e);
- hr = newEvent->QueryInterface(IID_IDeprecatedDOMWheelEvent, (void**)&domEvent);
+ DOMWheelEvent* newEvent = new DOMWheelEvent(e);
+ hr = newEvent->QueryInterface(IID_IDOMWheelEvent, (void**)&domEvent);
} else if (e->isUIEvent()) {
- DeprecatedDOMUIEvent* newEvent = new DeprecatedDOMUIEvent(e);
- hr = newEvent->QueryInterface(IID_IDeprecatedDOMUIEvent, (void**)&domEvent);
+ DOMUIEvent* newEvent = new DOMUIEvent(e);
+ hr = newEvent->QueryInterface(IID_IDOMUIEvent, (void**)&domEvent);
} else {
- DeprecatedDOMEvent* newEvent = new DeprecatedDOMEvent(e);
- hr = newEvent->QueryInterface(IID_IDeprecatedDOMEvent, (void**)&domEvent);
+ DOMEvent* newEvent = new DOMEvent(e);
+ hr = newEvent->QueryInterface(IID_IDOMEvent, (void**)&domEvent);
}
if (FAILED(hr))
return domEvent;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMEvent::QueryInterface(const IID &riid, void** ppvObject)
+HRESULT STDMETHODCALLTYPE DOMEvent::QueryInterface(const IID &riid, void** ppvObject)
{
*ppvObject = 0;
- if (IsEqualGUID(riid, IID_DeprecatedDOMEvent))
+ if (IsEqualGUID(riid, IID_DOMEvent))
*ppvObject = this;
- else if (IsEqualGUID(riid, IID_IDeprecatedDOMEvent))
- *ppvObject = static_cast<IDeprecatedDOMEvent*>(this);
+ else if (IsEqualGUID(riid, IID_IDOMEvent))
+ *ppvObject = static_cast<IDOMEvent*>(this);
else
- return DeprecatedDOMObject::QueryInterface(riid, ppvObject);
+ return DOMObject::QueryInterface(riid, ppvObject);
AddRef();
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMEvent::type(
+HRESULT STDMETHODCALLTYPE DOMEvent::type(
/* [retval][out] */ BSTR* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMEvent::target(
- /* [retval][out] */ IDeprecatedDOMEventTarget** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMEvent::target(
+ /* [retval][out] */ IDOMEventTarget** /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMEvent::currentTarget(
- /* [retval][out] */ IDeprecatedDOMEventTarget** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMEvent::currentTarget(
+ /* [retval][out] */ IDOMEventTarget** /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMEvent::eventPhase(
+HRESULT STDMETHODCALLTYPE DOMEvent::eventPhase(
/* [retval][out] */ unsigned short* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMEvent::bubbles(
+HRESULT STDMETHODCALLTYPE DOMEvent::bubbles(
/* [retval][out] */ BOOL* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMEvent::cancelable(
+HRESULT STDMETHODCALLTYPE DOMEvent::cancelable(
/* [retval][out] */ BOOL* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMEvent::timeStamp(
+HRESULT STDMETHODCALLTYPE DOMEvent::timeStamp(
/* [retval][out] */ DOMTimeStamp* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMEvent::stopPropagation( void)
+HRESULT STDMETHODCALLTYPE DOMEvent::stopPropagation( void)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMEvent::preventDefault( void)
+HRESULT STDMETHODCALLTYPE DOMEvent::preventDefault( void)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMEvent::initEvent(
+HRESULT STDMETHODCALLTYPE DOMEvent::initEvent(
/* [in] */ BSTR /*eventTypeArg*/,
/* [in] */ BOOL /*canBubbleArg*/,
/* [in] */ BOOL /*cancelableArg*/)
return E_NOTIMPL;
}
-// DeprecatedDOMUIEvent -----------------------------------------------------------------
+// DOMUIEvent -----------------------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMUIEvent::QueryInterface(REFIID riid, void** ppvObject)
+HRESULT STDMETHODCALLTYPE DOMUIEvent::QueryInterface(REFIID riid, void** ppvObject)
{
*ppvObject = 0;
- if (IsEqualGUID(riid, IID_IDeprecatedDOMUIEvent))
- *ppvObject = static_cast<IDeprecatedDOMUIEvent*>(this);
+ if (IsEqualGUID(riid, IID_IDOMUIEvent))
+ *ppvObject = static_cast<IDOMUIEvent*>(this);
else
- return DeprecatedDOMEvent::QueryInterface(riid, ppvObject);
+ return DOMEvent::QueryInterface(riid, ppvObject);
AddRef();
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMUIEvent::view(
- /* [retval][out] */ IDeprecatedDOMWindow** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMUIEvent::view(
+ /* [retval][out] */ IDOMWindow** /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMUIEvent::detail(
+HRESULT STDMETHODCALLTYPE DOMUIEvent::detail(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMUIEvent::initUIEvent(
+HRESULT STDMETHODCALLTYPE DOMUIEvent::initUIEvent(
/* [in] */ BSTR /*type*/,
/* [in] */ BOOL /*canBubble*/,
/* [in] */ BOOL /*cancelable*/,
- /* [in] */ IDeprecatedDOMWindow* /*view*/,
+ /* [in] */ IDOMWindow* /*view*/,
/* [in] */ long /*detail*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMUIEvent::keyCode(
+HRESULT STDMETHODCALLTYPE DOMUIEvent::keyCode(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMUIEvent::charCode(
+HRESULT STDMETHODCALLTYPE DOMUIEvent::charCode(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMUIEvent::layerX(
+HRESULT STDMETHODCALLTYPE DOMUIEvent::layerX(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMUIEvent::layerY(
+HRESULT STDMETHODCALLTYPE DOMUIEvent::layerY(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMUIEvent::pageX(
+HRESULT STDMETHODCALLTYPE DOMUIEvent::pageX(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMUIEvent::pageY(
+HRESULT STDMETHODCALLTYPE DOMUIEvent::pageY(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMUIEvent::which(
+HRESULT STDMETHODCALLTYPE DOMUIEvent::which(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-// DeprecatedDOMKeyboardEvent -----------------------------------------------------------
+// DOMKeyboardEvent -----------------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMKeyboardEvent::QueryInterface(REFIID riid, void** ppvObject)
+HRESULT STDMETHODCALLTYPE DOMKeyboardEvent::QueryInterface(REFIID riid, void** ppvObject)
{
*ppvObject = 0;
- if (IsEqualGUID(riid, IID_IDeprecatedDOMKeyboardEvent))
- *ppvObject = static_cast<IDeprecatedDOMKeyboardEvent*>(this);
+ if (IsEqualGUID(riid, IID_IDOMKeyboardEvent))
+ *ppvObject = static_cast<IDOMKeyboardEvent*>(this);
else
- return DeprecatedDOMUIEvent::QueryInterface(riid, ppvObject);
+ return DOMUIEvent::QueryInterface(riid, ppvObject);
AddRef();
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMKeyboardEvent::keyIdentifier(
+HRESULT STDMETHODCALLTYPE DOMKeyboardEvent::keyIdentifier(
/* [retval][out] */ BSTR* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMKeyboardEvent::keyLocation(
+HRESULT STDMETHODCALLTYPE DOMKeyboardEvent::keyLocation(
/* [retval][out] */ unsigned long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMKeyboardEvent::ctrlKey(
+HRESULT STDMETHODCALLTYPE DOMKeyboardEvent::ctrlKey(
/* [retval][out] */ BOOL* result)
{
*result = FALSE;
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMKeyboardEvent::shiftKey(
+HRESULT STDMETHODCALLTYPE DOMKeyboardEvent::shiftKey(
/* [retval][out] */ BOOL* result)
{
*result = FALSE;
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMKeyboardEvent::altKey(
+HRESULT STDMETHODCALLTYPE DOMKeyboardEvent::altKey(
/* [retval][out] */ BOOL* result)
{
*result = FALSE;
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMKeyboardEvent::metaKey(
+HRESULT STDMETHODCALLTYPE DOMKeyboardEvent::metaKey(
/* [retval][out] */ BOOL* result)
{
*result = FALSE;
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMKeyboardEvent::altGraphKey(
+HRESULT STDMETHODCALLTYPE DOMKeyboardEvent::altGraphKey(
/* [retval][out] */ BOOL* result)
{
*result = FALSE;
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMKeyboardEvent::getModifierState(
+HRESULT STDMETHODCALLTYPE DOMKeyboardEvent::getModifierState(
/* [in] */ BSTR /*keyIdentifierArg*/,
/* [retval][out] */ BOOL* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMKeyboardEvent::initKeyboardEvent(
+HRESULT STDMETHODCALLTYPE DOMKeyboardEvent::initKeyboardEvent(
/* [in] */ BSTR /*type*/,
/* [in] */ BOOL /*canBubble*/,
/* [in] */ BOOL /*cancelable*/,
- /* [in] */ IDeprecatedDOMWindow* /*view*/,
+ /* [in] */ IDOMWindow* /*view*/,
/* [in] */ BSTR /*keyIdentifier*/,
/* [in] */ unsigned long /*keyLocation*/,
/* [in] */ BOOL /*ctrlKey*/,
return E_NOTIMPL;
}
-// DeprecatedDOMMouseEvent --------------------------------------------------------------
+// DOMMouseEvent --------------------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMMouseEvent::QueryInterface(REFIID riid, void** ppvObject)
+HRESULT STDMETHODCALLTYPE DOMMouseEvent::QueryInterface(REFIID riid, void** ppvObject)
{
*ppvObject = 0;
- if (IsEqualGUID(riid, IID_IDeprecatedDOMMouseEvent))
- *ppvObject = static_cast<IDeprecatedDOMMouseEvent*>(this);
+ if (IsEqualGUID(riid, IID_IDOMMouseEvent))
+ *ppvObject = static_cast<IDOMMouseEvent*>(this);
else
- return DeprecatedDOMUIEvent::QueryInterface(riid, ppvObject);
+ return DOMUIEvent::QueryInterface(riid, ppvObject);
AddRef();
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMMouseEvent::screenX(
+HRESULT STDMETHODCALLTYPE DOMMouseEvent::screenX(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMMouseEvent::screenY(
+HRESULT STDMETHODCALLTYPE DOMMouseEvent::screenY(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMMouseEvent::clientX(
+HRESULT STDMETHODCALLTYPE DOMMouseEvent::clientX(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMMouseEvent::clientY(
+HRESULT STDMETHODCALLTYPE DOMMouseEvent::clientY(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMMouseEvent::ctrlKey(
+HRESULT STDMETHODCALLTYPE DOMMouseEvent::ctrlKey(
/* [retval][out] */ BOOL* result)
{
*result = FALSE;
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMMouseEvent::shiftKey(
+HRESULT STDMETHODCALLTYPE DOMMouseEvent::shiftKey(
/* [retval][out] */ BOOL* result)
{
*result = FALSE;
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMMouseEvent::altKey(
+HRESULT STDMETHODCALLTYPE DOMMouseEvent::altKey(
/* [retval][out] */ BOOL* result)
{
*result = FALSE;
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMMouseEvent::metaKey(
+HRESULT STDMETHODCALLTYPE DOMMouseEvent::metaKey(
/* [retval][out] */ BOOL* result)
{
*result = FALSE;
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMMouseEvent::button(
+HRESULT STDMETHODCALLTYPE DOMMouseEvent::button(
/* [retval][out] */ unsigned short* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMMouseEvent::relatedTarget(
- /* [retval][out] */ IDeprecatedDOMEventTarget** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMMouseEvent::relatedTarget(
+ /* [retval][out] */ IDOMEventTarget** /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMMouseEvent::initMouseEvent(
+HRESULT STDMETHODCALLTYPE DOMMouseEvent::initMouseEvent(
/* [in] */ BSTR /*type*/,
/* [in] */ BOOL /*canBubble*/,
/* [in] */ BOOL /*cancelable*/,
- /* [in] */ IDeprecatedDOMWindow* /*view*/,
+ /* [in] */ IDOMWindow* /*view*/,
/* [in] */ long /*detail*/,
/* [in] */ long /*screenX*/,
/* [in] */ long /*screenY*/,
/* [in] */ BOOL /*shiftKey*/,
/* [in] */ BOOL /*metaKey*/,
/* [in] */ unsigned short /*button*/,
- /* [in] */ IDeprecatedDOMEventTarget* /*relatedTarget*/)
+ /* [in] */ IDOMEventTarget* /*relatedTarget*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMMouseEvent::offsetX(
+HRESULT STDMETHODCALLTYPE DOMMouseEvent::offsetX(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMMouseEvent::offsetY(
+HRESULT STDMETHODCALLTYPE DOMMouseEvent::offsetY(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMMouseEvent::x(
+HRESULT STDMETHODCALLTYPE DOMMouseEvent::x(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMMouseEvent::y(
+HRESULT STDMETHODCALLTYPE DOMMouseEvent::y(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMMouseEvent::fromElement(
- /* [retval][out] */ IDeprecatedDOMNode** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMMouseEvent::fromElement(
+ /* [retval][out] */ IDOMNode** /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMMouseEvent::toElement(
- /* [retval][out] */ IDeprecatedDOMNode** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMMouseEvent::toElement(
+ /* [retval][out] */ IDOMNode** /*result*/)
{
return E_NOTIMPL;
}
-// DeprecatedDOMMutationEvent -----------------------------------------------------------
+// DOMMutationEvent -----------------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMMutationEvent::QueryInterface(REFIID riid, void** ppvObject)
+HRESULT STDMETHODCALLTYPE DOMMutationEvent::QueryInterface(REFIID riid, void** ppvObject)
{
*ppvObject = 0;
- if (IsEqualGUID(riid, IID_IDeprecatedDOMMutationEvent))
- *ppvObject = static_cast<IDeprecatedDOMMutationEvent*>(this);
+ if (IsEqualGUID(riid, IID_IDOMMutationEvent))
+ *ppvObject = static_cast<IDOMMutationEvent*>(this);
else
- return DeprecatedDOMEvent::QueryInterface(riid, ppvObject);
+ return DOMEvent::QueryInterface(riid, ppvObject);
AddRef();
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMMutationEvent::relatedNode(
- /* [retval][out] */ IDeprecatedDOMNode** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMMutationEvent::relatedNode(
+ /* [retval][out] */ IDOMNode** /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMMutationEvent::prevValue(
+HRESULT STDMETHODCALLTYPE DOMMutationEvent::prevValue(
/* [retval][out] */ BSTR* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMMutationEvent::newValue(
+HRESULT STDMETHODCALLTYPE DOMMutationEvent::newValue(
/* [retval][out] */ BSTR* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMMutationEvent::attrName(
+HRESULT STDMETHODCALLTYPE DOMMutationEvent::attrName(
/* [retval][out] */ BSTR* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMMutationEvent::attrChange(
+HRESULT STDMETHODCALLTYPE DOMMutationEvent::attrChange(
/* [retval][out] */ unsigned short* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMMutationEvent::initMutationEvent(
+HRESULT STDMETHODCALLTYPE DOMMutationEvent::initMutationEvent(
/* [in] */ BSTR /*type*/,
/* [in] */ BOOL /*canBubble*/,
/* [in] */ BOOL /*cancelable*/,
- /* [in] */ IDeprecatedDOMNode* /*relatedNode*/,
+ /* [in] */ IDOMNode* /*relatedNode*/,
/* [in] */ BSTR /*prevValue*/,
/* [in] */ BSTR /*newValue*/,
/* [in] */ BSTR /*attrName*/,
return E_NOTIMPL;
}
-// DeprecatedDOMOverflowEvent -----------------------------------------------------------
+// DOMOverflowEvent -----------------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMOverflowEvent::QueryInterface(REFIID riid, void** ppvObject)
+HRESULT STDMETHODCALLTYPE DOMOverflowEvent::QueryInterface(REFIID riid, void** ppvObject)
{
*ppvObject = 0;
- if (IsEqualGUID(riid, IID_IDeprecatedDOMOverflowEvent))
- *ppvObject = static_cast<IDeprecatedDOMOverflowEvent*>(this);
+ if (IsEqualGUID(riid, IID_IDOMOverflowEvent))
+ *ppvObject = static_cast<IDOMOverflowEvent*>(this);
else
- return DeprecatedDOMEvent::QueryInterface(riid, ppvObject);
+ return DOMEvent::QueryInterface(riid, ppvObject);
AddRef();
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMOverflowEvent::orient(
+HRESULT STDMETHODCALLTYPE DOMOverflowEvent::orient(
/* [retval][out] */ unsigned short* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMOverflowEvent::horizontalOverflow(
+HRESULT STDMETHODCALLTYPE DOMOverflowEvent::horizontalOverflow(
/* [retval][out] */ BOOL* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMOverflowEvent::verticalOverflow(
+HRESULT STDMETHODCALLTYPE DOMOverflowEvent::verticalOverflow(
/* [retval][out] */ BOOL* /*result*/)
{
return E_NOTIMPL;
}
-// DeprecatedDOMWheelEvent --------------------------------------------------------------
+// DOMWheelEvent --------------------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMWheelEvent::QueryInterface(REFIID riid, void** ppvObject)
+HRESULT STDMETHODCALLTYPE DOMWheelEvent::QueryInterface(REFIID riid, void** ppvObject)
{
*ppvObject = 0;
- if (IsEqualGUID(riid, IID_IDeprecatedDOMWheelEvent))
- *ppvObject = static_cast<IDeprecatedDOMWheelEvent*>(this);
+ if (IsEqualGUID(riid, IID_IDOMWheelEvent))
+ *ppvObject = static_cast<IDOMWheelEvent*>(this);
else
- return DeprecatedDOMUIEvent::QueryInterface(riid, ppvObject);
+ return DOMUIEvent::QueryInterface(riid, ppvObject);
AddRef();
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMWheelEvent::screenX(
+HRESULT STDMETHODCALLTYPE DOMWheelEvent::screenX(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMWheelEvent::screenY(
+HRESULT STDMETHODCALLTYPE DOMWheelEvent::screenY(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMWheelEvent::clientX(
+HRESULT STDMETHODCALLTYPE DOMWheelEvent::clientX(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMWheelEvent::clientY(
+HRESULT STDMETHODCALLTYPE DOMWheelEvent::clientY(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMWheelEvent::ctrlKey(
+HRESULT STDMETHODCALLTYPE DOMWheelEvent::ctrlKey(
/* [retval][out] */ BOOL* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMWheelEvent::shiftKey(
+HRESULT STDMETHODCALLTYPE DOMWheelEvent::shiftKey(
/* [retval][out] */ BOOL* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMWheelEvent::altKey(
+HRESULT STDMETHODCALLTYPE DOMWheelEvent::altKey(
/* [retval][out] */ BOOL* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMWheelEvent::metaKey(
+HRESULT STDMETHODCALLTYPE DOMWheelEvent::metaKey(
/* [retval][out] */ BOOL* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMWheelEvent::wheelDelta(
+HRESULT STDMETHODCALLTYPE DOMWheelEvent::wheelDelta(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMWheelEvent::wheelDeltaX(
+HRESULT STDMETHODCALLTYPE DOMWheelEvent::wheelDeltaX(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMWheelEvent::wheelDeltaY(
+HRESULT STDMETHODCALLTYPE DOMWheelEvent::wheelDeltaY(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMWheelEvent::offsetX(
+HRESULT STDMETHODCALLTYPE DOMWheelEvent::offsetX(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMWheelEvent::offsetY(
+HRESULT STDMETHODCALLTYPE DOMWheelEvent::offsetY(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMWheelEvent::x(
+HRESULT STDMETHODCALLTYPE DOMWheelEvent::x(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMWheelEvent::y(
+HRESULT STDMETHODCALLTYPE DOMWheelEvent::y(
/* [retval][out] */ long* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMWheelEvent::isHorizontal(
+HRESULT STDMETHODCALLTYPE DOMWheelEvent::isHorizontal(
/* [retval][out] */ BOOL* /*result*/)
{
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMWheelEvent::initWheelEvent(
+HRESULT STDMETHODCALLTYPE DOMWheelEvent::initWheelEvent(
/* [in] */ long /*wheelDeltaX*/,
/* [in] */ long /*wheelDeltaY*/,
- /* [in] */ IDeprecatedDOMWindow* /*view*/,
+ /* [in] */ IDOMWindow* /*view*/,
/* [in] */ long /*screenX*/,
/* [in] */ long /*screenY*/,
/* [in] */ long /*clientX*/,
#include <wtf/RefPtr.h>
// {AC3D1BC3-4976-4431-8A19-4812C5EFE39C}
-DEFINE_GUID(IID_DeprecatedDOMEvent, 0xac3d1bc3, 0x4976, 0x4431, 0x8a, 0x19, 0x48, 0x12, 0xc5, 0xef, 0xe3, 0x9c);
+DEFINE_GUID(IID_DOMEvent, 0xac3d1bc3, 0x4976, 0x4431, 0x8a, 0x19, 0x48, 0x12, 0xc5, 0xef, 0xe3, 0x9c);
namespace WebCore {
class Event;
}
-class DeprecatedDOMUIEvent;
+class DOMUIEvent;
-class DeprecatedDOMEventListener : public DeprecatedDOMObject, public IDeprecatedDOMEventListener
+class DOMEventListener : public DOMObject, public IDOMEventListener
{
public:
// IUnknown
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
- virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DeprecatedDOMObject::AddRef(); }
- virtual ULONG STDMETHODCALLTYPE Release(void) { return DeprecatedDOMObject::Release(); }
+ virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DOMObject::AddRef(); }
+ virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMObject::Release(); }
// IWebScriptObject
virtual HRESULT STDMETHODCALLTYPE throwException(
/* [in] */ BSTR exceptionMessage,
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMObject::throwException(exceptionMessage, result); }
+ /* [retval][out] */ BOOL* result) { return DOMObject::throwException(exceptionMessage, result); }
virtual HRESULT STDMETHODCALLTYPE callWebScriptMethod(
/* [in] */ BSTR name,
/* [size_is][in] */ const VARIANT args[ ],
/* [in] */ int cArgs,
- /* [retval][out] */ VARIANT* result) { return DeprecatedDOMObject::callWebScriptMethod(name, args, cArgs, result); }
+ /* [retval][out] */ VARIANT* result) { return DOMObject::callWebScriptMethod(name, args, cArgs, result); }
virtual HRESULT STDMETHODCALLTYPE evaluateWebScript(
/* [in] */ BSTR script,
- /* [retval][out] */ VARIANT* result) { return DeprecatedDOMObject::evaluateWebScript(script, result); }
+ /* [retval][out] */ VARIANT* result) { return DOMObject::evaluateWebScript(script, result); }
virtual HRESULT STDMETHODCALLTYPE removeWebScriptKey(
- /* [in] */ BSTR name) { return DeprecatedDOMObject::removeWebScriptKey(name); }
+ /* [in] */ BSTR name) { return DOMObject::removeWebScriptKey(name); }
virtual HRESULT STDMETHODCALLTYPE stringRepresentation(
- /* [retval][out] */ BSTR* stringRepresentation) { return DeprecatedDOMObject::stringRepresentation(stringRepresentation); }
+ /* [retval][out] */ BSTR* stringRepresentation) { return DOMObject::stringRepresentation(stringRepresentation); }
virtual HRESULT STDMETHODCALLTYPE webScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [retval][out] */ VARIANT* result) { return DeprecatedDOMObject::webScriptValueAtIndex(index, result); }
+ /* [retval][out] */ VARIANT* result) { return DOMObject::webScriptValueAtIndex(index, result); }
virtual HRESULT STDMETHODCALLTYPE setWebScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [in] */ VARIANT val) { return DeprecatedDOMObject::setWebScriptValueAtIndex(index, val); }
+ /* [in] */ VARIANT val) { return DOMObject::setWebScriptValueAtIndex(index, val); }
virtual HRESULT STDMETHODCALLTYPE setException(
- /* [in] */ BSTR description) { return DeprecatedDOMObject::setException(description); }
+ /* [in] */ BSTR description) { return DOMObject::setException(description); }
- // IDeprecatedDOMEventListener
+ // IDOMEventListener
virtual HRESULT STDMETHODCALLTYPE handleEvent(
- /* [in] */ IDeprecatedDOMEvent* evt);
+ /* [in] */ IDOMEvent* evt);
};
-class DeprecatedDOMEvent : public DeprecatedDOMObject, public IDeprecatedDOMEvent
+class DOMEvent : public DOMObject, public IDOMEvent
{
public:
- static IDeprecatedDOMEvent* createInstance(PassRefPtr<WebCore::Event> e);
+ static IDOMEvent* createInstance(PassRefPtr<WebCore::Event> e);
protected:
- DeprecatedDOMEvent(PassRefPtr<WebCore::Event> e);
- ~DeprecatedDOMEvent();
+ DOMEvent(PassRefPtr<WebCore::Event> e);
+ ~DOMEvent();
public:
// IUnknown
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
- virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DeprecatedDOMObject::AddRef(); }
- virtual ULONG STDMETHODCALLTYPE Release(void) { return DeprecatedDOMObject::Release(); }
+ virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DOMObject::AddRef(); }
+ virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMObject::Release(); }
// IWebScriptObject
virtual HRESULT STDMETHODCALLTYPE throwException(
/* [in] */ BSTR exceptionMessage,
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMObject::throwException(exceptionMessage, result); }
+ /* [retval][out] */ BOOL* result) { return DOMObject::throwException(exceptionMessage, result); }
virtual HRESULT STDMETHODCALLTYPE callWebScriptMethod(
/* [in] */ BSTR name,
/* [size_is][in] */ const VARIANT args[ ],
/* [in] */ int cArgs,
- /* [retval][out] */ VARIANT* result) { return DeprecatedDOMObject::callWebScriptMethod(name, args, cArgs, result); }
+ /* [retval][out] */ VARIANT* result) { return DOMObject::callWebScriptMethod(name, args, cArgs, result); }
virtual HRESULT STDMETHODCALLTYPE evaluateWebScript(
/* [in] */ BSTR script,
- /* [retval][out] */ VARIANT* result) { return DeprecatedDOMObject::evaluateWebScript(script, result); }
+ /* [retval][out] */ VARIANT* result) { return DOMObject::evaluateWebScript(script, result); }
virtual HRESULT STDMETHODCALLTYPE removeWebScriptKey(
- /* [in] */ BSTR name) { return DeprecatedDOMObject::removeWebScriptKey(name); }
+ /* [in] */ BSTR name) { return DOMObject::removeWebScriptKey(name); }
virtual HRESULT STDMETHODCALLTYPE stringRepresentation(
- /* [retval][out] */ BSTR* stringRepresentation) { return DeprecatedDOMObject::stringRepresentation(stringRepresentation); }
+ /* [retval][out] */ BSTR* stringRepresentation) { return DOMObject::stringRepresentation(stringRepresentation); }
virtual HRESULT STDMETHODCALLTYPE webScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [retval][out] */ VARIANT* result) { return DeprecatedDOMObject::webScriptValueAtIndex(index, result); }
+ /* [retval][out] */ VARIANT* result) { return DOMObject::webScriptValueAtIndex(index, result); }
virtual HRESULT STDMETHODCALLTYPE setWebScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [in] */ VARIANT val) { return DeprecatedDOMObject::setWebScriptValueAtIndex(index, val); }
+ /* [in] */ VARIANT val) { return DOMObject::setWebScriptValueAtIndex(index, val); }
virtual HRESULT STDMETHODCALLTYPE setException(
- /* [in] */ BSTR description) { return DeprecatedDOMObject::setException(description); }
+ /* [in] */ BSTR description) { return DOMObject::setException(description); }
- // IDeprecatedDOMEvent
+ // IDOMEvent
virtual HRESULT STDMETHODCALLTYPE type(
/* [retval][out] */ BSTR* result);
virtual HRESULT STDMETHODCALLTYPE target(
- /* [retval][out] */ IDeprecatedDOMEventTarget** result);
+ /* [retval][out] */ IDOMEventTarget** result);
virtual HRESULT STDMETHODCALLTYPE currentTarget(
- /* [retval][out] */ IDeprecatedDOMEventTarget** result);
+ /* [retval][out] */ IDOMEventTarget** result);
virtual HRESULT STDMETHODCALLTYPE eventPhase(
/* [retval][out] */ unsigned short* result);
/* [in] */ BOOL canBubbleArg,
/* [in] */ BOOL cancelableArg);
- // DeprecatedDOMEvent methods
+ // DOMEvent methods
WebCore::Event* coreEvent() { return m_event.get(); }
protected:
RefPtr<WebCore::Event> m_event;
};
-class DeprecatedDOMUIEvent : public DeprecatedDOMEvent, public IDeprecatedDOMUIEvent
+class DOMUIEvent : public DOMEvent, public IDOMUIEvent
{
public:
- DeprecatedDOMUIEvent(PassRefPtr<WebCore::Event> e) : DeprecatedDOMEvent(e) {}
+ DOMUIEvent(PassRefPtr<WebCore::Event> e) : DOMEvent(e) {}
// IUnknown
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
- virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DeprecatedDOMEvent::AddRef(); }
- virtual ULONG STDMETHODCALLTYPE Release(void) { return DeprecatedDOMEvent::Release(); }
+ virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DOMEvent::AddRef(); }
+ virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMEvent::Release(); }
// IWebScriptObject
virtual HRESULT STDMETHODCALLTYPE throwException(
/* [in] */ BSTR exceptionMessage,
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMObject::throwException(exceptionMessage, result); }
+ /* [retval][out] */ BOOL* result) { return DOMObject::throwException(exceptionMessage, result); }
virtual HRESULT STDMETHODCALLTYPE callWebScriptMethod(
/* [in] */ BSTR name,
/* [size_is][in] */ const VARIANT args[ ],
/* [in] */ int cArgs,
- /* [retval][out] */ VARIANT* result) { return DeprecatedDOMObject::callWebScriptMethod(name, args, cArgs, result); }
+ /* [retval][out] */ VARIANT* result) { return DOMObject::callWebScriptMethod(name, args, cArgs, result); }
virtual HRESULT STDMETHODCALLTYPE evaluateWebScript(
/* [in] */ BSTR script,
- /* [retval][out] */ VARIANT* result) { return DeprecatedDOMObject::evaluateWebScript(script, result); }
+ /* [retval][out] */ VARIANT* result) { return DOMObject::evaluateWebScript(script, result); }
virtual HRESULT STDMETHODCALLTYPE removeWebScriptKey(
- /* [in] */ BSTR name) { return DeprecatedDOMObject::removeWebScriptKey(name); }
+ /* [in] */ BSTR name) { return DOMObject::removeWebScriptKey(name); }
virtual HRESULT STDMETHODCALLTYPE stringRepresentation(
- /* [retval][out] */ BSTR* stringRepresentation) { return DeprecatedDOMObject::stringRepresentation(stringRepresentation); }
+ /* [retval][out] */ BSTR* stringRepresentation) { return DOMObject::stringRepresentation(stringRepresentation); }
virtual HRESULT STDMETHODCALLTYPE webScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [retval][out] */ VARIANT* result) { return DeprecatedDOMObject::webScriptValueAtIndex(index, result); }
+ /* [retval][out] */ VARIANT* result) { return DOMObject::webScriptValueAtIndex(index, result); }
virtual HRESULT STDMETHODCALLTYPE setWebScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [in] */ VARIANT val) { return DeprecatedDOMObject::setWebScriptValueAtIndex(index, val); }
+ /* [in] */ VARIANT val) { return DOMObject::setWebScriptValueAtIndex(index, val); }
virtual HRESULT STDMETHODCALLTYPE setException(
- /* [in] */ BSTR description) { return DeprecatedDOMObject::setException(description); }
+ /* [in] */ BSTR description) { return DOMObject::setException(description); }
- // IDeprecatedDOMEvent
+ // IDOMEvent
virtual HRESULT STDMETHODCALLTYPE type(
- /* [retval][out] */ BSTR* result) { return DeprecatedDOMEvent::type(result); }
+ /* [retval][out] */ BSTR* result) { return DOMEvent::type(result); }
virtual HRESULT STDMETHODCALLTYPE target(
- /* [retval][out] */ IDeprecatedDOMEventTarget** result) { return DeprecatedDOMEvent::target(result); }
+ /* [retval][out] */ IDOMEventTarget** result) { return DOMEvent::target(result); }
virtual HRESULT STDMETHODCALLTYPE currentTarget(
- /* [retval][out] */ IDeprecatedDOMEventTarget** result) { return DeprecatedDOMEvent::currentTarget(result); }
+ /* [retval][out] */ IDOMEventTarget** result) { return DOMEvent::currentTarget(result); }
virtual HRESULT STDMETHODCALLTYPE eventPhase(
- /* [retval][out] */ unsigned short* result) { return DeprecatedDOMEvent::eventPhase(result); }
+ /* [retval][out] */ unsigned short* result) { return DOMEvent::eventPhase(result); }
virtual HRESULT STDMETHODCALLTYPE bubbles(
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMEvent::bubbles(result); }
+ /* [retval][out] */ BOOL* result) { return DOMEvent::bubbles(result); }
virtual HRESULT STDMETHODCALLTYPE cancelable(
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMEvent::cancelable(result); }
+ /* [retval][out] */ BOOL* result) { return DOMEvent::cancelable(result); }
virtual HRESULT STDMETHODCALLTYPE timeStamp(
- /* [retval][out] */ DOMTimeStamp* result) { return DeprecatedDOMEvent::timeStamp(result); }
+ /* [retval][out] */ DOMTimeStamp* result) { return DOMEvent::timeStamp(result); }
- virtual HRESULT STDMETHODCALLTYPE stopPropagation( void) { return DeprecatedDOMEvent::stopPropagation(); }
+ virtual HRESULT STDMETHODCALLTYPE stopPropagation( void) { return DOMEvent::stopPropagation(); }
- virtual HRESULT STDMETHODCALLTYPE preventDefault( void) { return DeprecatedDOMEvent::preventDefault(); }
+ virtual HRESULT STDMETHODCALLTYPE preventDefault( void) { return DOMEvent::preventDefault(); }
virtual HRESULT STDMETHODCALLTYPE initEvent(
/* [in] */ BSTR eventTypeArg,
/* [in] */ BOOL canBubbleArg,
- /* [in] */ BOOL cancelableArg) { return DeprecatedDOMEvent::initEvent(eventTypeArg, canBubbleArg, cancelableArg); }
+ /* [in] */ BOOL cancelableArg) { return DOMEvent::initEvent(eventTypeArg, canBubbleArg, cancelableArg); }
- // IDeprecatedDOMUIEvent
+ // IDOMUIEvent
virtual HRESULT STDMETHODCALLTYPE view(
- /* [retval][out] */ IDeprecatedDOMWindow** result);
+ /* [retval][out] */ IDOMWindow** result);
virtual HRESULT STDMETHODCALLTYPE detail(
/* [retval][out] */ long* result);
/* [in] */ BSTR type,
/* [in] */ BOOL canBubble,
/* [in] */ BOOL cancelable,
- /* [in] */ IDeprecatedDOMWindow* view,
+ /* [in] */ IDOMWindow* view,
/* [in] */ long detail);
virtual HRESULT STDMETHODCALLTYPE keyCode(
/* [retval][out] */ long* result);
};
-class DeprecatedDOMKeyboardEvent : public DeprecatedDOMUIEvent, public IDeprecatedDOMKeyboardEvent
+class DOMKeyboardEvent : public DOMUIEvent, public IDOMKeyboardEvent
{
public:
- DeprecatedDOMKeyboardEvent(PassRefPtr<WebCore::Event> e) : DeprecatedDOMUIEvent(e) { }
+ DOMKeyboardEvent(PassRefPtr<WebCore::Event> e) : DOMUIEvent(e) { }
// IUnknown
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
- virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DeprecatedDOMUIEvent::AddRef(); }
- virtual ULONG STDMETHODCALLTYPE Release(void) { return DeprecatedDOMUIEvent::Release(); }
+ virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DOMUIEvent::AddRef(); }
+ virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMUIEvent::Release(); }
// IWebScriptObject
virtual HRESULT STDMETHODCALLTYPE throwException(
/* [in] */ BSTR exceptionMessage,
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMObject::throwException(exceptionMessage, result); }
+ /* [retval][out] */ BOOL* result) { return DOMObject::throwException(exceptionMessage, result); }
virtual HRESULT STDMETHODCALLTYPE callWebScriptMethod(
/* [in] */ BSTR name,
/* [size_is][in] */ const VARIANT args[ ],
/* [in] */ int cArgs,
- /* [retval][out] */ VARIANT* result) { return DeprecatedDOMObject::callWebScriptMethod(name, args, cArgs, result); }
+ /* [retval][out] */ VARIANT* result) { return DOMObject::callWebScriptMethod(name, args, cArgs, result); }
virtual HRESULT STDMETHODCALLTYPE evaluateWebScript(
/* [in] */ BSTR script,
- /* [retval][out] */ VARIANT* result) { return DeprecatedDOMObject::evaluateWebScript(script, result); }
+ /* [retval][out] */ VARIANT* result) { return DOMObject::evaluateWebScript(script, result); }
virtual HRESULT STDMETHODCALLTYPE removeWebScriptKey(
- /* [in] */ BSTR name) { return DeprecatedDOMObject::removeWebScriptKey(name); }
+ /* [in] */ BSTR name) { return DOMObject::removeWebScriptKey(name); }
virtual HRESULT STDMETHODCALLTYPE stringRepresentation(
- /* [retval][out] */ BSTR* stringRepresentation) { return DeprecatedDOMObject::stringRepresentation(stringRepresentation); }
+ /* [retval][out] */ BSTR* stringRepresentation) { return DOMObject::stringRepresentation(stringRepresentation); }
virtual HRESULT STDMETHODCALLTYPE webScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [retval][out] */ VARIANT* result) { return DeprecatedDOMObject::webScriptValueAtIndex(index, result); }
+ /* [retval][out] */ VARIANT* result) { return DOMObject::webScriptValueAtIndex(index, result); }
virtual HRESULT STDMETHODCALLTYPE setWebScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [in] */ VARIANT val) { return DeprecatedDOMObject::setWebScriptValueAtIndex(index, val); }
+ /* [in] */ VARIANT val) { return DOMObject::setWebScriptValueAtIndex(index, val); }
virtual HRESULT STDMETHODCALLTYPE setException(
- /* [in] */ BSTR description) { return DeprecatedDOMObject::setException(description); }
+ /* [in] */ BSTR description) { return DOMObject::setException(description); }
- // IDeprecatedDOMEvent
+ // IDOMEvent
virtual HRESULT STDMETHODCALLTYPE type(
- /* [retval][out] */ BSTR* result) { return DeprecatedDOMEvent::type(result); }
+ /* [retval][out] */ BSTR* result) { return DOMEvent::type(result); }
virtual HRESULT STDMETHODCALLTYPE target(
- /* [retval][out] */ IDeprecatedDOMEventTarget** result) { return DeprecatedDOMEvent::target(result); }
+ /* [retval][out] */ IDOMEventTarget** result) { return DOMEvent::target(result); }
virtual HRESULT STDMETHODCALLTYPE currentTarget(
- /* [retval][out] */ IDeprecatedDOMEventTarget** result) { return DeprecatedDOMEvent::currentTarget(result); }
+ /* [retval][out] */ IDOMEventTarget** result) { return DOMEvent::currentTarget(result); }
virtual HRESULT STDMETHODCALLTYPE eventPhase(
- /* [retval][out] */ unsigned short* result) { return DeprecatedDOMEvent::eventPhase(result); }
+ /* [retval][out] */ unsigned short* result) { return DOMEvent::eventPhase(result); }
virtual HRESULT STDMETHODCALLTYPE bubbles(
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMEvent::bubbles(result); }
+ /* [retval][out] */ BOOL* result) { return DOMEvent::bubbles(result); }
virtual HRESULT STDMETHODCALLTYPE cancelable(
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMEvent::cancelable(result); }
+ /* [retval][out] */ BOOL* result) { return DOMEvent::cancelable(result); }
virtual HRESULT STDMETHODCALLTYPE timeStamp(
- /* [retval][out] */ DOMTimeStamp* result) { return DeprecatedDOMEvent::timeStamp(result); }
+ /* [retval][out] */ DOMTimeStamp* result) { return DOMEvent::timeStamp(result); }
- virtual HRESULT STDMETHODCALLTYPE stopPropagation( void) { return DeprecatedDOMEvent::stopPropagation(); }
+ virtual HRESULT STDMETHODCALLTYPE stopPropagation( void) { return DOMEvent::stopPropagation(); }
- virtual HRESULT STDMETHODCALLTYPE preventDefault( void) { return DeprecatedDOMEvent::preventDefault(); }
+ virtual HRESULT STDMETHODCALLTYPE preventDefault( void) { return DOMEvent::preventDefault(); }
virtual HRESULT STDMETHODCALLTYPE initEvent(
/* [in] */ BSTR eventTypeArg,
/* [in] */ BOOL canBubbleArg,
- /* [in] */ BOOL cancelableArg) { return DeprecatedDOMEvent::initEvent(eventTypeArg, canBubbleArg, cancelableArg); }
+ /* [in] */ BOOL cancelableArg) { return DOMEvent::initEvent(eventTypeArg, canBubbleArg, cancelableArg); }
- // IDeprecatedDOMUIEvent
+ // IDOMUIEvent
virtual HRESULT STDMETHODCALLTYPE view(
- /* [retval][out] */ IDeprecatedDOMWindow** result) { return DeprecatedDOMUIEvent::view(result); }
+ /* [retval][out] */ IDOMWindow** result) { return DOMUIEvent::view(result); }
virtual HRESULT STDMETHODCALLTYPE detail(
- /* [retval][out] */ long* result) { return DeprecatedDOMUIEvent::detail(result); }
+ /* [retval][out] */ long* result) { return DOMUIEvent::detail(result); }
virtual HRESULT STDMETHODCALLTYPE initUIEvent(
/* [in] */ BSTR type,
/* [in] */ BOOL canBubble,
/* [in] */ BOOL cancelable,
- /* [in] */ IDeprecatedDOMWindow* view,
- /* [in] */ long detail) { return DeprecatedDOMUIEvent::initUIEvent(type, canBubble, cancelable, view, detail); }
+ /* [in] */ IDOMWindow* view,
+ /* [in] */ long detail) { return DOMUIEvent::initUIEvent(type, canBubble, cancelable, view, detail); }
virtual HRESULT STDMETHODCALLTYPE keyCode(
- /* [retval][out] */ long* result) { return DeprecatedDOMUIEvent::keyCode(result); }
+ /* [retval][out] */ long* result) { return DOMUIEvent::keyCode(result); }
virtual HRESULT STDMETHODCALLTYPE charCode(
- /* [retval][out] */ long* result) { return DeprecatedDOMUIEvent::charCode(result); }
+ /* [retval][out] */ long* result) { return DOMUIEvent::charCode(result); }
virtual HRESULT STDMETHODCALLTYPE layerX(
- /* [retval][out] */ long* result) { return DeprecatedDOMUIEvent::layerX(result); }
+ /* [retval][out] */ long* result) { return DOMUIEvent::layerX(result); }
virtual HRESULT STDMETHODCALLTYPE layerY(
- /* [retval][out] */ long* result) { return DeprecatedDOMUIEvent::layerY(result); }
+ /* [retval][out] */ long* result) { return DOMUIEvent::layerY(result); }
virtual HRESULT STDMETHODCALLTYPE pageX(
- /* [retval][out] */ long* result) { return DeprecatedDOMUIEvent::pageX(result); }
+ /* [retval][out] */ long* result) { return DOMUIEvent::pageX(result); }
virtual HRESULT STDMETHODCALLTYPE pageY(
- /* [retval][out] */ long* result) { return DeprecatedDOMUIEvent::pageY(result); }
+ /* [retval][out] */ long* result) { return DOMUIEvent::pageY(result); }
virtual HRESULT STDMETHODCALLTYPE which(
- /* [retval][out] */ long* result) { return DeprecatedDOMUIEvent::which(result); }
+ /* [retval][out] */ long* result) { return DOMUIEvent::which(result); }
- // IDeprecatedDOMKeyboardEvent
+ // IDOMKeyboardEvent
virtual HRESULT STDMETHODCALLTYPE keyIdentifier(
/* [retval][out] */ BSTR* result);
/* [in] */ BSTR type,
/* [in] */ BOOL canBubble,
/* [in] */ BOOL cancelable,
- /* [in] */ IDeprecatedDOMWindow* view,
+ /* [in] */ IDOMWindow* view,
/* [in] */ BSTR keyIdentifier,
/* [in] */ unsigned long keyLocation,
/* [in] */ BOOL ctrlKey,
/* [in] */ BOOL graphKey);
};
-class DeprecatedDOMMouseEvent : public DeprecatedDOMUIEvent, public IDeprecatedDOMMouseEvent
+class DOMMouseEvent : public DOMUIEvent, public IDOMMouseEvent
{
public:
- DeprecatedDOMMouseEvent(PassRefPtr<WebCore::Event> e) : DeprecatedDOMUIEvent(e) { }
+ DOMMouseEvent(PassRefPtr<WebCore::Event> e) : DOMUIEvent(e) { }
// IUnknown
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
- virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DeprecatedDOMUIEvent::AddRef(); }
- virtual ULONG STDMETHODCALLTYPE Release(void) { return DeprecatedDOMUIEvent::Release(); }
+ virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DOMUIEvent::AddRef(); }
+ virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMUIEvent::Release(); }
// IWebScriptObject
virtual HRESULT STDMETHODCALLTYPE throwException(
/* [in] */ BSTR exceptionMessage,
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMObject::throwException(exceptionMessage, result); }
+ /* [retval][out] */ BOOL* result) { return DOMObject::throwException(exceptionMessage, result); }
virtual HRESULT STDMETHODCALLTYPE callWebScriptMethod(
/* [in] */ BSTR name,
/* [size_is][in] */ const VARIANT args[ ],
/* [in] */ int cArgs,
- /* [retval][out] */ VARIANT* result) { return DeprecatedDOMObject::callWebScriptMethod(name, args, cArgs, result); }
+ /* [retval][out] */ VARIANT* result) { return DOMObject::callWebScriptMethod(name, args, cArgs, result); }
virtual HRESULT STDMETHODCALLTYPE evaluateWebScript(
/* [in] */ BSTR script,
- /* [retval][out] */ VARIANT* result) { return DeprecatedDOMObject::evaluateWebScript(script, result); }
+ /* [retval][out] */ VARIANT* result) { return DOMObject::evaluateWebScript(script, result); }
virtual HRESULT STDMETHODCALLTYPE removeWebScriptKey(
- /* [in] */ BSTR name) { return DeprecatedDOMObject::removeWebScriptKey(name); }
+ /* [in] */ BSTR name) { return DOMObject::removeWebScriptKey(name); }
virtual HRESULT STDMETHODCALLTYPE stringRepresentation(
- /* [retval][out] */ BSTR* stringRepresentation) { return DeprecatedDOMObject::stringRepresentation(stringRepresentation); }
+ /* [retval][out] */ BSTR* stringRepresentation) { return DOMObject::stringRepresentation(stringRepresentation); }
virtual HRESULT STDMETHODCALLTYPE webScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [retval][out] */ VARIANT* result) { return DeprecatedDOMObject::webScriptValueAtIndex(index, result); }
+ /* [retval][out] */ VARIANT* result) { return DOMObject::webScriptValueAtIndex(index, result); }
virtual HRESULT STDMETHODCALLTYPE setWebScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [in] */ VARIANT val) { return DeprecatedDOMObject::setWebScriptValueAtIndex(index, val); }
+ /* [in] */ VARIANT val) { return DOMObject::setWebScriptValueAtIndex(index, val); }
virtual HRESULT STDMETHODCALLTYPE setException(
- /* [in] */ BSTR description) { return DeprecatedDOMObject::setException(description); }
+ /* [in] */ BSTR description) { return DOMObject::setException(description); }
- // IDeprecatedDOMEvent
+ // IDOMEvent
virtual HRESULT STDMETHODCALLTYPE type(
- /* [retval][out] */ BSTR* result) { return DeprecatedDOMEvent::type(result); }
+ /* [retval][out] */ BSTR* result) { return DOMEvent::type(result); }
virtual HRESULT STDMETHODCALLTYPE target(
- /* [retval][out] */ IDeprecatedDOMEventTarget** result) { return DeprecatedDOMEvent::target(result); }
+ /* [retval][out] */ IDOMEventTarget** result) { return DOMEvent::target(result); }
virtual HRESULT STDMETHODCALLTYPE currentTarget(
- /* [retval][out] */ IDeprecatedDOMEventTarget** result) { return DeprecatedDOMEvent::currentTarget(result); }
+ /* [retval][out] */ IDOMEventTarget** result) { return DOMEvent::currentTarget(result); }
virtual HRESULT STDMETHODCALLTYPE eventPhase(
- /* [retval][out] */ unsigned short* result) { return DeprecatedDOMEvent::eventPhase(result); }
+ /* [retval][out] */ unsigned short* result) { return DOMEvent::eventPhase(result); }
virtual HRESULT STDMETHODCALLTYPE bubbles(
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMEvent::bubbles(result); }
+ /* [retval][out] */ BOOL* result) { return DOMEvent::bubbles(result); }
virtual HRESULT STDMETHODCALLTYPE cancelable(
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMEvent::cancelable(result); }
+ /* [retval][out] */ BOOL* result) { return DOMEvent::cancelable(result); }
virtual HRESULT STDMETHODCALLTYPE timeStamp(
- /* [retval][out] */ DOMTimeStamp* result) { return DeprecatedDOMEvent::timeStamp(result); }
+ /* [retval][out] */ DOMTimeStamp* result) { return DOMEvent::timeStamp(result); }
- virtual HRESULT STDMETHODCALLTYPE stopPropagation( void) { return DeprecatedDOMEvent::stopPropagation(); }
+ virtual HRESULT STDMETHODCALLTYPE stopPropagation( void) { return DOMEvent::stopPropagation(); }
- virtual HRESULT STDMETHODCALLTYPE preventDefault( void) { return DeprecatedDOMEvent::preventDefault(); }
+ virtual HRESULT STDMETHODCALLTYPE preventDefault( void) { return DOMEvent::preventDefault(); }
virtual HRESULT STDMETHODCALLTYPE initEvent(
/* [in] */ BSTR eventTypeArg,
/* [in] */ BOOL canBubbleArg,
- /* [in] */ BOOL cancelableArg) { return DeprecatedDOMEvent::initEvent(eventTypeArg, canBubbleArg, cancelableArg); }
+ /* [in] */ BOOL cancelableArg) { return DOMEvent::initEvent(eventTypeArg, canBubbleArg, cancelableArg); }
- // IDeprecatedDOMUIEvent
+ // IDOMUIEvent
virtual HRESULT STDMETHODCALLTYPE view(
- /* [retval][out] */ IDeprecatedDOMWindow** result) { return DeprecatedDOMUIEvent::view(result); }
+ /* [retval][out] */ IDOMWindow** result) { return DOMUIEvent::view(result); }
virtual HRESULT STDMETHODCALLTYPE detail(
- /* [retval][out] */ long* result) { return DeprecatedDOMUIEvent::detail(result); }
+ /* [retval][out] */ long* result) { return DOMUIEvent::detail(result); }
virtual HRESULT STDMETHODCALLTYPE initUIEvent(
/* [in] */ BSTR type,
/* [in] */ BOOL canBubble,
/* [in] */ BOOL cancelable,
- /* [in] */ IDeprecatedDOMWindow* view,
- /* [in] */ long detail) { return DeprecatedDOMUIEvent::initUIEvent(type, canBubble, cancelable, view, detail); }
+ /* [in] */ IDOMWindow* view,
+ /* [in] */ long detail) { return DOMUIEvent::initUIEvent(type, canBubble, cancelable, view, detail); }
virtual HRESULT STDMETHODCALLTYPE keyCode(
- /* [retval][out] */ long* result) { return DeprecatedDOMUIEvent::keyCode(result); }
+ /* [retval][out] */ long* result) { return DOMUIEvent::keyCode(result); }
virtual HRESULT STDMETHODCALLTYPE charCode(
- /* [retval][out] */ long* result) { return DeprecatedDOMUIEvent::charCode(result); }
+ /* [retval][out] */ long* result) { return DOMUIEvent::charCode(result); }
virtual HRESULT STDMETHODCALLTYPE layerX(
- /* [retval][out] */ long* result) { return DeprecatedDOMUIEvent::layerX(result); }
+ /* [retval][out] */ long* result) { return DOMUIEvent::layerX(result); }
virtual HRESULT STDMETHODCALLTYPE layerY(
- /* [retval][out] */ long* result) { return DeprecatedDOMUIEvent::layerY(result); }
+ /* [retval][out] */ long* result) { return DOMUIEvent::layerY(result); }
virtual HRESULT STDMETHODCALLTYPE pageX(
- /* [retval][out] */ long* result) { return DeprecatedDOMUIEvent::pageX(result); }
+ /* [retval][out] */ long* result) { return DOMUIEvent::pageX(result); }
virtual HRESULT STDMETHODCALLTYPE pageY(
- /* [retval][out] */ long* result) { return DeprecatedDOMUIEvent::pageY(result); }
+ /* [retval][out] */ long* result) { return DOMUIEvent::pageY(result); }
virtual HRESULT STDMETHODCALLTYPE which(
- /* [retval][out] */ long* result) { return DeprecatedDOMUIEvent::which(result); }
+ /* [retval][out] */ long* result) { return DOMUIEvent::which(result); }
- // IDeprecatedDOMMouseEvent
+ // IDOMMouseEvent
virtual HRESULT STDMETHODCALLTYPE screenX(
/* [retval][out] */ long* result);
/* [retval][out] */ unsigned short* result);
virtual HRESULT STDMETHODCALLTYPE relatedTarget(
- /* [retval][out] */ IDeprecatedDOMEventTarget** result);
+ /* [retval][out] */ IDOMEventTarget** result);
virtual HRESULT STDMETHODCALLTYPE initMouseEvent(
/* [in] */ BSTR type,
/* [in] */ BOOL canBubble,
/* [in] */ BOOL cancelable,
- /* [in] */ IDeprecatedDOMWindow* view,
+ /* [in] */ IDOMWindow* view,
/* [in] */ long detail,
/* [in] */ long screenX,
/* [in] */ long screenY,
/* [in] */ BOOL shiftKey,
/* [in] */ BOOL metaKey,
/* [in] */ unsigned short button,
- /* [in] */ IDeprecatedDOMEventTarget* relatedTarget);
+ /* [in] */ IDOMEventTarget* relatedTarget);
virtual HRESULT STDMETHODCALLTYPE offsetX(
/* [retval][out] */ long* result);
/* [retval][out] */ long* result);
virtual HRESULT STDMETHODCALLTYPE fromElement(
- /* [retval][out] */ IDeprecatedDOMNode** result);
+ /* [retval][out] */ IDOMNode** result);
virtual HRESULT STDMETHODCALLTYPE toElement(
- /* [retval][out] */ IDeprecatedDOMNode** result);
+ /* [retval][out] */ IDOMNode** result);
};
-class DeprecatedDOMMutationEvent : public DeprecatedDOMEvent, public IDeprecatedDOMMutationEvent
+class DOMMutationEvent : public DOMEvent, public IDOMMutationEvent
{
public:
- DeprecatedDOMMutationEvent(PassRefPtr<WebCore::Event> e) : DeprecatedDOMEvent(e) { }
+ DOMMutationEvent(PassRefPtr<WebCore::Event> e) : DOMEvent(e) { }
// IUnknown
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
- virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DeprecatedDOMEvent::AddRef(); }
- virtual ULONG STDMETHODCALLTYPE Release(void) { return DeprecatedDOMEvent::Release(); }
+ virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DOMEvent::AddRef(); }
+ virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMEvent::Release(); }
// IWebScriptObject
virtual HRESULT STDMETHODCALLTYPE throwException(
/* [in] */ BSTR exceptionMessage,
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMObject::throwException(exceptionMessage, result); }
+ /* [retval][out] */ BOOL* result) { return DOMObject::throwException(exceptionMessage, result); }
virtual HRESULT STDMETHODCALLTYPE callWebScriptMethod(
/* [in] */ BSTR name,
/* [size_is][in] */ const VARIANT args[ ],
/* [in] */ int cArgs,
- /* [retval][out] */ VARIANT* result) { return DeprecatedDOMObject::callWebScriptMethod(name, args, cArgs, result); }
+ /* [retval][out] */ VARIANT* result) { return DOMObject::callWebScriptMethod(name, args, cArgs, result); }
virtual HRESULT STDMETHODCALLTYPE evaluateWebScript(
/* [in] */ BSTR script,
- /* [retval][out] */ VARIANT* result) { return DeprecatedDOMObject::evaluateWebScript(script, result); }
+ /* [retval][out] */ VARIANT* result) { return DOMObject::evaluateWebScript(script, result); }
virtual HRESULT STDMETHODCALLTYPE removeWebScriptKey(
- /* [in] */ BSTR name) { return DeprecatedDOMObject::removeWebScriptKey(name); }
+ /* [in] */ BSTR name) { return DOMObject::removeWebScriptKey(name); }
virtual HRESULT STDMETHODCALLTYPE stringRepresentation(
- /* [retval][out] */ BSTR* stringRepresentation) { return DeprecatedDOMObject::stringRepresentation(stringRepresentation); }
+ /* [retval][out] */ BSTR* stringRepresentation) { return DOMObject::stringRepresentation(stringRepresentation); }
virtual HRESULT STDMETHODCALLTYPE webScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [retval][out] */ VARIANT* result) { return DeprecatedDOMObject::webScriptValueAtIndex(index, result); }
+ /* [retval][out] */ VARIANT* result) { return DOMObject::webScriptValueAtIndex(index, result); }
virtual HRESULT STDMETHODCALLTYPE setWebScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [in] */ VARIANT val) { return DeprecatedDOMObject::setWebScriptValueAtIndex(index, val); }
+ /* [in] */ VARIANT val) { return DOMObject::setWebScriptValueAtIndex(index, val); }
virtual HRESULT STDMETHODCALLTYPE setException(
- /* [in] */ BSTR description) { return DeprecatedDOMObject::setException(description); }
+ /* [in] */ BSTR description) { return DOMObject::setException(description); }
- // IDeprecatedDOMEvent
+ // IDOMEvent
virtual HRESULT STDMETHODCALLTYPE type(
- /* [retval][out] */ BSTR* result) { return DeprecatedDOMEvent::type(result); }
+ /* [retval][out] */ BSTR* result) { return DOMEvent::type(result); }
virtual HRESULT STDMETHODCALLTYPE target(
- /* [retval][out] */ IDeprecatedDOMEventTarget** result) { return DeprecatedDOMEvent::target(result); }
+ /* [retval][out] */ IDOMEventTarget** result) { return DOMEvent::target(result); }
virtual HRESULT STDMETHODCALLTYPE currentTarget(
- /* [retval][out] */ IDeprecatedDOMEventTarget** result) { return DeprecatedDOMEvent::currentTarget(result); }
+ /* [retval][out] */ IDOMEventTarget** result) { return DOMEvent::currentTarget(result); }
virtual HRESULT STDMETHODCALLTYPE eventPhase(
- /* [retval][out] */ unsigned short* result) { return DeprecatedDOMEvent::eventPhase(result); }
+ /* [retval][out] */ unsigned short* result) { return DOMEvent::eventPhase(result); }
virtual HRESULT STDMETHODCALLTYPE bubbles(
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMEvent::bubbles(result); }
+ /* [retval][out] */ BOOL* result) { return DOMEvent::bubbles(result); }
virtual HRESULT STDMETHODCALLTYPE cancelable(
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMEvent::cancelable(result); }
+ /* [retval][out] */ BOOL* result) { return DOMEvent::cancelable(result); }
virtual HRESULT STDMETHODCALLTYPE timeStamp(
- /* [retval][out] */ DOMTimeStamp* result) { return DeprecatedDOMEvent::timeStamp(result); }
+ /* [retval][out] */ DOMTimeStamp* result) { return DOMEvent::timeStamp(result); }
- virtual HRESULT STDMETHODCALLTYPE stopPropagation( void) { return DeprecatedDOMEvent::stopPropagation(); }
+ virtual HRESULT STDMETHODCALLTYPE stopPropagation( void) { return DOMEvent::stopPropagation(); }
- virtual HRESULT STDMETHODCALLTYPE preventDefault( void) { return DeprecatedDOMEvent::preventDefault(); }
+ virtual HRESULT STDMETHODCALLTYPE preventDefault( void) { return DOMEvent::preventDefault(); }
virtual HRESULT STDMETHODCALLTYPE initEvent(
/* [in] */ BSTR eventTypeArg,
/* [in] */ BOOL canBubbleArg,
- /* [in] */ BOOL cancelableArg) { return DeprecatedDOMEvent::initEvent(eventTypeArg, canBubbleArg, cancelableArg); }
+ /* [in] */ BOOL cancelableArg) { return DOMEvent::initEvent(eventTypeArg, canBubbleArg, cancelableArg); }
- // IDeprecatedDOMMutationEvent
+ // IDOMMutationEvent
virtual HRESULT STDMETHODCALLTYPE relatedNode(
- /* [retval][out] */ IDeprecatedDOMNode** result);
+ /* [retval][out] */ IDOMNode** result);
virtual HRESULT STDMETHODCALLTYPE prevValue(
/* [retval][out] */ BSTR* result);
/* [in] */ BSTR type,
/* [in] */ BOOL canBubble,
/* [in] */ BOOL cancelable,
- /* [in] */ IDeprecatedDOMNode* relatedNode,
+ /* [in] */ IDOMNode* relatedNode,
/* [in] */ BSTR prevValue,
/* [in] */ BSTR newValue,
/* [in] */ BSTR attrName,
/* [in] */ unsigned short attrChange);
};
-class DeprecatedDOMOverflowEvent : public DeprecatedDOMEvent, public IDeprecatedDOMOverflowEvent
+class DOMOverflowEvent : public DOMEvent, public IDOMOverflowEvent
{
public:
- DeprecatedDOMOverflowEvent(PassRefPtr<WebCore::Event> e) : DeprecatedDOMEvent(e) { }
+ DOMOverflowEvent(PassRefPtr<WebCore::Event> e) : DOMEvent(e) { }
// IUnknown
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
- virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DeprecatedDOMEvent::AddRef(); }
- virtual ULONG STDMETHODCALLTYPE Release(void) { return DeprecatedDOMEvent::Release(); }
+ virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DOMEvent::AddRef(); }
+ virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMEvent::Release(); }
// IWebScriptObject
virtual HRESULT STDMETHODCALLTYPE throwException(
/* [in] */ BSTR exceptionMessage,
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMObject::throwException(exceptionMessage, result); }
+ /* [retval][out] */ BOOL* result) { return DOMObject::throwException(exceptionMessage, result); }
virtual HRESULT STDMETHODCALLTYPE callWebScriptMethod(
/* [in] */ BSTR name,
/* [size_is][in] */ const VARIANT args[ ],
/* [in] */ int cArgs,
- /* [retval][out] */ VARIANT* result) { return DeprecatedDOMObject::callWebScriptMethod(name, args, cArgs, result); }
+ /* [retval][out] */ VARIANT* result) { return DOMObject::callWebScriptMethod(name, args, cArgs, result); }
virtual HRESULT STDMETHODCALLTYPE evaluateWebScript(
/* [in] */ BSTR script,
- /* [retval][out] */ VARIANT* result) { return DeprecatedDOMObject::evaluateWebScript(script, result); }
+ /* [retval][out] */ VARIANT* result) { return DOMObject::evaluateWebScript(script, result); }
virtual HRESULT STDMETHODCALLTYPE removeWebScriptKey(
- /* [in] */ BSTR name) { return DeprecatedDOMObject::removeWebScriptKey(name); }
+ /* [in] */ BSTR name) { return DOMObject::removeWebScriptKey(name); }
virtual HRESULT STDMETHODCALLTYPE stringRepresentation(
- /* [retval][out] */ BSTR* stringRepresentation) { return DeprecatedDOMObject::stringRepresentation(stringRepresentation); }
+ /* [retval][out] */ BSTR* stringRepresentation) { return DOMObject::stringRepresentation(stringRepresentation); }
virtual HRESULT STDMETHODCALLTYPE webScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [retval][out] */ VARIANT* result) { return DeprecatedDOMObject::webScriptValueAtIndex(index, result); }
+ /* [retval][out] */ VARIANT* result) { return DOMObject::webScriptValueAtIndex(index, result); }
virtual HRESULT STDMETHODCALLTYPE setWebScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [in] */ VARIANT val) { return DeprecatedDOMObject::setWebScriptValueAtIndex(index, val); }
+ /* [in] */ VARIANT val) { return DOMObject::setWebScriptValueAtIndex(index, val); }
virtual HRESULT STDMETHODCALLTYPE setException(
- /* [in] */ BSTR description) { return DeprecatedDOMObject::setException(description); }
+ /* [in] */ BSTR description) { return DOMObject::setException(description); }
- // IDeprecatedDOMEvent
+ // IDOMEvent
virtual HRESULT STDMETHODCALLTYPE type(
- /* [retval][out] */ BSTR* result) { return DeprecatedDOMEvent::type(result); }
+ /* [retval][out] */ BSTR* result) { return DOMEvent::type(result); }
virtual HRESULT STDMETHODCALLTYPE target(
- /* [retval][out] */ IDeprecatedDOMEventTarget** result) { return DeprecatedDOMEvent::target(result); }
+ /* [retval][out] */ IDOMEventTarget** result) { return DOMEvent::target(result); }
virtual HRESULT STDMETHODCALLTYPE currentTarget(
- /* [retval][out] */ IDeprecatedDOMEventTarget** result) { return DeprecatedDOMEvent::currentTarget(result); }
+ /* [retval][out] */ IDOMEventTarget** result) { return DOMEvent::currentTarget(result); }
virtual HRESULT STDMETHODCALLTYPE eventPhase(
- /* [retval][out] */ unsigned short* result) { return DeprecatedDOMEvent::eventPhase(result); }
+ /* [retval][out] */ unsigned short* result) { return DOMEvent::eventPhase(result); }
virtual HRESULT STDMETHODCALLTYPE bubbles(
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMEvent::bubbles(result); }
+ /* [retval][out] */ BOOL* result) { return DOMEvent::bubbles(result); }
virtual HRESULT STDMETHODCALLTYPE cancelable(
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMEvent::cancelable(result); }
+ /* [retval][out] */ BOOL* result) { return DOMEvent::cancelable(result); }
virtual HRESULT STDMETHODCALLTYPE timeStamp(
- /* [retval][out] */ DOMTimeStamp* result) { return DeprecatedDOMEvent::timeStamp(result); }
+ /* [retval][out] */ DOMTimeStamp* result) { return DOMEvent::timeStamp(result); }
- virtual HRESULT STDMETHODCALLTYPE stopPropagation( void) { return DeprecatedDOMEvent::stopPropagation(); }
+ virtual HRESULT STDMETHODCALLTYPE stopPropagation( void) { return DOMEvent::stopPropagation(); }
- virtual HRESULT STDMETHODCALLTYPE preventDefault( void) { return DeprecatedDOMEvent::preventDefault(); }
+ virtual HRESULT STDMETHODCALLTYPE preventDefault( void) { return DOMEvent::preventDefault(); }
virtual HRESULT STDMETHODCALLTYPE initEvent(
/* [in] */ BSTR eventTypeArg,
/* [in] */ BOOL canBubbleArg,
- /* [in] */ BOOL cancelableArg) { return DeprecatedDOMEvent::initEvent(eventTypeArg, canBubbleArg, cancelableArg); }
+ /* [in] */ BOOL cancelableArg) { return DOMEvent::initEvent(eventTypeArg, canBubbleArg, cancelableArg); }
- // IDeprecatedDOMOverflowEvent
+ // IDOMOverflowEvent
virtual HRESULT STDMETHODCALLTYPE orient(
/* [retval][out] */ unsigned short* result);
/* [retval][out] */ BOOL* result);
};
-class DeprecatedDOMWheelEvent : public DeprecatedDOMUIEvent, public IDeprecatedDOMWheelEvent
+class DOMWheelEvent : public DOMUIEvent, public IDOMWheelEvent
{
public:
- DeprecatedDOMWheelEvent(PassRefPtr<WebCore::Event> e) : DeprecatedDOMUIEvent(e) { }
+ DOMWheelEvent(PassRefPtr<WebCore::Event> e) : DOMUIEvent(e) { }
// IUnknown
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
- virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DeprecatedDOMUIEvent::AddRef(); }
- virtual ULONG STDMETHODCALLTYPE Release(void) { return DeprecatedDOMUIEvent::Release(); }
+ virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DOMUIEvent::AddRef(); }
+ virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMUIEvent::Release(); }
// IWebScriptObject
virtual HRESULT STDMETHODCALLTYPE throwException(
/* [in] */ BSTR exceptionMessage,
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMObject::throwException(exceptionMessage, result); }
+ /* [retval][out] */ BOOL* result) { return DOMObject::throwException(exceptionMessage, result); }
virtual HRESULT STDMETHODCALLTYPE callWebScriptMethod(
/* [in] */ BSTR name,
/* [size_is][in] */ const VARIANT args[ ],
/* [in] */ int cArgs,
- /* [retval][out] */ VARIANT* result) { return DeprecatedDOMObject::callWebScriptMethod(name, args, cArgs, result); }
+ /* [retval][out] */ VARIANT* result) { return DOMObject::callWebScriptMethod(name, args, cArgs, result); }
virtual HRESULT STDMETHODCALLTYPE evaluateWebScript(
/* [in] */ BSTR script,
- /* [retval][out] */ VARIANT* result) { return DeprecatedDOMObject::evaluateWebScript(script, result); }
+ /* [retval][out] */ VARIANT* result) { return DOMObject::evaluateWebScript(script, result); }
virtual HRESULT STDMETHODCALLTYPE removeWebScriptKey(
- /* [in] */ BSTR name) { return DeprecatedDOMObject::removeWebScriptKey(name); }
+ /* [in] */ BSTR name) { return DOMObject::removeWebScriptKey(name); }
virtual HRESULT STDMETHODCALLTYPE stringRepresentation(
- /* [retval][out] */ BSTR* stringRepresentation) { return DeprecatedDOMObject::stringRepresentation(stringRepresentation); }
+ /* [retval][out] */ BSTR* stringRepresentation) { return DOMObject::stringRepresentation(stringRepresentation); }
virtual HRESULT STDMETHODCALLTYPE webScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [retval][out] */ VARIANT* result) { return DeprecatedDOMObject::webScriptValueAtIndex(index, result); }
+ /* [retval][out] */ VARIANT* result) { return DOMObject::webScriptValueAtIndex(index, result); }
virtual HRESULT STDMETHODCALLTYPE setWebScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [in] */ VARIANT val) { return DeprecatedDOMObject::setWebScriptValueAtIndex(index, val); }
+ /* [in] */ VARIANT val) { return DOMObject::setWebScriptValueAtIndex(index, val); }
virtual HRESULT STDMETHODCALLTYPE setException(
- /* [in] */ BSTR description) { return DeprecatedDOMObject::setException(description); }
+ /* [in] */ BSTR description) { return DOMObject::setException(description); }
- // IDeprecatedDOMEvent
+ // IDOMEvent
virtual HRESULT STDMETHODCALLTYPE type(
- /* [retval][out] */ BSTR* result) { return DeprecatedDOMEvent::type(result); }
+ /* [retval][out] */ BSTR* result) { return DOMEvent::type(result); }
virtual HRESULT STDMETHODCALLTYPE target(
- /* [retval][out] */ IDeprecatedDOMEventTarget** result) { return DeprecatedDOMEvent::target(result); }
+ /* [retval][out] */ IDOMEventTarget** result) { return DOMEvent::target(result); }
virtual HRESULT STDMETHODCALLTYPE currentTarget(
- /* [retval][out] */ IDeprecatedDOMEventTarget** result) { return DeprecatedDOMEvent::currentTarget(result); }
+ /* [retval][out] */ IDOMEventTarget** result) { return DOMEvent::currentTarget(result); }
virtual HRESULT STDMETHODCALLTYPE eventPhase(
- /* [retval][out] */ unsigned short* result) { return DeprecatedDOMEvent::eventPhase(result); }
+ /* [retval][out] */ unsigned short* result) { return DOMEvent::eventPhase(result); }
virtual HRESULT STDMETHODCALLTYPE bubbles(
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMEvent::bubbles(result); }
+ /* [retval][out] */ BOOL* result) { return DOMEvent::bubbles(result); }
virtual HRESULT STDMETHODCALLTYPE cancelable(
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMEvent::cancelable(result); }
+ /* [retval][out] */ BOOL* result) { return DOMEvent::cancelable(result); }
virtual HRESULT STDMETHODCALLTYPE timeStamp(
- /* [retval][out] */ DOMTimeStamp* result) { return DeprecatedDOMEvent::timeStamp(result); }
+ /* [retval][out] */ DOMTimeStamp* result) { return DOMEvent::timeStamp(result); }
- virtual HRESULT STDMETHODCALLTYPE stopPropagation( void) { return DeprecatedDOMEvent::stopPropagation(); }
+ virtual HRESULT STDMETHODCALLTYPE stopPropagation( void) { return DOMEvent::stopPropagation(); }
- virtual HRESULT STDMETHODCALLTYPE preventDefault( void) { return DeprecatedDOMEvent::preventDefault(); }
+ virtual HRESULT STDMETHODCALLTYPE preventDefault( void) { return DOMEvent::preventDefault(); }
virtual HRESULT STDMETHODCALLTYPE initEvent(
/* [in] */ BSTR eventTypeArg,
/* [in] */ BOOL canBubbleArg,
- /* [in] */ BOOL cancelableArg) { return DeprecatedDOMEvent::initEvent(eventTypeArg, canBubbleArg, cancelableArg); }
+ /* [in] */ BOOL cancelableArg) { return DOMEvent::initEvent(eventTypeArg, canBubbleArg, cancelableArg); }
- // IDeprecatedDOMUIEvent
+ // IDOMUIEvent
virtual HRESULT STDMETHODCALLTYPE view(
- /* [retval][out] */ IDeprecatedDOMWindow** result) { return DeprecatedDOMUIEvent::view(result); }
+ /* [retval][out] */ IDOMWindow** result) { return DOMUIEvent::view(result); }
virtual HRESULT STDMETHODCALLTYPE detail(
- /* [retval][out] */ long* result) { return DeprecatedDOMUIEvent::detail(result); }
+ /* [retval][out] */ long* result) { return DOMUIEvent::detail(result); }
virtual HRESULT STDMETHODCALLTYPE initUIEvent(
/* [in] */ BSTR type,
/* [in] */ BOOL canBubble,
/* [in] */ BOOL cancelable,
- /* [in] */ IDeprecatedDOMWindow* view,
- /* [in] */ long detail) { return DeprecatedDOMUIEvent::initUIEvent(type, canBubble, cancelable, view, detail); }
+ /* [in] */ IDOMWindow* view,
+ /* [in] */ long detail) { return DOMUIEvent::initUIEvent(type, canBubble, cancelable, view, detail); }
virtual HRESULT STDMETHODCALLTYPE keyCode(
- /* [retval][out] */ long* result) { return DeprecatedDOMUIEvent::keyCode(result); }
+ /* [retval][out] */ long* result) { return DOMUIEvent::keyCode(result); }
virtual HRESULT STDMETHODCALLTYPE charCode(
- /* [retval][out] */ long* result) { return DeprecatedDOMUIEvent::charCode(result); }
+ /* [retval][out] */ long* result) { return DOMUIEvent::charCode(result); }
virtual HRESULT STDMETHODCALLTYPE layerX(
- /* [retval][out] */ long* result) { return DeprecatedDOMUIEvent::layerX(result); }
+ /* [retval][out] */ long* result) { return DOMUIEvent::layerX(result); }
virtual HRESULT STDMETHODCALLTYPE layerY(
- /* [retval][out] */ long* result) { return DeprecatedDOMUIEvent::layerY(result); }
+ /* [retval][out] */ long* result) { return DOMUIEvent::layerY(result); }
virtual HRESULT STDMETHODCALLTYPE pageX(
- /* [retval][out] */ long* result) { return DeprecatedDOMUIEvent::pageX(result); }
+ /* [retval][out] */ long* result) { return DOMUIEvent::pageX(result); }
virtual HRESULT STDMETHODCALLTYPE pageY(
- /* [retval][out] */ long* result) { return DeprecatedDOMUIEvent::pageY(result); }
+ /* [retval][out] */ long* result) { return DOMUIEvent::pageY(result); }
virtual HRESULT STDMETHODCALLTYPE which(
- /* [retval][out] */ long* result) { return DeprecatedDOMUIEvent::which(result); }
+ /* [retval][out] */ long* result) { return DOMUIEvent::which(result); }
- // IDeprecatedDOMWheelEvent
+ // IDOMWheelEvent
virtual HRESULT STDMETHODCALLTYPE screenX(
/* [retval][out] */ long* result);
virtual HRESULT STDMETHODCALLTYPE initWheelEvent(
/* [in] */ long wheelDeltaX,
/* [in] */ long wheelDeltaY,
- /* [in] */ IDeprecatedDOMWindow* view,
+ /* [in] */ IDOMWindow* view,
/* [in] */ long screenX,
/* [in] */ long screenY,
/* [in] */ long clientX,
using namespace WebCore;
using namespace HTMLNames;
-// DeprecatedDOMHTMLCollection
+// DOMHTMLCollection
-DeprecatedDOMHTMLCollection::DeprecatedDOMHTMLCollection(WebCore::HTMLCollection* c)
+DOMHTMLCollection::DOMHTMLCollection(WebCore::HTMLCollection* c)
: m_collection(c)
{
}
-IDeprecatedDOMHTMLCollection* DeprecatedDOMHTMLCollection::createInstance(WebCore::HTMLCollection* c)
+IDOMHTMLCollection* DOMHTMLCollection::createInstance(WebCore::HTMLCollection* c)
{
if (!c)
return 0;
- IDeprecatedDOMHTMLCollection* htmlCollection = 0;
- DeprecatedDOMHTMLCollection* newCollection = new DeprecatedDOMHTMLCollection(c);
- if (FAILED(newCollection->QueryInterface(IID_IDeprecatedDOMHTMLCollection, (void**)&htmlCollection))) {
+ IDOMHTMLCollection* htmlCollection = 0;
+ DOMHTMLCollection* newCollection = new DOMHTMLCollection(c);
+ if (FAILED(newCollection->QueryInterface(IID_IDOMHTMLCollection, (void**)&htmlCollection))) {
delete newCollection;
return 0;
}
return htmlCollection;
}
-// DeprecatedDOMHTMLCollection - IUnknown -----------------------------------------------
+// DOMHTMLCollection - IUnknown -----------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLCollection::QueryInterface(REFIID riid, void** ppvObject)
+HRESULT STDMETHODCALLTYPE DOMHTMLCollection::QueryInterface(REFIID riid, void** ppvObject)
{
*ppvObject = 0;
- if (IsEqualGUID(riid, IID_IDeprecatedDOMHTMLCollection))
- *ppvObject = static_cast<IDeprecatedDOMHTMLCollection*>(this);
+ if (IsEqualGUID(riid, IID_IDOMHTMLCollection))
+ *ppvObject = static_cast<IDOMHTMLCollection*>(this);
else
- return DeprecatedDOMObject::QueryInterface(riid, ppvObject);
+ return DOMObject::QueryInterface(riid, ppvObject);
AddRef();
return S_OK;
}
-// DeprecatedDOMHTMLCollection ----------------------------------------------------------
+// DOMHTMLCollection ----------------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLCollection::length(
+HRESULT STDMETHODCALLTYPE DOMHTMLCollection::length(
/* [retval][out] */ UINT* result)
{
*result = 0;
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLCollection::item(
+HRESULT STDMETHODCALLTYPE DOMHTMLCollection::item(
/* [in] */ UINT index,
- /* [retval][out] */ IDeprecatedDOMNode** node)
+ /* [retval][out] */ IDOMNode** node)
{
*node = 0;
if (!m_collection)
return E_POINTER;
- *node = DeprecatedDOMNode::createInstance(m_collection->item(index));
+ *node = DOMNode::createInstance(m_collection->item(index));
return *node ? S_OK : E_FAIL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLCollection::namedItem(
+HRESULT STDMETHODCALLTYPE DOMHTMLCollection::namedItem(
/* [in] */ BSTR /*name*/,
- /* [retval][out] */ IDeprecatedDOMNode** /*node*/)
+ /* [retval][out] */ IDOMNode** /*node*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-// DeprecatedDOMHTMLOptionsCollection - IUnknown ----------------------------------------
+// DOMHTMLOptionsCollection - IUnknown ----------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLOptionsCollection::QueryInterface(REFIID riid, void** ppvObject)
+HRESULT STDMETHODCALLTYPE DOMHTMLOptionsCollection::QueryInterface(REFIID riid, void** ppvObject)
{
*ppvObject = 0;
- if (IsEqualGUID(riid, IID_IDeprecatedDOMHTMLOptionsCollection))
- *ppvObject = static_cast<IDeprecatedDOMHTMLOptionsCollection*>(this);
+ if (IsEqualGUID(riid, IID_IDOMHTMLOptionsCollection))
+ *ppvObject = static_cast<IDOMHTMLOptionsCollection*>(this);
else
- return DeprecatedDOMObject::QueryInterface(riid, ppvObject);
+ return DOMObject::QueryInterface(riid, ppvObject);
AddRef();
return S_OK;
}
-// DeprecatedDOMHTMLOptionsCollection ---------------------------------------------------
+// DOMHTMLOptionsCollection ---------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLOptionsCollection::length(
+HRESULT STDMETHODCALLTYPE DOMHTMLOptionsCollection::length(
/* [retval][out] */ unsigned int* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLOptionsCollection::setLength(
+HRESULT STDMETHODCALLTYPE DOMHTMLOptionsCollection::setLength(
/* [in] */ unsigned int /*length*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLOptionsCollection::item(
+HRESULT STDMETHODCALLTYPE DOMHTMLOptionsCollection::item(
/* [in] */ unsigned int /*index*/,
- /* [retval][out] */ IDeprecatedDOMNode** /*result*/)
+ /* [retval][out] */ IDOMNode** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLOptionsCollection::namedItem(
+HRESULT STDMETHODCALLTYPE DOMHTMLOptionsCollection::namedItem(
/* [in] */ BSTR /*name*/,
- /* [retval][out] */ IDeprecatedDOMNode* /*result*/)
+ /* [retval][out] */ IDOMNode* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-// DeprecatedDOMHTMLDocument - IUnknown -------------------------------------------------
+// DOMHTMLDocument - IUnknown -------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLDocument::QueryInterface(REFIID riid, void** ppvObject)
+HRESULT STDMETHODCALLTYPE DOMHTMLDocument::QueryInterface(REFIID riid, void** ppvObject)
{
*ppvObject = 0;
- if (IsEqualGUID(riid, IID_IDeprecatedDOMHTMLDocument))
- *ppvObject = static_cast<IDeprecatedDOMHTMLDocument*>(this);
+ if (IsEqualGUID(riid, IID_IDOMHTMLDocument))
+ *ppvObject = static_cast<IDOMHTMLDocument*>(this);
else
- return DeprecatedDOMDocument::QueryInterface(riid, ppvObject);
+ return DOMDocument::QueryInterface(riid, ppvObject);
AddRef();
return S_OK;
}
-// DeprecatedDOMHTMLDocument ------------------------------------------------------------
+// DOMHTMLDocument ------------------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLDocument::title(
+HRESULT STDMETHODCALLTYPE DOMHTMLDocument::title(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLDocument::setTitle(
+HRESULT STDMETHODCALLTYPE DOMHTMLDocument::setTitle(
/* [in] */ BSTR /*title*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLDocument::referrer(
+HRESULT STDMETHODCALLTYPE DOMHTMLDocument::referrer(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLDocument::domain(
+HRESULT STDMETHODCALLTYPE DOMHTMLDocument::domain(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLDocument::URL(
+HRESULT STDMETHODCALLTYPE DOMHTMLDocument::URL(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLDocument::body(
- /* [retval][out] */ IDeprecatedDOMHTMLElement** bodyElement)
+HRESULT STDMETHODCALLTYPE DOMHTMLDocument::body(
+ /* [retval][out] */ IDOMHTMLElement** bodyElement)
{
*bodyElement = 0;
if (!m_document || !m_document->isHTMLDocument())
return E_FAIL;
HTMLDocument* htmlDoc = static_cast<HTMLDocument*>(m_document);
- COMPtr<IDeprecatedDOMElement> domElement;
- domElement.adoptRef(DeprecatedDOMHTMLElement::createInstance(htmlDoc->body()));
+ COMPtr<IDOMElement> domElement;
+ domElement.adoptRef(DOMHTMLElement::createInstance(htmlDoc->body()));
if (domElement)
- return domElement->QueryInterface(IID_IDeprecatedDOMHTMLElement, (void**) bodyElement);
+ return domElement->QueryInterface(IID_IDOMHTMLElement, (void**) bodyElement);
return E_FAIL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLDocument::setBody(
- /* [in] */ IDeprecatedDOMHTMLElement* /*body*/)
+HRESULT STDMETHODCALLTYPE DOMHTMLDocument::setBody(
+ /* [in] */ IDOMHTMLElement* /*body*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLDocument::images(
- /* [retval][out] */ IDeprecatedDOMHTMLCollection** /*collection*/)
+HRESULT STDMETHODCALLTYPE DOMHTMLDocument::images(
+ /* [retval][out] */ IDOMHTMLCollection** /*collection*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLDocument::applets(
- /* [retval][out] */ IDeprecatedDOMHTMLCollection** /*collection*/)
+HRESULT STDMETHODCALLTYPE DOMHTMLDocument::applets(
+ /* [retval][out] */ IDOMHTMLCollection** /*collection*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLDocument::links(
- /* [retval][out] */ IDeprecatedDOMHTMLCollection** /*collection*/)
+HRESULT STDMETHODCALLTYPE DOMHTMLDocument::links(
+ /* [retval][out] */ IDOMHTMLCollection** /*collection*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLDocument::forms(
- /* [retval][out] */ IDeprecatedDOMHTMLCollection** collection)
+HRESULT STDMETHODCALLTYPE DOMHTMLDocument::forms(
+ /* [retval][out] */ IDOMHTMLCollection** collection)
{
*collection = 0;
if (!m_document || !m_document->isHTMLDocument())
return E_FAIL;
HTMLDocument* htmlDoc = static_cast<HTMLDocument*>(m_document);
- *collection = DeprecatedDOMHTMLCollection::createInstance(htmlDoc->forms().get());
+ *collection = DOMHTMLCollection::createInstance(htmlDoc->forms().get());
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLDocument::anchors(
- /* [retval][out] */ IDeprecatedDOMHTMLCollection** /*collection*/)
+HRESULT STDMETHODCALLTYPE DOMHTMLDocument::anchors(
+ /* [retval][out] */ IDOMHTMLCollection** /*collection*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLDocument::cookie(
+HRESULT STDMETHODCALLTYPE DOMHTMLDocument::cookie(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLDocument::setCookie(
+HRESULT STDMETHODCALLTYPE DOMHTMLDocument::setCookie(
/* [in] */ BSTR /*cookie*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLDocument::open( void)
+HRESULT STDMETHODCALLTYPE DOMHTMLDocument::open( void)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLDocument::close( void)
+HRESULT STDMETHODCALLTYPE DOMHTMLDocument::close( void)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLDocument::write(
+HRESULT STDMETHODCALLTYPE DOMHTMLDocument::write(
/* [in] */ BSTR /*text*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLDocument::writeln(
+HRESULT STDMETHODCALLTYPE DOMHTMLDocument::writeln(
/* [in] */ BSTR /*text*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLDocument::getElementById_(
+HRESULT STDMETHODCALLTYPE DOMHTMLDocument::getElementById_(
/* [in] */ BSTR /*elementId*/,
- /* [retval][out] */ IDeprecatedDOMElement** /*element*/)
+ /* [retval][out] */ IDOMElement** /*element*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLDocument::getElementsByName(
+HRESULT STDMETHODCALLTYPE DOMHTMLDocument::getElementsByName(
/* [in] */ BSTR /*elementName*/,
- /* [retval][out] */ IDeprecatedDOMNodeList** /*nodeList*/)
+ /* [retval][out] */ IDOMNodeList** /*nodeList*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-// DeprecatedDOMHTMLElement - IUnknown --------------------------------------------------
+// DOMHTMLElement - IUnknown --------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLElement::QueryInterface(REFIID riid, void** ppvObject)
+HRESULT STDMETHODCALLTYPE DOMHTMLElement::QueryInterface(REFIID riid, void** ppvObject)
{
*ppvObject = 0;
- if (IsEqualGUID(riid, IID_IDeprecatedDOMHTMLElement))
- *ppvObject = static_cast<IDeprecatedDOMHTMLElement*>(this);
+ if (IsEqualGUID(riid, IID_IDOMHTMLElement))
+ *ppvObject = static_cast<IDOMHTMLElement*>(this);
else
- return DeprecatedDOMElement::QueryInterface(riid, ppvObject);
+ return DOMElement::QueryInterface(riid, ppvObject);
AddRef();
return S_OK;
}
-// DeprecatedDOMHTMLElement -------------------------------------------------------------
+// DOMHTMLElement -------------------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLElement::idName(
+HRESULT STDMETHODCALLTYPE DOMHTMLElement::idName(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLElement::setIdName(
+HRESULT STDMETHODCALLTYPE DOMHTMLElement::setIdName(
/* [in] */ BSTR /*idName*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLElement::title(
+HRESULT STDMETHODCALLTYPE DOMHTMLElement::title(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLElement::setTitle(
+HRESULT STDMETHODCALLTYPE DOMHTMLElement::setTitle(
/* [in] */ BSTR /*title*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLElement::lang(
+HRESULT STDMETHODCALLTYPE DOMHTMLElement::lang(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLElement::setLang(
+HRESULT STDMETHODCALLTYPE DOMHTMLElement::setLang(
/* [in] */ BSTR /*lang*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLElement::dir(
+HRESULT STDMETHODCALLTYPE DOMHTMLElement::dir(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLElement::setDir(
+HRESULT STDMETHODCALLTYPE DOMHTMLElement::setDir(
/* [in] */ BSTR /*dir*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLElement::className(
+HRESULT STDMETHODCALLTYPE DOMHTMLElement::className(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLElement::setClassName(
+HRESULT STDMETHODCALLTYPE DOMHTMLElement::setClassName(
/* [in] */ BSTR /*className*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLElement::innerHTML(
+HRESULT STDMETHODCALLTYPE DOMHTMLElement::innerHTML(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLElement::setInnerHTML(
+HRESULT STDMETHODCALLTYPE DOMHTMLElement::setInnerHTML(
/* [in] */ BSTR /*html*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLElement::innerText(
+HRESULT STDMETHODCALLTYPE DOMHTMLElement::innerText(
/* [retval][out] */ BSTR* result)
{
ASSERT(m_element && m_element->isHTMLElement());
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLElement::setInnerText(
+HRESULT STDMETHODCALLTYPE DOMHTMLElement::setInnerText(
/* [in] */ BSTR text)
{
ASSERT(m_element && m_element->isHTMLElement());
return S_OK;
}
-// DeprecatedDOMHTMLFormElement - IUnknown ----------------------------------------------
+// DOMHTMLFormElement - IUnknown ----------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLFormElement::QueryInterface(REFIID riid, void** ppvObject)
+HRESULT STDMETHODCALLTYPE DOMHTMLFormElement::QueryInterface(REFIID riid, void** ppvObject)
{
*ppvObject = 0;
- if (IsEqualGUID(riid, IID_IDeprecatedDOMHTMLFormElement))
- *ppvObject = static_cast<IDeprecatedDOMHTMLFormElement*>(this);
+ if (IsEqualGUID(riid, IID_IDOMHTMLFormElement))
+ *ppvObject = static_cast<IDOMHTMLFormElement*>(this);
else
- return DeprecatedDOMHTMLElement::QueryInterface(riid, ppvObject);
+ return DOMHTMLElement::QueryInterface(riid, ppvObject);
AddRef();
return S_OK;
}
-// DeprecatedDOMHTMLFormElement ---------------------------------------------------------
+// DOMHTMLFormElement ---------------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLFormElement::elements(
- /* [retval][out] */ IDeprecatedDOMHTMLCollection** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMHTMLFormElement::elements(
+ /* [retval][out] */ IDOMHTMLCollection** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLFormElement::length(
+HRESULT STDMETHODCALLTYPE DOMHTMLFormElement::length(
/* [retval][out] */ int* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLFormElement::name(
+HRESULT STDMETHODCALLTYPE DOMHTMLFormElement::name(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLFormElement::setName(
+HRESULT STDMETHODCALLTYPE DOMHTMLFormElement::setName(
/* [in] */ BSTR /*name*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLFormElement::acceptCharset(
+HRESULT STDMETHODCALLTYPE DOMHTMLFormElement::acceptCharset(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLFormElement::setAcceptCharset(
+HRESULT STDMETHODCALLTYPE DOMHTMLFormElement::setAcceptCharset(
/* [in] */ BSTR /*acceptCharset*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLFormElement::action(
+HRESULT STDMETHODCALLTYPE DOMHTMLFormElement::action(
/* [retval][out] */ BSTR* result)
{
ASSERT(m_element && m_element->hasTagName(formTag));
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLFormElement::setAction(
+HRESULT STDMETHODCALLTYPE DOMHTMLFormElement::setAction(
/* [in] */ BSTR /*action*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLFormElement::encType(
+HRESULT STDMETHODCALLTYPE DOMHTMLFormElement::encType(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLFormElement::setEnctype(
+HRESULT STDMETHODCALLTYPE DOMHTMLFormElement::setEnctype(
/* [retval][out] */ BSTR* /*encType*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLFormElement::method(
+HRESULT STDMETHODCALLTYPE DOMHTMLFormElement::method(
/* [retval][out] */ BSTR* result)
{
ASSERT(m_element && m_element->hasTagName(formTag));
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLFormElement::setMethod(
+HRESULT STDMETHODCALLTYPE DOMHTMLFormElement::setMethod(
/* [in] */ BSTR /*method*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLFormElement::target(
+HRESULT STDMETHODCALLTYPE DOMHTMLFormElement::target(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLFormElement::setTarget(
+HRESULT STDMETHODCALLTYPE DOMHTMLFormElement::setTarget(
/* [in] */ BSTR /*target*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLFormElement::submit( void)
+HRESULT STDMETHODCALLTYPE DOMHTMLFormElement::submit( void)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLFormElement::reset( void)
+HRESULT STDMETHODCALLTYPE DOMHTMLFormElement::reset( void)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-// DeprecatedDOMHTMLSelectElement - IUnknown ----------------------------------------------
+// DOMHTMLSelectElement - IUnknown ----------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLSelectElement::QueryInterface(REFIID riid, void** ppvObject)
+HRESULT STDMETHODCALLTYPE DOMHTMLSelectElement::QueryInterface(REFIID riid, void** ppvObject)
{
*ppvObject = 0;
- if (IsEqualGUID(riid, IID_IDeprecatedDOMHTMLSelectElement))
- *ppvObject = static_cast<IDeprecatedDOMHTMLSelectElement*>(this);
+ if (IsEqualGUID(riid, IID_IDOMHTMLSelectElement))
+ *ppvObject = static_cast<IDOMHTMLSelectElement*>(this);
else if (IsEqualGUID(riid, IID_IFormsAutoFillTransitionSelect))
*ppvObject = static_cast<IFormsAutoFillTransitionSelect*>(this);
else
- return DeprecatedDOMHTMLElement::QueryInterface(riid, ppvObject);
+ return DOMHTMLElement::QueryInterface(riid, ppvObject);
AddRef();
return S_OK;
}
-// DeprecatedDOMHTMLSelectElement -------------------------------------------------------
+// DOMHTMLSelectElement -------------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLSelectElement::type(
+HRESULT STDMETHODCALLTYPE DOMHTMLSelectElement::type(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLSelectElement::selectedIndex(
+HRESULT STDMETHODCALLTYPE DOMHTMLSelectElement::selectedIndex(
/* [retval][out] */ int* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLSelectElement::setSelectedIndx(
+HRESULT STDMETHODCALLTYPE DOMHTMLSelectElement::setSelectedIndx(
/* [in] */ int /*selectedIndex*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLSelectElement::value(
+HRESULT STDMETHODCALLTYPE DOMHTMLSelectElement::value(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLSelectElement::setValue(
+HRESULT STDMETHODCALLTYPE DOMHTMLSelectElement::setValue(
/* [in] */ BSTR /*value*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLSelectElement::length(
+HRESULT STDMETHODCALLTYPE DOMHTMLSelectElement::length(
/* [retval][out] */ int* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLSelectElement::form(
- /* [retval][out] */ IDeprecatedDOMHTMLFormElement** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMHTMLSelectElement::form(
+ /* [retval][out] */ IDOMHTMLFormElement** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLSelectElement::options(
- /* [retval][out] */ IDeprecatedDOMHTMLOptionsCollection** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMHTMLSelectElement::options(
+ /* [retval][out] */ IDOMHTMLOptionsCollection** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLSelectElement::disabled(
+HRESULT STDMETHODCALLTYPE DOMHTMLSelectElement::disabled(
/* [retval][out] */ BOOL* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLSelectElement::setDisabled(
+HRESULT STDMETHODCALLTYPE DOMHTMLSelectElement::setDisabled(
/* [in] */ BOOL /*disabled*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLSelectElement::multiple(
+HRESULT STDMETHODCALLTYPE DOMHTMLSelectElement::multiple(
/* [retval][out] */ BOOL* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLSelectElement::setMultiple(
+HRESULT STDMETHODCALLTYPE DOMHTMLSelectElement::setMultiple(
/* [in] */ BOOL /*multiple*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLSelectElement::name(
+HRESULT STDMETHODCALLTYPE DOMHTMLSelectElement::name(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLSelectElement::setName(
+HRESULT STDMETHODCALLTYPE DOMHTMLSelectElement::setName(
/* [in] */ BSTR /*name*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLSelectElement::size(
+HRESULT STDMETHODCALLTYPE DOMHTMLSelectElement::size(
/* [retval][out] */ int* /*size*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLSelectElement::setSize(
+HRESULT STDMETHODCALLTYPE DOMHTMLSelectElement::setSize(
/* [in] */ int /*size*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLSelectElement::tabIndex(
+HRESULT STDMETHODCALLTYPE DOMHTMLSelectElement::tabIndex(
/* [retval][out] */ int* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLSelectElement::setTabIndex(
+HRESULT STDMETHODCALLTYPE DOMHTMLSelectElement::setTabIndex(
/* [in] */ int /*tabIndex*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLSelectElement::add(
- /* [in] */ IDeprecatedDOMHTMLElement* /*element*/,
- /* [in] */ IDeprecatedDOMHTMLElement* /*before*/)
+HRESULT STDMETHODCALLTYPE DOMHTMLSelectElement::add(
+ /* [in] */ IDOMHTMLElement* /*element*/,
+ /* [in] */ IDOMHTMLElement* /*before*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLSelectElement::remove(
+HRESULT STDMETHODCALLTYPE DOMHTMLSelectElement::remove(
/* [in] */ int /*index*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-// DeprecatedDOMHTMLSelectElement - IFormsAutoFillTransitionSelect ----------------------
+// DOMHTMLSelectElement - IFormsAutoFillTransitionSelect ----------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLSelectElement::activateItemAtIndex(
+HRESULT STDMETHODCALLTYPE DOMHTMLSelectElement::activateItemAtIndex(
/* [in] */ int /*index*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-// DeprecatedDOMHTMLOptionElement - IUnknown --------------------------------------------
+// DOMHTMLOptionElement - IUnknown --------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLOptionElement::QueryInterface(REFIID riid, void** ppvObject)
+HRESULT STDMETHODCALLTYPE DOMHTMLOptionElement::QueryInterface(REFIID riid, void** ppvObject)
{
*ppvObject = 0;
- if (IsEqualGUID(riid, IID_IDeprecatedDOMHTMLOptionElement))
- *ppvObject = static_cast<IDeprecatedDOMHTMLOptionElement*>(this);
+ if (IsEqualGUID(riid, IID_IDOMHTMLOptionElement))
+ *ppvObject = static_cast<IDOMHTMLOptionElement*>(this);
else
- return DeprecatedDOMHTMLElement::QueryInterface(riid, ppvObject);
+ return DOMHTMLElement::QueryInterface(riid, ppvObject);
AddRef();
return S_OK;
}
-// DeprecatedDOMHTMLOptionElement -------------------------------------------------------
+// DOMHTMLOptionElement -------------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLOptionElement::form(
- /* [retval][out] */ IDeprecatedDOMHTMLFormElement** /*result*/)
+HRESULT STDMETHODCALLTYPE DOMHTMLOptionElement::form(
+ /* [retval][out] */ IDOMHTMLFormElement** /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLOptionElement::defaultSelected(
+HRESULT STDMETHODCALLTYPE DOMHTMLOptionElement::defaultSelected(
/* [retval][out] */ BOOL* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLOptionElement::setDefaultSelected(
+HRESULT STDMETHODCALLTYPE DOMHTMLOptionElement::setDefaultSelected(
/* [in] */ BOOL /*defaultSelected*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLOptionElement::text(
+HRESULT STDMETHODCALLTYPE DOMHTMLOptionElement::text(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLOptionElement::index(
+HRESULT STDMETHODCALLTYPE DOMHTMLOptionElement::index(
/* [retval][out] */ int* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLOptionElement::disabled(
+HRESULT STDMETHODCALLTYPE DOMHTMLOptionElement::disabled(
/* [retval][out] */ BOOL* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLOptionElement::setDisabled(
+HRESULT STDMETHODCALLTYPE DOMHTMLOptionElement::setDisabled(
/* [in] */ BOOL /*disabled*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLOptionElement::label(
+HRESULT STDMETHODCALLTYPE DOMHTMLOptionElement::label(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLOptionElement::setLabel(
+HRESULT STDMETHODCALLTYPE DOMHTMLOptionElement::setLabel(
/* [in] */ BSTR /*label*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLOptionElement::selected(
+HRESULT STDMETHODCALLTYPE DOMHTMLOptionElement::selected(
/* [retval][out] */ BOOL* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLOptionElement::setSelected(
+HRESULT STDMETHODCALLTYPE DOMHTMLOptionElement::setSelected(
/* [in] */ BOOL /*selected*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLOptionElement::value(
+HRESULT STDMETHODCALLTYPE DOMHTMLOptionElement::value(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLOptionElement::setValue(
+HRESULT STDMETHODCALLTYPE DOMHTMLOptionElement::setValue(
/* [in] */ BSTR /*value*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-// DeprecatedDOMHTMLInputElement - IUnknown ----------------------------------------------
+// DOMHTMLInputElement - IUnknown ----------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::QueryInterface(REFIID riid, void** ppvObject)
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::QueryInterface(REFIID riid, void** ppvObject)
{
*ppvObject = 0;
- if (IsEqualGUID(riid, IID_IDeprecatedDOMHTMLInputElement))
- *ppvObject = static_cast<IDeprecatedDOMHTMLInputElement*>(this);
+ if (IsEqualGUID(riid, IID_IDOMHTMLInputElement))
+ *ppvObject = static_cast<IDOMHTMLInputElement*>(this);
else if (IsEqualGUID(riid, IID_IFormsAutoFillTransition))
*ppvObject = static_cast<IFormsAutoFillTransition*>(this);
else if (IsEqualGUID(riid, IID_IFormPromptAdditions))
*ppvObject = static_cast<IFormPromptAdditions*>(this);
else
- return DeprecatedDOMHTMLElement::QueryInterface(riid, ppvObject);
+ return DOMHTMLElement::QueryInterface(riid, ppvObject);
AddRef();
return S_OK;
}
-// DeprecatedDOMHTMLInputElement --------------------------------------------------------
+// DOMHTMLInputElement --------------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::defaultValue(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::defaultValue(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::setDefaultValue(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::setDefaultValue(
/* [in] */ BSTR /*val*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::defaultChecked(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::defaultChecked(
/* [retval][out] */ BOOL* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::setDefaultChecked(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::setDefaultChecked(
/* [in] */ BSTR /*checked*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::form(
- /* [retval][out] */ IDeprecatedDOMHTMLElement** result)
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::form(
+ /* [retval][out] */ IDOMHTMLElement** result)
{
if (!result)
return E_POINTER;
*result = 0;
ASSERT(m_element && m_element->hasTagName(inputTag));
HTMLInputElement* inputElement = static_cast<HTMLInputElement*>(m_element);
- COMPtr<IDeprecatedDOMElement> domElement;
- domElement.adoptRef(DeprecatedDOMHTMLElement::createInstance(inputElement->form()));
+ COMPtr<IDOMElement> domElement;
+ domElement.adoptRef(DOMHTMLElement::createInstance(inputElement->form()));
if (domElement)
- return domElement->QueryInterface(IID_IDeprecatedDOMHTMLElement, (void**) result);
+ return domElement->QueryInterface(IID_IDOMHTMLElement, (void**) result);
return E_FAIL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::accept(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::accept(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::setAccept(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::setAccept(
/* [in] */ BSTR /*accept*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::accessKey(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::accessKey(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::setAccessKey(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::setAccessKey(
/* [in] */ BSTR /*key*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::align(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::align(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::setAlign(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::setAlign(
/* [in] */ BSTR /*align*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::alt(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::alt(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::setAlt(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::setAlt(
/* [in] */ BSTR /*alt*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::checked(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::checked(
/* [retval][out] */ BOOL* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::setChecked(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::setChecked(
/* [in] */ BOOL /*checked*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::disabled(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::disabled(
/* [retval][out] */ BOOL* result)
{
ASSERT(m_element && m_element->hasTagName(inputTag));
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::setDisabled(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::setDisabled(
/* [in] */ BOOL /*disabled*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::maxLength(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::maxLength(
/* [retval][out] */ int* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::setMaxLength(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::setMaxLength(
/* [in] */ int /*maxLength*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::name(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::name(
/* [retval][out] */ BSTR* /*name*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::setName(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::setName(
/* [in] */ BSTR /*name*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::readOnly(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::readOnly(
/* [retval][out] */ BOOL* result)
{
ASSERT(m_element && m_element->hasTagName(inputTag));
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::setReadOnly(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::setReadOnly(
/* [in] */ BOOL /*readOnly*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::size(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::size(
/* [retval][out] */ unsigned int* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::setSize(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::setSize(
/* [in] */ unsigned int /*size*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::src(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::src(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::setSrc(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::setSrc(
/* [in] */ BSTR /*src*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::tabIndex(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::tabIndex(
/* [retval][out] */ int* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::setTabIndex(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::setTabIndex(
/* [in] */ int /*tabIndex*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::type(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::type(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::setType(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::setType(
/* [in] */ BSTR type)
{
ASSERT(m_element && m_element->hasTagName(inputTag));
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::useMap(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::useMap(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::setUseMap(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::setUseMap(
/* [in] */ BSTR /*useMap*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::value(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::value(
/* [retval][out] */ BSTR* result)
{
ASSERT(m_element && m_element->hasTagName(inputTag));
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::setValue(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::setValue(
/* [in] */ BSTR value)
{
ASSERT(m_element && m_element->hasTagName(inputTag));
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::select( void)
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::select( void)
{
ASSERT(m_element && m_element->hasTagName(inputTag));
HTMLInputElement* inputElement = static_cast<HTMLInputElement*>(m_element);
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::click( void)
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::click( void)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::setSelectionStart(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::setSelectionStart(
/* [in] */ long start)
{
ASSERT(m_element && m_element->hasTagName(inputTag));
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::selectionStart(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::selectionStart(
/* [retval][out] */ long *start)
{
ASSERT(m_element && m_element->hasTagName(inputTag));
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::setSelectionEnd(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::setSelectionEnd(
/* [in] */ long end)
{
ASSERT(m_element && m_element->hasTagName(inputTag));
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::selectionEnd(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::selectionEnd(
/* [retval][out] */ long *end)
{
ASSERT(m_element && m_element->hasTagName(inputTag));
return S_OK;
}
-// DeprecatedDOMHTMLInputElement -- IFormsAutoFillTransition ----------------------------
+// DOMHTMLInputElement -- IFormsAutoFillTransition ----------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::isTextField(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::isTextField(
/* [retval][out] */ BOOL* result)
{
ASSERT(m_element && m_element->hasTagName(inputTag));
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::rectOnScreen(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::rectOnScreen(
/* [retval][out] */ LPRECT rect)
{
rect->left = rect->top = rect->right = rect->bottom = 0;
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::replaceCharactersInRange(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::replaceCharactersInRange(
/* [in] */ int /*startTarget*/,
/* [in] */ int /*endTarget*/,
/* [in] */ BSTR /*replacementString*/,
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::selectedRange(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::selectedRange(
/* [out] */ int* start,
/* [out] */ int* end)
{
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::setAutofilled(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::setAutofilled(
/* [in] */ BOOL filled)
{
ASSERT(m_element && m_element->hasTagName(inputTag));
return S_OK;
}
-// DeprecatedDOMHTMLInputElement -- IFormPromptAdditions ------------------------------------
+// DOMHTMLInputElement -- IFormPromptAdditions ------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLInputElement::isUserEdited(
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::isUserEdited(
/* [retval][out] */ BOOL *result)
{
if (!result)
return S_OK;
}
-// DeprecatedDOMHTMLTextAreaElement - IUnknown ----------------------------------------------
+// DOMHTMLTextAreaElement - IUnknown ----------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLTextAreaElement::QueryInterface(REFIID riid, void** ppvObject)
+HRESULT STDMETHODCALLTYPE DOMHTMLTextAreaElement::QueryInterface(REFIID riid, void** ppvObject)
{
*ppvObject = 0;
- if (IsEqualGUID(riid, IID_IDeprecatedDOMHTMLTextAreaElement))
- *ppvObject = static_cast<IDeprecatedDOMHTMLTextAreaElement*>(this);
+ if (IsEqualGUID(riid, IID_IDOMHTMLTextAreaElement))
+ *ppvObject = static_cast<IDOMHTMLTextAreaElement*>(this);
else if (IsEqualGUID(riid, IID_IFormPromptAdditions))
*ppvObject = static_cast<IFormPromptAdditions*>(this);
else
- return DeprecatedDOMHTMLElement::QueryInterface(riid, ppvObject);
+ return DOMHTMLElement::QueryInterface(riid, ppvObject);
AddRef();
return S_OK;
}
-// DeprecatedDOMHTMLTextAreaElement -----------------------------------------------------
+// DOMHTMLTextAreaElement -----------------------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLTextAreaElement::defaultValue(
+HRESULT STDMETHODCALLTYPE DOMHTMLTextAreaElement::defaultValue(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLTextAreaElement::setDefaultValue(
+HRESULT STDMETHODCALLTYPE DOMHTMLTextAreaElement::setDefaultValue(
/* [in] */ BSTR /*val*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLTextAreaElement::form(
- /* [retval][out] */ IDeprecatedDOMHTMLElement** result)
+HRESULT STDMETHODCALLTYPE DOMHTMLTextAreaElement::form(
+ /* [retval][out] */ IDOMHTMLElement** result)
{
if (!result)
return E_POINTER;
*result = 0;
ASSERT(m_element && m_element->hasTagName(textareaTag));
HTMLTextAreaElement* textareaElement = static_cast<HTMLTextAreaElement*>(m_element);
- COMPtr<IDeprecatedDOMElement> domElement;
- domElement.adoptRef(DeprecatedDOMHTMLElement::createInstance(textareaElement->form()));
+ COMPtr<IDOMElement> domElement;
+ domElement.adoptRef(DOMHTMLElement::createInstance(textareaElement->form()));
if (domElement)
- return domElement->QueryInterface(IID_IDeprecatedDOMHTMLElement, (void**) result);
+ return domElement->QueryInterface(IID_IDOMHTMLElement, (void**) result);
return E_FAIL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLTextAreaElement::accessKey(
+HRESULT STDMETHODCALLTYPE DOMHTMLTextAreaElement::accessKey(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLTextAreaElement::setAccessKey(
+HRESULT STDMETHODCALLTYPE DOMHTMLTextAreaElement::setAccessKey(
/* [in] */ BSTR /*key*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLTextAreaElement::cols(
+HRESULT STDMETHODCALLTYPE DOMHTMLTextAreaElement::cols(
/* [retval][out] */ int* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLTextAreaElement::setCols(
+HRESULT STDMETHODCALLTYPE DOMHTMLTextAreaElement::setCols(
/* [in] */ int /*cols*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLTextAreaElement::disabled(
+HRESULT STDMETHODCALLTYPE DOMHTMLTextAreaElement::disabled(
/* [retval][out] */ BOOL* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLTextAreaElement::setDisabled(
+HRESULT STDMETHODCALLTYPE DOMHTMLTextAreaElement::setDisabled(
/* [in] */ BOOL /*disabled*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLTextAreaElement::name(
+HRESULT STDMETHODCALLTYPE DOMHTMLTextAreaElement::name(
/* [retval][out] */ BSTR* /*name*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLTextAreaElement::setName(
+HRESULT STDMETHODCALLTYPE DOMHTMLTextAreaElement::setName(
/* [in] */ BSTR /*name*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLTextAreaElement::readOnly(
+HRESULT STDMETHODCALLTYPE DOMHTMLTextAreaElement::readOnly(
/* [retval][out] */ BOOL* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLTextAreaElement::setReadOnly(
+HRESULT STDMETHODCALLTYPE DOMHTMLTextAreaElement::setReadOnly(
/* [in] */ BOOL /*readOnly*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLTextAreaElement::rows(
+HRESULT STDMETHODCALLTYPE DOMHTMLTextAreaElement::rows(
/* [retval][out] */ int* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLTextAreaElement::setRows(
+HRESULT STDMETHODCALLTYPE DOMHTMLTextAreaElement::setRows(
/* [in] */ int /*rows*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLTextAreaElement::tabIndex(
+HRESULT STDMETHODCALLTYPE DOMHTMLTextAreaElement::tabIndex(
/* [retval][out] */ int* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLTextAreaElement::setTabIndex(
+HRESULT STDMETHODCALLTYPE DOMHTMLTextAreaElement::setTabIndex(
/* [in] */ int /*tabIndex*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLTextAreaElement::type(
+HRESULT STDMETHODCALLTYPE DOMHTMLTextAreaElement::type(
/* [retval][out] */ BSTR* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLTextAreaElement::value(
+HRESULT STDMETHODCALLTYPE DOMHTMLTextAreaElement::value(
/* [retval][out] */ BSTR* result)
{
ASSERT(m_element && m_element->hasTagName(textareaTag));
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLTextAreaElement::setValue(
+HRESULT STDMETHODCALLTYPE DOMHTMLTextAreaElement::setValue(
/* [in] */ BSTR value)
{
ASSERT(m_element && m_element->hasTagName(textareaTag));
return S_OK;
}
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLTextAreaElement::select( void)
+HRESULT STDMETHODCALLTYPE DOMHTMLTextAreaElement::select( void)
{
ASSERT(m_element && m_element->hasTagName(textareaTag));
HTMLTextAreaElement* textareaElement = static_cast<HTMLTextAreaElement*>(m_element);
return S_OK;
}
-// DeprecatedDOMHTMLTextAreaElement -- IFormPromptAdditions ------------------------------------
+// DOMHTMLTextAreaElement -- IFormPromptAdditions ------------------------------------
-HRESULT STDMETHODCALLTYPE DeprecatedDOMHTMLTextAreaElement::isUserEdited(
+HRESULT STDMETHODCALLTYPE DOMHTMLTextAreaElement::isUserEdited(
/* [retval][out] */ BOOL *result)
{
if (!result)
class HTMLCollection;
}
-class DeprecatedDOMHTMLCollection : public DeprecatedDOMObject, public IDeprecatedDOMHTMLCollection
+class DOMHTMLCollection : public DOMObject, public IDOMHTMLCollection
{
protected:
- DeprecatedDOMHTMLCollection(WebCore::HTMLCollection* c);
+ DOMHTMLCollection(WebCore::HTMLCollection* c);
public:
- static IDeprecatedDOMHTMLCollection* createInstance(WebCore::HTMLCollection*);
+ static IDOMHTMLCollection* createInstance(WebCore::HTMLCollection*);
// IUnknown
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
- virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DeprecatedDOMObject::AddRef(); }
- virtual ULONG STDMETHODCALLTYPE Release(void) { return DeprecatedDOMObject::Release(); }
+ virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DOMObject::AddRef(); }
+ virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMObject::Release(); }
// IWebScriptObject
virtual HRESULT STDMETHODCALLTYPE throwException(
/* [in] */ BSTR exceptionMessage,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMObject::throwException(exceptionMessage, result); }
+ /* [retval][out] */ BOOL *result) { return DOMObject::throwException(exceptionMessage, result); }
virtual HRESULT STDMETHODCALLTYPE callWebScriptMethod(
/* [in] */ BSTR name,
/* [size_is][in] */ const VARIANT args[ ],
/* [in] */ int cArgs,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMObject::callWebScriptMethod(name, args, cArgs, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMObject::callWebScriptMethod(name, args, cArgs, result); }
virtual HRESULT STDMETHODCALLTYPE evaluateWebScript(
/* [in] */ BSTR script,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMObject::evaluateWebScript(script, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMObject::evaluateWebScript(script, result); }
virtual HRESULT STDMETHODCALLTYPE removeWebScriptKey(
- /* [in] */ BSTR name) { return DeprecatedDOMObject::removeWebScriptKey(name); }
+ /* [in] */ BSTR name) { return DOMObject::removeWebScriptKey(name); }
virtual HRESULT STDMETHODCALLTYPE stringRepresentation(
- /* [retval][out] */ BSTR* stringRepresentation) { return DeprecatedDOMObject::stringRepresentation(stringRepresentation); }
+ /* [retval][out] */ BSTR* stringRepresentation) { return DOMObject::stringRepresentation(stringRepresentation); }
virtual HRESULT STDMETHODCALLTYPE webScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMObject::webScriptValueAtIndex(index, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMObject::webScriptValueAtIndex(index, result); }
virtual HRESULT STDMETHODCALLTYPE setWebScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [in] */ VARIANT val) { return DeprecatedDOMObject::setWebScriptValueAtIndex(index, val); }
+ /* [in] */ VARIANT val) { return DOMObject::setWebScriptValueAtIndex(index, val); }
virtual HRESULT STDMETHODCALLTYPE setException(
- /* [in] */ BSTR description) { return DeprecatedDOMObject::setException(description); }
+ /* [in] */ BSTR description) { return DOMObject::setException(description); }
- // IDeprecatedDOMHTMLCollection
+ // IDOMHTMLCollection
virtual HRESULT STDMETHODCALLTYPE length(
/* [retval][out] */ UINT *result);
virtual HRESULT STDMETHODCALLTYPE item(
/* [in] */ UINT index,
- /* [retval][out] */ IDeprecatedDOMNode **node);
+ /* [retval][out] */ IDOMNode **node);
virtual HRESULT STDMETHODCALLTYPE namedItem(
/* [in] */ BSTR name,
- /* [retval][out] */ IDeprecatedDOMNode **node);
+ /* [retval][out] */ IDOMNode **node);
protected:
RefPtr<WebCore::HTMLCollection> m_collection;
};
-class DeprecatedDOMHTMLOptionsCollection : public DeprecatedDOMObject, public IDeprecatedDOMHTMLOptionsCollection
+class DOMHTMLOptionsCollection : public DOMObject, public IDOMHTMLOptionsCollection
{
// IUnknown
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
- virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DeprecatedDOMObject::AddRef(); }
- virtual ULONG STDMETHODCALLTYPE Release(void) { return DeprecatedDOMObject::Release(); }
+ virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DOMObject::AddRef(); }
+ virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMObject::Release(); }
// IWebScriptObject
virtual HRESULT STDMETHODCALLTYPE throwException(
/* [in] */ BSTR exceptionMessage,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMObject::throwException(exceptionMessage, result); }
+ /* [retval][out] */ BOOL *result) { return DOMObject::throwException(exceptionMessage, result); }
virtual HRESULT STDMETHODCALLTYPE callWebScriptMethod(
/* [in] */ BSTR name,
/* [size_is][in] */ const VARIANT args[ ],
/* [in] */ int cArgs,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMObject::callWebScriptMethod(name, args, cArgs, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMObject::callWebScriptMethod(name, args, cArgs, result); }
virtual HRESULT STDMETHODCALLTYPE evaluateWebScript(
/* [in] */ BSTR script,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMObject::evaluateWebScript(script, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMObject::evaluateWebScript(script, result); }
virtual HRESULT STDMETHODCALLTYPE removeWebScriptKey(
- /* [in] */ BSTR name) { return DeprecatedDOMObject::removeWebScriptKey(name); }
+ /* [in] */ BSTR name) { return DOMObject::removeWebScriptKey(name); }
virtual HRESULT STDMETHODCALLTYPE stringRepresentation(
- /* [retval][out] */ BSTR* stringRepresentation) { return DeprecatedDOMObject::stringRepresentation(stringRepresentation); }
+ /* [retval][out] */ BSTR* stringRepresentation) { return DOMObject::stringRepresentation(stringRepresentation); }
virtual HRESULT STDMETHODCALLTYPE webScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMObject::webScriptValueAtIndex(index, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMObject::webScriptValueAtIndex(index, result); }
virtual HRESULT STDMETHODCALLTYPE setWebScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [in] */ VARIANT val) { return DeprecatedDOMObject::setWebScriptValueAtIndex(index, val); }
+ /* [in] */ VARIANT val) { return DOMObject::setWebScriptValueAtIndex(index, val); }
virtual HRESULT STDMETHODCALLTYPE setException(
- /* [in] */ BSTR description) { return DeprecatedDOMObject::setException(description); }
+ /* [in] */ BSTR description) { return DOMObject::setException(description); }
- // IDeprecatedDOMHTMLOptionsCollection
+ // IDOMHTMLOptionsCollection
virtual HRESULT STDMETHODCALLTYPE length(
/* [retval][out] */ unsigned int *result);
virtual HRESULT STDMETHODCALLTYPE item(
/* [in] */ unsigned int index,
- /* [retval][out] */ IDeprecatedDOMNode **result);
+ /* [retval][out] */ IDOMNode **result);
virtual HRESULT STDMETHODCALLTYPE namedItem(
/* [in] */ BSTR name,
- /* [retval][out] */ IDeprecatedDOMNode *result);
+ /* [retval][out] */ IDOMNode *result);
};
-class DeprecatedDOMHTMLDocument : public DeprecatedDOMDocument, public IDeprecatedDOMHTMLDocument
+class DOMHTMLDocument : public DOMDocument, public IDOMHTMLDocument
{
protected:
- DeprecatedDOMHTMLDocument();
+ DOMHTMLDocument();
public:
- DeprecatedDOMHTMLDocument(WebCore::Document* d) : DeprecatedDOMDocument(d) {}
+ DOMHTMLDocument(WebCore::Document* d) : DOMDocument(d) {}
// IUnknown
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
- virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DeprecatedDOMDocument::AddRef(); }
- virtual ULONG STDMETHODCALLTYPE Release(void) { return DeprecatedDOMDocument::Release(); }
+ virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DOMDocument::AddRef(); }
+ virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMDocument::Release(); }
// IWebScriptObject
virtual HRESULT STDMETHODCALLTYPE throwException(
/* [in] */ BSTR exceptionMessage,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMDocument::throwException(exceptionMessage, result); }
+ /* [retval][out] */ BOOL *result) { return DOMDocument::throwException(exceptionMessage, result); }
virtual HRESULT STDMETHODCALLTYPE callWebScriptMethod(
/* [in] */ BSTR name,
/* [size_is][in] */ const VARIANT args[ ],
/* [in] */ int cArgs,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMDocument::callWebScriptMethod(name, args, cArgs, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMDocument::callWebScriptMethod(name, args, cArgs, result); }
virtual HRESULT STDMETHODCALLTYPE evaluateWebScript(
/* [in] */ BSTR script,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMDocument::evaluateWebScript(script, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMDocument::evaluateWebScript(script, result); }
virtual HRESULT STDMETHODCALLTYPE removeWebScriptKey(
- /* [in] */ BSTR name) { return DeprecatedDOMDocument::removeWebScriptKey(name); }
+ /* [in] */ BSTR name) { return DOMDocument::removeWebScriptKey(name); }
virtual HRESULT STDMETHODCALLTYPE stringRepresentation(
- /* [retval][out] */ BSTR* stringRepresentation) { return DeprecatedDOMDocument::stringRepresentation(stringRepresentation); }
+ /* [retval][out] */ BSTR* stringRepresentation) { return DOMDocument::stringRepresentation(stringRepresentation); }
virtual HRESULT STDMETHODCALLTYPE webScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMDocument::webScriptValueAtIndex(index, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMDocument::webScriptValueAtIndex(index, result); }
virtual HRESULT STDMETHODCALLTYPE setWebScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [in] */ VARIANT val) { return DeprecatedDOMDocument::setWebScriptValueAtIndex(index, val); }
+ /* [in] */ VARIANT val) { return DOMDocument::setWebScriptValueAtIndex(index, val); }
virtual HRESULT STDMETHODCALLTYPE setException(
- /* [in] */ BSTR description) { return DeprecatedDOMDocument::setException(description); }
+ /* [in] */ BSTR description) { return DOMDocument::setException(description); }
- // IDeprecatedDOMNode
+ // IDOMNode
virtual HRESULT STDMETHODCALLTYPE nodeName(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMDocument::nodeName(result); }
+ /* [retval][out] */ BSTR *result) { return DOMDocument::nodeName(result); }
virtual HRESULT STDMETHODCALLTYPE nodeValue(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMDocument::nodeValue(result); }
+ /* [retval][out] */ BSTR *result) { return DOMDocument::nodeValue(result); }
virtual HRESULT STDMETHODCALLTYPE setNodeValue(
/* [in] */ BSTR value) { return setNodeValue(value); }
virtual HRESULT STDMETHODCALLTYPE nodeType(
- /* [retval][out] */ unsigned short *result) { return DeprecatedDOMDocument::nodeType(result); }
+ /* [retval][out] */ unsigned short *result) { return DOMDocument::nodeType(result); }
virtual HRESULT STDMETHODCALLTYPE parentNode(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMDocument::parentNode(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMDocument::parentNode(result); }
virtual HRESULT STDMETHODCALLTYPE childNodes(
- /* [retval][out] */ IDeprecatedDOMNodeList **result) { return DeprecatedDOMDocument::childNodes(result); }
+ /* [retval][out] */ IDOMNodeList **result) { return DOMDocument::childNodes(result); }
virtual HRESULT STDMETHODCALLTYPE firstChild(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMDocument::firstChild(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMDocument::firstChild(result); }
virtual HRESULT STDMETHODCALLTYPE lastChild(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMDocument::lastChild(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMDocument::lastChild(result); }
virtual HRESULT STDMETHODCALLTYPE previousSibling(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMDocument::previousSibling(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMDocument::previousSibling(result); }
virtual HRESULT STDMETHODCALLTYPE nextSibling(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMDocument::nextSibling(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMDocument::nextSibling(result); }
virtual HRESULT STDMETHODCALLTYPE attributes(
- /* [retval][out] */ IDeprecatedDOMNamedNodeMap **result) { return DeprecatedDOMDocument::attributes(result); }
+ /* [retval][out] */ IDOMNamedNodeMap **result) { return DOMDocument::attributes(result); }
virtual HRESULT STDMETHODCALLTYPE ownerDocument(
- /* [retval][out] */ IDeprecatedDOMDocument **result) { return DeprecatedDOMDocument::ownerDocument(result); }
+ /* [retval][out] */ IDOMDocument **result) { return DOMDocument::ownerDocument(result); }
virtual HRESULT STDMETHODCALLTYPE insertBefore(
- /* [in] */ IDeprecatedDOMNode *newChild,
- /* [in] */ IDeprecatedDOMNode *refChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMDocument::insertBefore(newChild, refChild, result); }
+ /* [in] */ IDOMNode *newChild,
+ /* [in] */ IDOMNode *refChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMDocument::insertBefore(newChild, refChild, result); }
virtual HRESULT STDMETHODCALLTYPE replaceChild(
- /* [in] */ IDeprecatedDOMNode *newChild,
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMDocument::replaceChild(newChild, oldChild, result); }
+ /* [in] */ IDOMNode *newChild,
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMDocument::replaceChild(newChild, oldChild, result); }
virtual HRESULT STDMETHODCALLTYPE removeChild(
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMDocument::removeChild(oldChild, result); }
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMDocument::removeChild(oldChild, result); }
virtual HRESULT STDMETHODCALLTYPE appendChild(
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMDocument::appendChild(oldChild, result); }
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMDocument::appendChild(oldChild, result); }
virtual HRESULT STDMETHODCALLTYPE hasChildNodes(
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMDocument::hasChildNodes(result); }
+ /* [retval][out] */ BOOL *result) { return DOMDocument::hasChildNodes(result); }
virtual HRESULT STDMETHODCALLTYPE cloneNode(
/* [in] */ BOOL deep,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMDocument::cloneNode(deep, result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMDocument::cloneNode(deep, result); }
- virtual HRESULT STDMETHODCALLTYPE normalize( void) { return DeprecatedDOMDocument::normalize(); }
+ virtual HRESULT STDMETHODCALLTYPE normalize( void) { return DOMDocument::normalize(); }
virtual HRESULT STDMETHODCALLTYPE isSupported(
/* [in] */ BSTR feature,
/* [in] */ BSTR version,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMDocument::isSupported(feature, version, result); }
+ /* [retval][out] */ BOOL *result) { return DOMDocument::isSupported(feature, version, result); }
virtual HRESULT STDMETHODCALLTYPE namespaceURI(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMDocument::namespaceURI(result); }
+ /* [retval][out] */ BSTR *result) { return DOMDocument::namespaceURI(result); }
virtual HRESULT STDMETHODCALLTYPE prefix(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMDocument::prefix(result); }
+ /* [retval][out] */ BSTR *result) { return DOMDocument::prefix(result); }
virtual HRESULT STDMETHODCALLTYPE setPrefix(
- /* [in] */ BSTR prefix) { return DeprecatedDOMDocument::setPrefix(prefix); }
+ /* [in] */ BSTR prefix) { return DOMDocument::setPrefix(prefix); }
virtual HRESULT STDMETHODCALLTYPE localName(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMDocument::localName(result); }
+ /* [retval][out] */ BSTR *result) { return DOMDocument::localName(result); }
virtual HRESULT STDMETHODCALLTYPE hasAttributes(
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMDocument::hasAttributes(result); }
+ /* [retval][out] */ BOOL *result) { return DOMDocument::hasAttributes(result); }
virtual HRESULT STDMETHODCALLTYPE isSameNode(
- /* [in] */ IDeprecatedDOMNode* other,
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMDocument::isSameNode(other, result); }
+ /* [in] */ IDOMNode* other,
+ /* [retval][out] */ BOOL* result) { return DOMDocument::isSameNode(other, result); }
virtual HRESULT STDMETHODCALLTYPE isEqualNode(
- /* [in] */ IDeprecatedDOMNode* other,
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMDocument::isEqualNode(other, result); }
+ /* [in] */ IDOMNode* other,
+ /* [retval][out] */ BOOL* result) { return DOMDocument::isEqualNode(other, result); }
virtual HRESULT STDMETHODCALLTYPE textContent(
- /* [retval][out] */ BSTR* result) { return DeprecatedDOMDocument::textContent(result); }
+ /* [retval][out] */ BSTR* result) { return DOMDocument::textContent(result); }
virtual HRESULT STDMETHODCALLTYPE setTextContent(
- /* [in] */ BSTR text) { return DeprecatedDOMDocument::setTextContent(text); }
+ /* [in] */ BSTR text) { return DOMDocument::setTextContent(text); }
- // IDeprecatedDOMDocument
+ // IDOMDocument
virtual HRESULT STDMETHODCALLTYPE doctype(
- /* [retval][out] */ IDeprecatedDOMDocumentType **result) { return DeprecatedDOMDocument::doctype(result); }
+ /* [retval][out] */ IDOMDocumentType **result) { return DOMDocument::doctype(result); }
virtual HRESULT STDMETHODCALLTYPE implementation(
- /* [retval][out] */ IDeprecatedDOMImplementation **result) { return DeprecatedDOMDocument::implementation(result); }
+ /* [retval][out] */ IDOMImplementation **result) { return DOMDocument::implementation(result); }
virtual HRESULT STDMETHODCALLTYPE documentElement(
- /* [retval][out] */ IDeprecatedDOMElement **result) { return DeprecatedDOMDocument::documentElement(result); }
+ /* [retval][out] */ IDOMElement **result) { return DOMDocument::documentElement(result); }
virtual HRESULT STDMETHODCALLTYPE createElement(
/* [in] */ BSTR tagName,
- /* [retval][out] */ IDeprecatedDOMElement **result) { return DeprecatedDOMDocument::createElement(tagName, result); }
+ /* [retval][out] */ IDOMElement **result) { return DOMDocument::createElement(tagName, result); }
virtual HRESULT STDMETHODCALLTYPE createDocumentFragment(
- /* [retval][out] */ IDeprecatedDOMDocumentFragment **result) { return DeprecatedDOMDocument::createDocumentFragment(result); }
+ /* [retval][out] */ IDOMDocumentFragment **result) { return DOMDocument::createDocumentFragment(result); }
virtual HRESULT STDMETHODCALLTYPE createTextNode(
/* [in] */ BSTR data,
- /* [retval][out] */ IDeprecatedDOMText **result) { return DeprecatedDOMDocument::createTextNode(data, result); }
+ /* [retval][out] */ IDOMText **result) { return DOMDocument::createTextNode(data, result); }
virtual HRESULT STDMETHODCALLTYPE createComment(
/* [in] */ BSTR data,
- /* [retval][out] */ IDeprecatedDOMComment **result) { return DeprecatedDOMDocument::createComment(data, result); }
+ /* [retval][out] */ IDOMComment **result) { return DOMDocument::createComment(data, result); }
virtual HRESULT STDMETHODCALLTYPE createCDATASection(
/* [in] */ BSTR data,
- /* [retval][out] */ IDeprecatedDOMCDATASection **result) { return DeprecatedDOMDocument::createCDATASection(data, result); }
+ /* [retval][out] */ IDOMCDATASection **result) { return DOMDocument::createCDATASection(data, result); }
virtual HRESULT STDMETHODCALLTYPE createProcessingInstruction(
/* [in] */ BSTR target,
/* [in] */ BSTR data,
- /* [retval][out] */ IDeprecatedDOMProcessingInstruction **result) { return DeprecatedDOMDocument::createProcessingInstruction(target, data, result); }
+ /* [retval][out] */ IDOMProcessingInstruction **result) { return DOMDocument::createProcessingInstruction(target, data, result); }
virtual HRESULT STDMETHODCALLTYPE createAttribute(
/* [in] */ BSTR name,
- /* [retval][out] */ IDeprecatedDOMAttr **result) { return DeprecatedDOMDocument::createAttribute(name, result); }
+ /* [retval][out] */ IDOMAttr **result) { return DOMDocument::createAttribute(name, result); }
virtual HRESULT STDMETHODCALLTYPE createEntityReference(
/* [in] */ BSTR name,
- /* [retval][out] */ IDeprecatedDOMEntityReference **result) { return DeprecatedDOMDocument::createEntityReference(name, result); }
+ /* [retval][out] */ IDOMEntityReference **result) { return DOMDocument::createEntityReference(name, result); }
virtual HRESULT STDMETHODCALLTYPE getElementsByTagName(
/* [in] */ BSTR tagName,
- /* [retval][out] */ IDeprecatedDOMNodeList **result) { return DeprecatedDOMDocument::getElementsByTagName(tagName, result); }
+ /* [retval][out] */ IDOMNodeList **result) { return DOMDocument::getElementsByTagName(tagName, result); }
virtual HRESULT STDMETHODCALLTYPE importNode(
- /* [in] */ IDeprecatedDOMNode *importedNode,
+ /* [in] */ IDOMNode *importedNode,
/* [in] */ BOOL deep,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMDocument::importNode(importedNode, deep, result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMDocument::importNode(importedNode, deep, result); }
virtual HRESULT STDMETHODCALLTYPE createElementNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR qualifiedName,
- /* [retval][out] */ IDeprecatedDOMElement **result) { return DeprecatedDOMDocument::createElementNS(namespaceURI, qualifiedName, result); }
+ /* [retval][out] */ IDOMElement **result) { return DOMDocument::createElementNS(namespaceURI, qualifiedName, result); }
virtual HRESULT STDMETHODCALLTYPE createAttributeNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR qualifiedName,
- /* [retval][out] */ IDeprecatedDOMAttr **result) { return DeprecatedDOMDocument::createAttributeNS(namespaceURI, qualifiedName, result); }
+ /* [retval][out] */ IDOMAttr **result) { return DOMDocument::createAttributeNS(namespaceURI, qualifiedName, result); }
virtual HRESULT STDMETHODCALLTYPE getElementsByTagNameNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR localName,
- /* [retval][out] */ IDeprecatedDOMNodeList **result) { return DeprecatedDOMDocument::getElementsByTagNameNS(namespaceURI, localName, result); }
+ /* [retval][out] */ IDOMNodeList **result) { return DOMDocument::getElementsByTagNameNS(namespaceURI, localName, result); }
virtual HRESULT STDMETHODCALLTYPE getElementById(
/* [in] */ BSTR elementId,
- /* [retval][out] */ IDeprecatedDOMElement **result) { return DeprecatedDOMDocument::getElementById(elementId, result); }
+ /* [retval][out] */ IDOMElement **result) { return DOMDocument::getElementById(elementId, result); }
- // IDeprecatedDOMHTMLDocument
+ // IDOMHTMLDocument
virtual HRESULT STDMETHODCALLTYPE title(
/* [retval][out] */ BSTR *result);
/* [retval][out] */ BSTR *result);
virtual HRESULT STDMETHODCALLTYPE body(
- /* [retval][out] */ IDeprecatedDOMHTMLElement **bodyElement);
+ /* [retval][out] */ IDOMHTMLElement **bodyElement);
virtual HRESULT STDMETHODCALLTYPE setBody(
- /* [in] */ IDeprecatedDOMHTMLElement *body);
+ /* [in] */ IDOMHTMLElement *body);
virtual HRESULT STDMETHODCALLTYPE images(
- /* [retval][out] */ IDeprecatedDOMHTMLCollection **collection);
+ /* [retval][out] */ IDOMHTMLCollection **collection);
virtual HRESULT STDMETHODCALLTYPE applets(
- /* [retval][out] */ IDeprecatedDOMHTMLCollection **collection);
+ /* [retval][out] */ IDOMHTMLCollection **collection);
virtual HRESULT STDMETHODCALLTYPE links(
- /* [retval][out] */ IDeprecatedDOMHTMLCollection **collection);
+ /* [retval][out] */ IDOMHTMLCollection **collection);
virtual HRESULT STDMETHODCALLTYPE forms(
- /* [retval][out] */ IDeprecatedDOMHTMLCollection **collection);
+ /* [retval][out] */ IDOMHTMLCollection **collection);
virtual HRESULT STDMETHODCALLTYPE anchors(
- /* [retval][out] */ IDeprecatedDOMHTMLCollection **collection);
+ /* [retval][out] */ IDOMHTMLCollection **collection);
virtual HRESULT STDMETHODCALLTYPE cookie(
/* [retval][out] */ BSTR *result);
virtual HRESULT STDMETHODCALLTYPE getElementById_(
/* [in] */ BSTR elementId,
- /* [retval][out] */ IDeprecatedDOMElement **element);
+ /* [retval][out] */ IDOMElement **element);
virtual HRESULT STDMETHODCALLTYPE getElementsByName(
/* [in] */ BSTR elementName,
- /* [retval][out] */ IDeprecatedDOMNodeList **nodeList);
+ /* [retval][out] */ IDOMNodeList **nodeList);
};
-class DeprecatedDOMHTMLElement : public DeprecatedDOMElement, public IDeprecatedDOMHTMLElement
+class DOMHTMLElement : public DOMElement, public IDOMHTMLElement
{
protected:
- DeprecatedDOMHTMLElement();
+ DOMHTMLElement();
public:
- DeprecatedDOMHTMLElement(WebCore::Element* e) : DeprecatedDOMElement(e) {}
+ DOMHTMLElement(WebCore::Element* e) : DOMElement(e) {}
// IUnknown
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
- virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DeprecatedDOMElement::AddRef(); }
- virtual ULONG STDMETHODCALLTYPE Release(void) { return DeprecatedDOMElement::Release(); }
+ virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DOMElement::AddRef(); }
+ virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMElement::Release(); }
// IWebScriptObject
virtual HRESULT STDMETHODCALLTYPE throwException(
/* [in] */ BSTR exceptionMessage,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMElement::throwException(exceptionMessage, result); }
+ /* [retval][out] */ BOOL *result) { return DOMElement::throwException(exceptionMessage, result); }
virtual HRESULT STDMETHODCALLTYPE callWebScriptMethod(
/* [in] */ BSTR name,
/* [size_is][in] */ const VARIANT args[ ],
/* [in] */ int cArgs,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMElement::callWebScriptMethod(name, args, cArgs, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMElement::callWebScriptMethod(name, args, cArgs, result); }
virtual HRESULT STDMETHODCALLTYPE evaluateWebScript(
/* [in] */ BSTR script,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMElement::evaluateWebScript(script, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMElement::evaluateWebScript(script, result); }
virtual HRESULT STDMETHODCALLTYPE removeWebScriptKey(
- /* [in] */ BSTR name) { return DeprecatedDOMElement::removeWebScriptKey(name); }
+ /* [in] */ BSTR name) { return DOMElement::removeWebScriptKey(name); }
virtual HRESULT STDMETHODCALLTYPE stringRepresentation(
- /* [retval][out] */ BSTR* stringRepresentation) { return DeprecatedDOMElement::stringRepresentation(stringRepresentation); }
+ /* [retval][out] */ BSTR* stringRepresentation) { return DOMElement::stringRepresentation(stringRepresentation); }
virtual HRESULT STDMETHODCALLTYPE webScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMElement::webScriptValueAtIndex(index, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMElement::webScriptValueAtIndex(index, result); }
virtual HRESULT STDMETHODCALLTYPE setWebScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [in] */ VARIANT val) { return DeprecatedDOMElement::setWebScriptValueAtIndex(index, val); }
+ /* [in] */ VARIANT val) { return DOMElement::setWebScriptValueAtIndex(index, val); }
virtual HRESULT STDMETHODCALLTYPE setException(
- /* [in] */ BSTR description) { return DeprecatedDOMElement::setException(description); }
+ /* [in] */ BSTR description) { return DOMElement::setException(description); }
- // IDeprecatedDOMNode
+ // IDOMNode
virtual HRESULT STDMETHODCALLTYPE nodeName(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMElement::nodeName(result); }
+ /* [retval][out] */ BSTR *result) { return DOMElement::nodeName(result); }
virtual HRESULT STDMETHODCALLTYPE nodeValue(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMElement::nodeValue(result); }
+ /* [retval][out] */ BSTR *result) { return DOMElement::nodeValue(result); }
virtual HRESULT STDMETHODCALLTYPE setNodeValue(
- /* [in] */ BSTR value) { return DeprecatedDOMElement::setNodeValue(value); }
+ /* [in] */ BSTR value) { return DOMElement::setNodeValue(value); }
virtual HRESULT STDMETHODCALLTYPE nodeType(
- /* [retval][out] */ unsigned short *result) { return DeprecatedDOMElement::nodeType(result); }
+ /* [retval][out] */ unsigned short *result) { return DOMElement::nodeType(result); }
virtual HRESULT STDMETHODCALLTYPE parentNode(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMElement::parentNode(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMElement::parentNode(result); }
virtual HRESULT STDMETHODCALLTYPE childNodes(
- /* [retval][out] */ IDeprecatedDOMNodeList **result) { return DeprecatedDOMElement::childNodes(result); }
+ /* [retval][out] */ IDOMNodeList **result) { return DOMElement::childNodes(result); }
virtual HRESULT STDMETHODCALLTYPE firstChild(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMElement::firstChild(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMElement::firstChild(result); }
virtual HRESULT STDMETHODCALLTYPE lastChild(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMElement::lastChild(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMElement::lastChild(result); }
virtual HRESULT STDMETHODCALLTYPE previousSibling(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMElement::previousSibling(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMElement::previousSibling(result); }
virtual HRESULT STDMETHODCALLTYPE nextSibling(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMElement::nextSibling(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMElement::nextSibling(result); }
virtual HRESULT STDMETHODCALLTYPE attributes(
- /* [retval][out] */ IDeprecatedDOMNamedNodeMap **result) { return DeprecatedDOMElement::attributes(result); }
+ /* [retval][out] */ IDOMNamedNodeMap **result) { return DOMElement::attributes(result); }
virtual HRESULT STDMETHODCALLTYPE ownerDocument(
- /* [retval][out] */ IDeprecatedDOMDocument **result) { return DeprecatedDOMElement::ownerDocument(result); }
+ /* [retval][out] */ IDOMDocument **result) { return DOMElement::ownerDocument(result); }
virtual HRESULT STDMETHODCALLTYPE insertBefore(
- /* [in] */ IDeprecatedDOMNode *newChild,
- /* [in] */ IDeprecatedDOMNode *refChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMElement::insertBefore(newChild, refChild, result); }
+ /* [in] */ IDOMNode *newChild,
+ /* [in] */ IDOMNode *refChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMElement::insertBefore(newChild, refChild, result); }
virtual HRESULT STDMETHODCALLTYPE replaceChild(
- /* [in] */ IDeprecatedDOMNode *newChild,
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMElement::replaceChild(newChild, oldChild, result); }
+ /* [in] */ IDOMNode *newChild,
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMElement::replaceChild(newChild, oldChild, result); }
virtual HRESULT STDMETHODCALLTYPE removeChild(
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMElement::removeChild(oldChild, result); }
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMElement::removeChild(oldChild, result); }
virtual HRESULT STDMETHODCALLTYPE appendChild(
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMElement::appendChild(oldChild, result); }
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMElement::appendChild(oldChild, result); }
virtual HRESULT STDMETHODCALLTYPE hasChildNodes(
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMElement::hasChildNodes(result); }
+ /* [retval][out] */ BOOL *result) { return DOMElement::hasChildNodes(result); }
virtual HRESULT STDMETHODCALLTYPE cloneNode(
/* [in] */ BOOL deep,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMElement::cloneNode(deep, result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMElement::cloneNode(deep, result); }
- virtual HRESULT STDMETHODCALLTYPE normalize( void) { return DeprecatedDOMElement::normalize(); }
+ virtual HRESULT STDMETHODCALLTYPE normalize( void) { return DOMElement::normalize(); }
virtual HRESULT STDMETHODCALLTYPE isSupported(
/* [in] */ BSTR feature,
/* [in] */ BSTR version,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMElement::isSupported(feature, version, result); }
+ /* [retval][out] */ BOOL *result) { return DOMElement::isSupported(feature, version, result); }
virtual HRESULT STDMETHODCALLTYPE namespaceURI(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMElement::namespaceURI(result); }
+ /* [retval][out] */ BSTR *result) { return DOMElement::namespaceURI(result); }
virtual HRESULT STDMETHODCALLTYPE prefix(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMElement::prefix(result); }
+ /* [retval][out] */ BSTR *result) { return DOMElement::prefix(result); }
virtual HRESULT STDMETHODCALLTYPE setPrefix(
- /* [in] */ BSTR prefix) { return DeprecatedDOMElement::setPrefix(prefix); }
+ /* [in] */ BSTR prefix) { return DOMElement::setPrefix(prefix); }
virtual HRESULT STDMETHODCALLTYPE localName(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMElement::localName(result); }
+ /* [retval][out] */ BSTR *result) { return DOMElement::localName(result); }
virtual HRESULT STDMETHODCALLTYPE hasAttributes(
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMElement::hasAttributes(result); }
+ /* [retval][out] */ BOOL *result) { return DOMElement::hasAttributes(result); }
virtual HRESULT STDMETHODCALLTYPE isSameNode(
- /* [in] */ IDeprecatedDOMNode* other,
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMElement::isSameNode(other, result); }
+ /* [in] */ IDOMNode* other,
+ /* [retval][out] */ BOOL* result) { return DOMElement::isSameNode(other, result); }
virtual HRESULT STDMETHODCALLTYPE isEqualNode(
- /* [in] */ IDeprecatedDOMNode* other,
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMElement::isEqualNode(other, result); }
+ /* [in] */ IDOMNode* other,
+ /* [retval][out] */ BOOL* result) { return DOMElement::isEqualNode(other, result); }
virtual HRESULT STDMETHODCALLTYPE textContent(
- /* [retval][out] */ BSTR* result) { return DeprecatedDOMElement::textContent(result); }
+ /* [retval][out] */ BSTR* result) { return DOMElement::textContent(result); }
virtual HRESULT STDMETHODCALLTYPE setTextContent(
- /* [in] */ BSTR text) { return DeprecatedDOMElement::setTextContent(text); }
+ /* [in] */ BSTR text) { return DOMElement::setTextContent(text); }
- // IDeprecatedDOMElement
+ // IDOMElement
virtual HRESULT STDMETHODCALLTYPE tagName(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMElement::tagName(result); }
+ /* [retval][out] */ BSTR *result) { return DOMElement::tagName(result); }
virtual HRESULT STDMETHODCALLTYPE getAttribute(
/* [in] */ BSTR name,
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMElement::getAttribute(name, result); }
+ /* [retval][out] */ BSTR *result) { return DOMElement::getAttribute(name, result); }
virtual HRESULT STDMETHODCALLTYPE setAttribute(
/* [in] */ BSTR name,
- /* [in] */ BSTR value) { return DeprecatedDOMElement::setAttribute(name, value); }
+ /* [in] */ BSTR value) { return DOMElement::setAttribute(name, value); }
virtual HRESULT STDMETHODCALLTYPE removeAttribute(
- /* [in] */ BSTR name) { return DeprecatedDOMElement::removeAttribute(name); }
+ /* [in] */ BSTR name) { return DOMElement::removeAttribute(name); }
virtual HRESULT STDMETHODCALLTYPE getAttributeNode(
/* [in] */ BSTR name,
- /* [retval][out] */ IDeprecatedDOMAttr **result) { return DeprecatedDOMElement::getAttributeNode(name, result); }
+ /* [retval][out] */ IDOMAttr **result) { return DOMElement::getAttributeNode(name, result); }
virtual HRESULT STDMETHODCALLTYPE setAttributeNode(
- /* [in] */ IDeprecatedDOMAttr *newAttr,
- /* [retval][out] */ IDeprecatedDOMAttr **result) { return DeprecatedDOMElement::setAttributeNode(newAttr, result); }
+ /* [in] */ IDOMAttr *newAttr,
+ /* [retval][out] */ IDOMAttr **result) { return DOMElement::setAttributeNode(newAttr, result); }
virtual HRESULT STDMETHODCALLTYPE removeAttributeNode(
- /* [in] */ IDeprecatedDOMAttr *oldAttr,
- /* [retval][out] */ IDeprecatedDOMAttr **result) { return DeprecatedDOMElement::removeAttributeNode(oldAttr, result); }
+ /* [in] */ IDOMAttr *oldAttr,
+ /* [retval][out] */ IDOMAttr **result) { return DOMElement::removeAttributeNode(oldAttr, result); }
virtual HRESULT STDMETHODCALLTYPE getElementsByTagName(
/* [in] */ BSTR name,
- /* [retval][out] */ IDeprecatedDOMNodeList **result) { return DeprecatedDOMElement::getElementsByTagName(name, result); }
+ /* [retval][out] */ IDOMNodeList **result) { return DOMElement::getElementsByTagName(name, result); }
virtual HRESULT STDMETHODCALLTYPE getAttributeNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR localName,
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMElement::getAttributeNS(namespaceURI, localName, result); }
+ /* [retval][out] */ BSTR *result) { return DOMElement::getAttributeNS(namespaceURI, localName, result); }
virtual HRESULT STDMETHODCALLTYPE setAttributeNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR qualifiedName,
- /* [in] */ BSTR value) { return DeprecatedDOMElement::setAttributeNS(namespaceURI, qualifiedName, value); }
+ /* [in] */ BSTR value) { return DOMElement::setAttributeNS(namespaceURI, qualifiedName, value); }
virtual HRESULT STDMETHODCALLTYPE removeAttributeNS(
/* [in] */ BSTR namespaceURI,
- /* [in] */ BSTR localName) { return DeprecatedDOMElement::removeAttributeNS(namespaceURI, localName); }
+ /* [in] */ BSTR localName) { return DOMElement::removeAttributeNS(namespaceURI, localName); }
virtual HRESULT STDMETHODCALLTYPE getAttributeNodeNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR localName,
- /* [retval][out] */ IDeprecatedDOMAttr **result) { return DeprecatedDOMElement::getAttributeNodeNS(namespaceURI, localName, result); }
+ /* [retval][out] */ IDOMAttr **result) { return DOMElement::getAttributeNodeNS(namespaceURI, localName, result); }
virtual HRESULT STDMETHODCALLTYPE setAttributeNodeNS(
- /* [in] */ IDeprecatedDOMAttr *newAttr,
- /* [retval][out] */ IDeprecatedDOMAttr **result) { return DeprecatedDOMElement::setAttributeNodeNS(newAttr, result); }
+ /* [in] */ IDOMAttr *newAttr,
+ /* [retval][out] */ IDOMAttr **result) { return DOMElement::setAttributeNodeNS(newAttr, result); }
virtual HRESULT STDMETHODCALLTYPE getElementsByTagNameNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR localName,
- /* [retval][out] */ IDeprecatedDOMNodeList **result) { return DeprecatedDOMElement::getElementsByTagNameNS(namespaceURI, localName, result); }
+ /* [retval][out] */ IDOMNodeList **result) { return DOMElement::getElementsByTagNameNS(namespaceURI, localName, result); }
virtual HRESULT STDMETHODCALLTYPE hasAttribute(
/* [in] */ BSTR name,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMElement::hasAttribute(name, result); }
+ /* [retval][out] */ BOOL *result) { return DOMElement::hasAttribute(name, result); }
virtual HRESULT STDMETHODCALLTYPE hasAttributeNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR localName,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMElement::hasAttributeNS(namespaceURI, localName, result); }
+ /* [retval][out] */ BOOL *result) { return DOMElement::hasAttributeNS(namespaceURI, localName, result); }
- virtual HRESULT STDMETHODCALLTYPE focus( void) { return DeprecatedDOMElement::focus(); }
+ virtual HRESULT STDMETHODCALLTYPE focus( void) { return DOMElement::focus(); }
- virtual HRESULT STDMETHODCALLTYPE blur( void) { return DeprecatedDOMElement::blur(); }
+ virtual HRESULT STDMETHODCALLTYPE blur( void) { return DOMElement::blur(); }
- // IDeprecatedDOMHTMLElement
+ // IDOMHTMLElement
virtual HRESULT STDMETHODCALLTYPE idName(
/* [retval][out] */ BSTR *result);
};
-class DeprecatedDOMHTMLFormElement : public DeprecatedDOMHTMLElement, public IDeprecatedDOMHTMLFormElement
+class DOMHTMLFormElement : public DOMHTMLElement, public IDOMHTMLFormElement
{
protected:
- DeprecatedDOMHTMLFormElement();
+ DOMHTMLFormElement();
public:
- DeprecatedDOMHTMLFormElement(WebCore::Element* e) : DeprecatedDOMHTMLElement(e) {}
+ DOMHTMLFormElement(WebCore::Element* e) : DOMHTMLElement(e) {}
// IUnknown
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
- virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DeprecatedDOMHTMLElement::AddRef(); }
- virtual ULONG STDMETHODCALLTYPE Release(void) { return DeprecatedDOMHTMLElement::Release(); }
+ virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DOMHTMLElement::AddRef(); }
+ virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMHTMLElement::Release(); }
// IWebScriptObject
virtual HRESULT STDMETHODCALLTYPE throwException(
/* [in] */ BSTR exceptionMessage,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMHTMLElement::throwException(exceptionMessage, result); }
+ /* [retval][out] */ BOOL *result) { return DOMHTMLElement::throwException(exceptionMessage, result); }
virtual HRESULT STDMETHODCALLTYPE callWebScriptMethod(
/* [in] */ BSTR name,
/* [size_is][in] */ const VARIANT args[ ],
/* [in] */ int cArgs,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMHTMLElement::callWebScriptMethod(name, args, cArgs, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMHTMLElement::callWebScriptMethod(name, args, cArgs, result); }
virtual HRESULT STDMETHODCALLTYPE evaluateWebScript(
/* [in] */ BSTR script,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMHTMLElement::evaluateWebScript(script, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMHTMLElement::evaluateWebScript(script, result); }
virtual HRESULT STDMETHODCALLTYPE removeWebScriptKey(
- /* [in] */ BSTR name) { return DeprecatedDOMHTMLElement::removeWebScriptKey(name); }
+ /* [in] */ BSTR name) { return DOMHTMLElement::removeWebScriptKey(name); }
virtual HRESULT STDMETHODCALLTYPE stringRepresentation(
- /* [retval][out] */ BSTR* stringRepresentation) { return DeprecatedDOMHTMLElement::stringRepresentation(stringRepresentation); }
+ /* [retval][out] */ BSTR* stringRepresentation) { return DOMHTMLElement::stringRepresentation(stringRepresentation); }
virtual HRESULT STDMETHODCALLTYPE webScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMHTMLElement::webScriptValueAtIndex(index, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMHTMLElement::webScriptValueAtIndex(index, result); }
virtual HRESULT STDMETHODCALLTYPE setWebScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [in] */ VARIANT val) { return DeprecatedDOMHTMLElement::setWebScriptValueAtIndex(index, val); }
+ /* [in] */ VARIANT val) { return DOMHTMLElement::setWebScriptValueAtIndex(index, val); }
virtual HRESULT STDMETHODCALLTYPE setException(
- /* [in] */ BSTR description) { return DeprecatedDOMHTMLElement::setException(description); }
+ /* [in] */ BSTR description) { return DOMHTMLElement::setException(description); }
- // IDeprecatedDOMNode
+ // IDOMNode
virtual HRESULT STDMETHODCALLTYPE nodeName(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::nodeName(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::nodeName(result); }
virtual HRESULT STDMETHODCALLTYPE nodeValue(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::nodeValue(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::nodeValue(result); }
virtual HRESULT STDMETHODCALLTYPE setNodeValue(
- /* [in] */ BSTR value) { return DeprecatedDOMHTMLElement::setNodeValue(value); }
+ /* [in] */ BSTR value) { return DOMHTMLElement::setNodeValue(value); }
virtual HRESULT STDMETHODCALLTYPE nodeType(
- /* [retval][out] */ unsigned short *result) { return DeprecatedDOMHTMLElement::nodeType(result); }
+ /* [retval][out] */ unsigned short *result) { return DOMHTMLElement::nodeType(result); }
virtual HRESULT STDMETHODCALLTYPE parentNode(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::parentNode(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::parentNode(result); }
virtual HRESULT STDMETHODCALLTYPE childNodes(
- /* [retval][out] */ IDeprecatedDOMNodeList **result) { return DeprecatedDOMHTMLElement::childNodes(result); }
+ /* [retval][out] */ IDOMNodeList **result) { return DOMHTMLElement::childNodes(result); }
virtual HRESULT STDMETHODCALLTYPE firstChild(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::firstChild(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::firstChild(result); }
virtual HRESULT STDMETHODCALLTYPE lastChild(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::lastChild(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::lastChild(result); }
virtual HRESULT STDMETHODCALLTYPE previousSibling(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::previousSibling(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::previousSibling(result); }
virtual HRESULT STDMETHODCALLTYPE nextSibling(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::nextSibling(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::nextSibling(result); }
virtual HRESULT STDMETHODCALLTYPE attributes(
- /* [retval][out] */ IDeprecatedDOMNamedNodeMap **result) { return DeprecatedDOMHTMLElement::attributes(result); }
+ /* [retval][out] */ IDOMNamedNodeMap **result) { return DOMHTMLElement::attributes(result); }
virtual HRESULT STDMETHODCALLTYPE ownerDocument(
- /* [retval][out] */ IDeprecatedDOMDocument **result) { return DeprecatedDOMHTMLElement::ownerDocument(result); }
+ /* [retval][out] */ IDOMDocument **result) { return DOMHTMLElement::ownerDocument(result); }
virtual HRESULT STDMETHODCALLTYPE insertBefore(
- /* [in] */ IDeprecatedDOMNode *newChild,
- /* [in] */ IDeprecatedDOMNode *refChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::insertBefore(newChild, refChild, result); }
+ /* [in] */ IDOMNode *newChild,
+ /* [in] */ IDOMNode *refChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::insertBefore(newChild, refChild, result); }
virtual HRESULT STDMETHODCALLTYPE replaceChild(
- /* [in] */ IDeprecatedDOMNode *newChild,
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::replaceChild(newChild, oldChild, result); }
+ /* [in] */ IDOMNode *newChild,
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::replaceChild(newChild, oldChild, result); }
virtual HRESULT STDMETHODCALLTYPE removeChild(
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::removeChild(oldChild, result); }
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::removeChild(oldChild, result); }
virtual HRESULT STDMETHODCALLTYPE appendChild(
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::appendChild(oldChild, result); }
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::appendChild(oldChild, result); }
virtual HRESULT STDMETHODCALLTYPE hasChildNodes(
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMHTMLElement::hasChildNodes(result); }
+ /* [retval][out] */ BOOL *result) { return DOMHTMLElement::hasChildNodes(result); }
virtual HRESULT STDMETHODCALLTYPE cloneNode(
/* [in] */ BOOL deep,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::cloneNode(deep, result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::cloneNode(deep, result); }
- virtual HRESULT STDMETHODCALLTYPE normalize( void) { return DeprecatedDOMHTMLElement::normalize(); }
+ virtual HRESULT STDMETHODCALLTYPE normalize( void) { return DOMHTMLElement::normalize(); }
virtual HRESULT STDMETHODCALLTYPE isSupported(
/* [in] */ BSTR feature,
/* [in] */ BSTR version,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMHTMLElement::isSupported(feature, version, result); }
+ /* [retval][out] */ BOOL *result) { return DOMHTMLElement::isSupported(feature, version, result); }
virtual HRESULT STDMETHODCALLTYPE namespaceURI(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::namespaceURI(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::namespaceURI(result); }
virtual HRESULT STDMETHODCALLTYPE prefix(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::prefix(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::prefix(result); }
virtual HRESULT STDMETHODCALLTYPE setPrefix(
- /* [in] */ BSTR prefix) { return DeprecatedDOMHTMLElement::setPrefix(prefix); }
+ /* [in] */ BSTR prefix) { return DOMHTMLElement::setPrefix(prefix); }
virtual HRESULT STDMETHODCALLTYPE localName(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::localName(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::localName(result); }
virtual HRESULT STDMETHODCALLTYPE hasAttributes(
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMHTMLElement::hasAttributes(result); }
+ /* [retval][out] */ BOOL *result) { return DOMHTMLElement::hasAttributes(result); }
virtual HRESULT STDMETHODCALLTYPE isSameNode(
- /* [in] */ IDeprecatedDOMNode* other,
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMHTMLElement::isSameNode(other, result); }
+ /* [in] */ IDOMNode* other,
+ /* [retval][out] */ BOOL* result) { return DOMHTMLElement::isSameNode(other, result); }
virtual HRESULT STDMETHODCALLTYPE isEqualNode(
- /* [in] */ IDeprecatedDOMNode* other,
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMHTMLElement::isEqualNode(other, result); }
+ /* [in] */ IDOMNode* other,
+ /* [retval][out] */ BOOL* result) { return DOMHTMLElement::isEqualNode(other, result); }
virtual HRESULT STDMETHODCALLTYPE textContent(
- /* [retval][out] */ BSTR* result) { return DeprecatedDOMHTMLElement::textContent(result); }
+ /* [retval][out] */ BSTR* result) { return DOMHTMLElement::textContent(result); }
virtual HRESULT STDMETHODCALLTYPE setTextContent(
- /* [in] */ BSTR text) { return DeprecatedDOMHTMLElement::setTextContent(text); }
+ /* [in] */ BSTR text) { return DOMHTMLElement::setTextContent(text); }
- // IDeprecatedDOMElement
+ // IDOMElement
virtual HRESULT STDMETHODCALLTYPE tagName(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::tagName(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::tagName(result); }
virtual HRESULT STDMETHODCALLTYPE getAttribute(
/* [in] */ BSTR name,
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::getAttribute(name, result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::getAttribute(name, result); }
virtual HRESULT STDMETHODCALLTYPE setAttribute(
/* [in] */ BSTR name,
- /* [in] */ BSTR value) { return DeprecatedDOMHTMLElement::setAttribute(name, value); }
+ /* [in] */ BSTR value) { return DOMHTMLElement::setAttribute(name, value); }
virtual HRESULT STDMETHODCALLTYPE removeAttribute(
- /* [in] */ BSTR name) { return DeprecatedDOMHTMLElement::removeAttribute(name); }
+ /* [in] */ BSTR name) { return DOMHTMLElement::removeAttribute(name); }
virtual HRESULT STDMETHODCALLTYPE getAttributeNode(
/* [in] */ BSTR name,
- /* [retval][out] */ IDeprecatedDOMAttr **result) { return DeprecatedDOMHTMLElement::getAttributeNode(name, result); }
+ /* [retval][out] */ IDOMAttr **result) { return DOMHTMLElement::getAttributeNode(name, result); }
virtual HRESULT STDMETHODCALLTYPE setAttributeNode(
- /* [in] */ IDeprecatedDOMAttr *newAttr,
- /* [retval][out] */ IDeprecatedDOMAttr **result) { return DeprecatedDOMHTMLElement::setAttributeNode(newAttr, result); }
+ /* [in] */ IDOMAttr *newAttr,
+ /* [retval][out] */ IDOMAttr **result) { return DOMHTMLElement::setAttributeNode(newAttr, result); }
virtual HRESULT STDMETHODCALLTYPE removeAttributeNode(
- /* [in] */ IDeprecatedDOMAttr *oldAttr,
- /* [retval][out] */ IDeprecatedDOMAttr **result) { return DeprecatedDOMHTMLElement::removeAttributeNode(oldAttr, result); }
+ /* [in] */ IDOMAttr *oldAttr,
+ /* [retval][out] */ IDOMAttr **result) { return DOMHTMLElement::removeAttributeNode(oldAttr, result); }
virtual HRESULT STDMETHODCALLTYPE getElementsByTagName(
/* [in] */ BSTR name,
- /* [retval][out] */ IDeprecatedDOMNodeList **result) { return DeprecatedDOMHTMLElement::getElementsByTagName(name, result); }
+ /* [retval][out] */ IDOMNodeList **result) { return DOMHTMLElement::getElementsByTagName(name, result); }
virtual HRESULT STDMETHODCALLTYPE getAttributeNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR localName,
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::getAttributeNS(namespaceURI, localName, result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::getAttributeNS(namespaceURI, localName, result); }
virtual HRESULT STDMETHODCALLTYPE setAttributeNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR qualifiedName,
- /* [in] */ BSTR value) { return DeprecatedDOMHTMLElement::setAttributeNS(namespaceURI, qualifiedName, value); }
+ /* [in] */ BSTR value) { return DOMHTMLElement::setAttributeNS(namespaceURI, qualifiedName, value); }
virtual HRESULT STDMETHODCALLTYPE removeAttributeNS(
/* [in] */ BSTR namespaceURI,
- /* [in] */ BSTR localName) { return DeprecatedDOMHTMLElement::removeAttributeNS(namespaceURI, localName); }
+ /* [in] */ BSTR localName) { return DOMHTMLElement::removeAttributeNS(namespaceURI, localName); }
virtual HRESULT STDMETHODCALLTYPE getAttributeNodeNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR localName,
- /* [retval][out] */ IDeprecatedDOMAttr **result) { return DeprecatedDOMHTMLElement::getAttributeNodeNS(namespaceURI, localName, result); }
+ /* [retval][out] */ IDOMAttr **result) { return DOMHTMLElement::getAttributeNodeNS(namespaceURI, localName, result); }
virtual HRESULT STDMETHODCALLTYPE setAttributeNodeNS(
- /* [in] */ IDeprecatedDOMAttr *newAttr,
- /* [retval][out] */ IDeprecatedDOMAttr **result) { return DeprecatedDOMHTMLElement::setAttributeNodeNS(newAttr, result); }
+ /* [in] */ IDOMAttr *newAttr,
+ /* [retval][out] */ IDOMAttr **result) { return DOMHTMLElement::setAttributeNodeNS(newAttr, result); }
virtual HRESULT STDMETHODCALLTYPE getElementsByTagNameNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR localName,
- /* [retval][out] */ IDeprecatedDOMNodeList **result) { return DeprecatedDOMHTMLElement::getElementsByTagNameNS(namespaceURI, localName, result); }
+ /* [retval][out] */ IDOMNodeList **result) { return DOMHTMLElement::getElementsByTagNameNS(namespaceURI, localName, result); }
virtual HRESULT STDMETHODCALLTYPE hasAttribute(
/* [in] */ BSTR name,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMHTMLElement::hasAttribute(name, result); }
+ /* [retval][out] */ BOOL *result) { return DOMHTMLElement::hasAttribute(name, result); }
virtual HRESULT STDMETHODCALLTYPE hasAttributeNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR localName,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMHTMLElement::hasAttributeNS(namespaceURI, localName, result); }
+ /* [retval][out] */ BOOL *result) { return DOMHTMLElement::hasAttributeNS(namespaceURI, localName, result); }
- virtual HRESULT STDMETHODCALLTYPE focus( void) { return DeprecatedDOMHTMLElement::focus(); }
+ virtual HRESULT STDMETHODCALLTYPE focus( void) { return DOMHTMLElement::focus(); }
- virtual HRESULT STDMETHODCALLTYPE blur( void) { return DeprecatedDOMHTMLElement::blur(); }
+ virtual HRESULT STDMETHODCALLTYPE blur( void) { return DOMHTMLElement::blur(); }
- // IDeprecatedDOMHTMLElement
+ // IDOMHTMLElement
virtual HRESULT STDMETHODCALLTYPE idName(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::idName(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::idName(result); }
virtual HRESULT STDMETHODCALLTYPE setIdName(
- /* [in] */ BSTR idName) { return DeprecatedDOMHTMLElement::setIdName(idName); }
+ /* [in] */ BSTR idName) { return DOMHTMLElement::setIdName(idName); }
virtual HRESULT STDMETHODCALLTYPE title(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::title(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::title(result); }
virtual HRESULT STDMETHODCALLTYPE setTitle(
- /* [in] */ BSTR title) { return DeprecatedDOMHTMLElement::setTitle(title); }
+ /* [in] */ BSTR title) { return DOMHTMLElement::setTitle(title); }
virtual HRESULT STDMETHODCALLTYPE lang(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::lang(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::lang(result); }
virtual HRESULT STDMETHODCALLTYPE setLang(
- /* [in] */ BSTR lang) { return DeprecatedDOMHTMLElement::setLang(lang); }
+ /* [in] */ BSTR lang) { return DOMHTMLElement::setLang(lang); }
virtual HRESULT STDMETHODCALLTYPE dir(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::dir(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::dir(result); }
virtual HRESULT STDMETHODCALLTYPE setDir(
- /* [in] */ BSTR dir) { return DeprecatedDOMHTMLElement::setDir(dir); }
+ /* [in] */ BSTR dir) { return DOMHTMLElement::setDir(dir); }
virtual HRESULT STDMETHODCALLTYPE className(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::className(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::className(result); }
virtual HRESULT STDMETHODCALLTYPE setClassName(
- /* [in] */ BSTR className) { return DeprecatedDOMHTMLElement::setClassName(className); }
+ /* [in] */ BSTR className) { return DOMHTMLElement::setClassName(className); }
virtual HRESULT STDMETHODCALLTYPE innerHTML(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::innerHTML(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::innerHTML(result); }
virtual HRESULT STDMETHODCALLTYPE setInnerHTML(
- /* [in] */ BSTR html) { return DeprecatedDOMHTMLElement::setInnerHTML(html); }
+ /* [in] */ BSTR html) { return DOMHTMLElement::setInnerHTML(html); }
virtual HRESULT STDMETHODCALLTYPE innerText(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::innerText(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::innerText(result); }
virtual HRESULT STDMETHODCALLTYPE setInnerText(
- /* [in] */ BSTR text) { return DeprecatedDOMHTMLElement::setInnerText(text); }
+ /* [in] */ BSTR text) { return DOMHTMLElement::setInnerText(text); }
- // IDeprecatedDOMHTMLFormElement
+ // IDOMHTMLFormElement
virtual HRESULT STDMETHODCALLTYPE elements(
- /* [retval][out] */ IDeprecatedDOMHTMLCollection **result);
+ /* [retval][out] */ IDOMHTMLCollection **result);
virtual HRESULT STDMETHODCALLTYPE length(
/* [retval][out] */ int *result);
virtual HRESULT STDMETHODCALLTYPE reset( void);
};
-class DeprecatedDOMHTMLSelectElement : public DeprecatedDOMHTMLElement, public IDeprecatedDOMHTMLSelectElement, public IFormsAutoFillTransitionSelect
+class DOMHTMLSelectElement : public DOMHTMLElement, public IDOMHTMLSelectElement, public IFormsAutoFillTransitionSelect
{
protected:
- DeprecatedDOMHTMLSelectElement();
+ DOMHTMLSelectElement();
public:
- DeprecatedDOMHTMLSelectElement(WebCore::Element* e) : DeprecatedDOMHTMLElement(e) {}
+ DOMHTMLSelectElement(WebCore::Element* e) : DOMHTMLElement(e) {}
// IUnknown
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
- virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DeprecatedDOMHTMLElement::AddRef(); }
- virtual ULONG STDMETHODCALLTYPE Release(void) { return DeprecatedDOMHTMLElement::Release(); }
+ virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DOMHTMLElement::AddRef(); }
+ virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMHTMLElement::Release(); }
// IWebScriptObject
virtual HRESULT STDMETHODCALLTYPE throwException(
/* [in] */ BSTR exceptionMessage,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMHTMLElement::throwException(exceptionMessage, result); }
+ /* [retval][out] */ BOOL *result) { return DOMHTMLElement::throwException(exceptionMessage, result); }
virtual HRESULT STDMETHODCALLTYPE callWebScriptMethod(
/* [in] */ BSTR name,
/* [size_is][in] */ const VARIANT args[ ],
/* [in] */ int cArgs,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMHTMLElement::callWebScriptMethod(name, args, cArgs, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMHTMLElement::callWebScriptMethod(name, args, cArgs, result); }
virtual HRESULT STDMETHODCALLTYPE evaluateWebScript(
/* [in] */ BSTR script,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMHTMLElement::evaluateWebScript(script, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMHTMLElement::evaluateWebScript(script, result); }
virtual HRESULT STDMETHODCALLTYPE removeWebScriptKey(
- /* [in] */ BSTR name) { return DeprecatedDOMHTMLElement::removeWebScriptKey(name); }
+ /* [in] */ BSTR name) { return DOMHTMLElement::removeWebScriptKey(name); }
virtual HRESULT STDMETHODCALLTYPE stringRepresentation(
- /* [retval][out] */ BSTR* stringRepresentation) { return DeprecatedDOMHTMLElement::stringRepresentation(stringRepresentation); }
+ /* [retval][out] */ BSTR* stringRepresentation) { return DOMHTMLElement::stringRepresentation(stringRepresentation); }
virtual HRESULT STDMETHODCALLTYPE webScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMHTMLElement::webScriptValueAtIndex(index, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMHTMLElement::webScriptValueAtIndex(index, result); }
virtual HRESULT STDMETHODCALLTYPE setWebScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [in] */ VARIANT val) { return DeprecatedDOMHTMLElement::setWebScriptValueAtIndex(index, val); }
+ /* [in] */ VARIANT val) { return DOMHTMLElement::setWebScriptValueAtIndex(index, val); }
virtual HRESULT STDMETHODCALLTYPE setException(
- /* [in] */ BSTR description) { return DeprecatedDOMHTMLElement::setException(description); }
+ /* [in] */ BSTR description) { return DOMHTMLElement::setException(description); }
- // IDeprecatedDOMNode
+ // IDOMNode
virtual HRESULT STDMETHODCALLTYPE nodeName(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::nodeName(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::nodeName(result); }
virtual HRESULT STDMETHODCALLTYPE nodeValue(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::nodeValue(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::nodeValue(result); }
virtual HRESULT STDMETHODCALLTYPE setNodeValue(
- /* [in] */ BSTR value) { return DeprecatedDOMHTMLElement::setNodeValue(value); }
+ /* [in] */ BSTR value) { return DOMHTMLElement::setNodeValue(value); }
virtual HRESULT STDMETHODCALLTYPE nodeType(
- /* [retval][out] */ unsigned short *result) { return DeprecatedDOMHTMLElement::nodeType(result); }
+ /* [retval][out] */ unsigned short *result) { return DOMHTMLElement::nodeType(result); }
virtual HRESULT STDMETHODCALLTYPE parentNode(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::parentNode(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::parentNode(result); }
virtual HRESULT STDMETHODCALLTYPE childNodes(
- /* [retval][out] */ IDeprecatedDOMNodeList **result) { return DeprecatedDOMHTMLElement::childNodes(result); }
+ /* [retval][out] */ IDOMNodeList **result) { return DOMHTMLElement::childNodes(result); }
virtual HRESULT STDMETHODCALLTYPE firstChild(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::firstChild(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::firstChild(result); }
virtual HRESULT STDMETHODCALLTYPE lastChild(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::lastChild(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::lastChild(result); }
virtual HRESULT STDMETHODCALLTYPE previousSibling(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::previousSibling(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::previousSibling(result); }
virtual HRESULT STDMETHODCALLTYPE nextSibling(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::nextSibling(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::nextSibling(result); }
virtual HRESULT STDMETHODCALLTYPE attributes(
- /* [retval][out] */ IDeprecatedDOMNamedNodeMap **result) { return DeprecatedDOMHTMLElement::attributes(result); }
+ /* [retval][out] */ IDOMNamedNodeMap **result) { return DOMHTMLElement::attributes(result); }
virtual HRESULT STDMETHODCALLTYPE ownerDocument(
- /* [retval][out] */ IDeprecatedDOMDocument **result) { return DeprecatedDOMHTMLElement::ownerDocument(result); }
+ /* [retval][out] */ IDOMDocument **result) { return DOMHTMLElement::ownerDocument(result); }
virtual HRESULT STDMETHODCALLTYPE insertBefore(
- /* [in] */ IDeprecatedDOMNode *newChild,
- /* [in] */ IDeprecatedDOMNode *refChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::insertBefore(newChild, refChild, result); }
+ /* [in] */ IDOMNode *newChild,
+ /* [in] */ IDOMNode *refChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::insertBefore(newChild, refChild, result); }
virtual HRESULT STDMETHODCALLTYPE replaceChild(
- /* [in] */ IDeprecatedDOMNode *newChild,
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::replaceChild(newChild, oldChild, result); }
+ /* [in] */ IDOMNode *newChild,
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::replaceChild(newChild, oldChild, result); }
virtual HRESULT STDMETHODCALLTYPE removeChild(
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::removeChild(oldChild, result); }
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::removeChild(oldChild, result); }
virtual HRESULT STDMETHODCALLTYPE appendChild(
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::appendChild(oldChild, result); }
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::appendChild(oldChild, result); }
virtual HRESULT STDMETHODCALLTYPE hasChildNodes(
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMHTMLElement::hasChildNodes(result); }
+ /* [retval][out] */ BOOL *result) { return DOMHTMLElement::hasChildNodes(result); }
virtual HRESULT STDMETHODCALLTYPE cloneNode(
/* [in] */ BOOL deep,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::cloneNode(deep, result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::cloneNode(deep, result); }
- virtual HRESULT STDMETHODCALLTYPE normalize( void) { return DeprecatedDOMHTMLElement::normalize(); }
+ virtual HRESULT STDMETHODCALLTYPE normalize( void) { return DOMHTMLElement::normalize(); }
virtual HRESULT STDMETHODCALLTYPE isSupported(
/* [in] */ BSTR feature,
/* [in] */ BSTR version,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMHTMLElement::isSupported(feature, version, result); }
+ /* [retval][out] */ BOOL *result) { return DOMHTMLElement::isSupported(feature, version, result); }
virtual HRESULT STDMETHODCALLTYPE namespaceURI(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::namespaceURI(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::namespaceURI(result); }
virtual HRESULT STDMETHODCALLTYPE prefix(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::prefix(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::prefix(result); }
virtual HRESULT STDMETHODCALLTYPE setPrefix(
- /* [in] */ BSTR prefix) { return DeprecatedDOMHTMLElement::setPrefix(prefix); }
+ /* [in] */ BSTR prefix) { return DOMHTMLElement::setPrefix(prefix); }
virtual HRESULT STDMETHODCALLTYPE localName(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::localName(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::localName(result); }
virtual HRESULT STDMETHODCALLTYPE hasAttributes(
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMHTMLElement::hasAttributes(result); }
+ /* [retval][out] */ BOOL *result) { return DOMHTMLElement::hasAttributes(result); }
virtual HRESULT STDMETHODCALLTYPE isSameNode(
- /* [in] */ IDeprecatedDOMNode* other,
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMHTMLElement::isSameNode(other, result); }
+ /* [in] */ IDOMNode* other,
+ /* [retval][out] */ BOOL* result) { return DOMHTMLElement::isSameNode(other, result); }
virtual HRESULT STDMETHODCALLTYPE isEqualNode(
- /* [in] */ IDeprecatedDOMNode* other,
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMHTMLElement::isEqualNode(other, result); }
+ /* [in] */ IDOMNode* other,
+ /* [retval][out] */ BOOL* result) { return DOMHTMLElement::isEqualNode(other, result); }
virtual HRESULT STDMETHODCALLTYPE textContent(
- /* [retval][out] */ BSTR* result) { return DeprecatedDOMHTMLElement::textContent(result); }
+ /* [retval][out] */ BSTR* result) { return DOMHTMLElement::textContent(result); }
virtual HRESULT STDMETHODCALLTYPE setTextContent(
- /* [in] */ BSTR text) { return DeprecatedDOMHTMLElement::setTextContent(text); }
+ /* [in] */ BSTR text) { return DOMHTMLElement::setTextContent(text); }
- // IDeprecatedDOMElement
+ // IDOMElement
virtual HRESULT STDMETHODCALLTYPE tagName(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::tagName(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::tagName(result); }
virtual HRESULT STDMETHODCALLTYPE getAttribute(
/* [in] */ BSTR name,
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::getAttribute(name, result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::getAttribute(name, result); }
virtual HRESULT STDMETHODCALLTYPE setAttribute(
/* [in] */ BSTR name,
- /* [in] */ BSTR value) { return DeprecatedDOMHTMLElement::setAttribute(name, value); }
+ /* [in] */ BSTR value) { return DOMHTMLElement::setAttribute(name, value); }
virtual HRESULT STDMETHODCALLTYPE removeAttribute(
- /* [in] */ BSTR name) { return DeprecatedDOMHTMLElement::removeAttribute(name); }
+ /* [in] */ BSTR name) { return DOMHTMLElement::removeAttribute(name); }
virtual HRESULT STDMETHODCALLTYPE getAttributeNode(
/* [in] */ BSTR name,
- /* [retval][out] */ IDeprecatedDOMAttr **result) { return DeprecatedDOMHTMLElement::getAttributeNode(name, result); }
+ /* [retval][out] */ IDOMAttr **result) { return DOMHTMLElement::getAttributeNode(name, result); }
virtual HRESULT STDMETHODCALLTYPE setAttributeNode(
- /* [in] */ IDeprecatedDOMAttr *newAttr,
- /* [retval][out] */ IDeprecatedDOMAttr **result) { return DeprecatedDOMHTMLElement::setAttributeNode(newAttr, result); }
+ /* [in] */ IDOMAttr *newAttr,
+ /* [retval][out] */ IDOMAttr **result) { return DOMHTMLElement::setAttributeNode(newAttr, result); }
virtual HRESULT STDMETHODCALLTYPE removeAttributeNode(
- /* [in] */ IDeprecatedDOMAttr *oldAttr,
- /* [retval][out] */ IDeprecatedDOMAttr **result) { return DeprecatedDOMHTMLElement::removeAttributeNode(oldAttr, result); }
+ /* [in] */ IDOMAttr *oldAttr,
+ /* [retval][out] */ IDOMAttr **result) { return DOMHTMLElement::removeAttributeNode(oldAttr, result); }
virtual HRESULT STDMETHODCALLTYPE getElementsByTagName(
/* [in] */ BSTR name,
- /* [retval][out] */ IDeprecatedDOMNodeList **result) { return DeprecatedDOMHTMLElement::getElementsByTagName(name, result); }
+ /* [retval][out] */ IDOMNodeList **result) { return DOMHTMLElement::getElementsByTagName(name, result); }
virtual HRESULT STDMETHODCALLTYPE getAttributeNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR localName,
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::getAttributeNS(namespaceURI, localName, result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::getAttributeNS(namespaceURI, localName, result); }
virtual HRESULT STDMETHODCALLTYPE setAttributeNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR qualifiedName,
- /* [in] */ BSTR value) { return DeprecatedDOMHTMLElement::setAttributeNS(namespaceURI, qualifiedName, value); }
+ /* [in] */ BSTR value) { return DOMHTMLElement::setAttributeNS(namespaceURI, qualifiedName, value); }
virtual HRESULT STDMETHODCALLTYPE removeAttributeNS(
/* [in] */ BSTR namespaceURI,
- /* [in] */ BSTR localName) { return DeprecatedDOMHTMLElement::removeAttributeNS(namespaceURI, localName); }
+ /* [in] */ BSTR localName) { return DOMHTMLElement::removeAttributeNS(namespaceURI, localName); }
virtual HRESULT STDMETHODCALLTYPE getAttributeNodeNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR localName,
- /* [retval][out] */ IDeprecatedDOMAttr **result) { return DeprecatedDOMHTMLElement::getAttributeNodeNS(namespaceURI, localName, result); }
+ /* [retval][out] */ IDOMAttr **result) { return DOMHTMLElement::getAttributeNodeNS(namespaceURI, localName, result); }
virtual HRESULT STDMETHODCALLTYPE setAttributeNodeNS(
- /* [in] */ IDeprecatedDOMAttr *newAttr,
- /* [retval][out] */ IDeprecatedDOMAttr **result) { return DeprecatedDOMHTMLElement::setAttributeNodeNS(newAttr, result); }
+ /* [in] */ IDOMAttr *newAttr,
+ /* [retval][out] */ IDOMAttr **result) { return DOMHTMLElement::setAttributeNodeNS(newAttr, result); }
virtual HRESULT STDMETHODCALLTYPE getElementsByTagNameNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR localName,
- /* [retval][out] */ IDeprecatedDOMNodeList **result) { return DeprecatedDOMHTMLElement::getElementsByTagNameNS(namespaceURI, localName, result); }
+ /* [retval][out] */ IDOMNodeList **result) { return DOMHTMLElement::getElementsByTagNameNS(namespaceURI, localName, result); }
virtual HRESULT STDMETHODCALLTYPE hasAttribute(
/* [in] */ BSTR name,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMHTMLElement::hasAttribute(name, result); }
+ /* [retval][out] */ BOOL *result) { return DOMHTMLElement::hasAttribute(name, result); }
virtual HRESULT STDMETHODCALLTYPE hasAttributeNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR localName,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMHTMLElement::hasAttributeNS(namespaceURI, localName, result); }
+ /* [retval][out] */ BOOL *result) { return DOMHTMLElement::hasAttributeNS(namespaceURI, localName, result); }
- virtual HRESULT STDMETHODCALLTYPE focus( void) { return DeprecatedDOMHTMLElement::focus(); }
+ virtual HRESULT STDMETHODCALLTYPE focus( void) { return DOMHTMLElement::focus(); }
- virtual HRESULT STDMETHODCALLTYPE blur( void) { return DeprecatedDOMHTMLElement::blur(); }
+ virtual HRESULT STDMETHODCALLTYPE blur( void) { return DOMHTMLElement::blur(); }
- // IDeprecatedDOMHTMLElement
+ // IDOMHTMLElement
virtual HRESULT STDMETHODCALLTYPE idName(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::idName(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::idName(result); }
virtual HRESULT STDMETHODCALLTYPE setIdName(
- /* [in] */ BSTR idName) { return DeprecatedDOMHTMLElement::setIdName(idName); }
+ /* [in] */ BSTR idName) { return DOMHTMLElement::setIdName(idName); }
virtual HRESULT STDMETHODCALLTYPE title(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::title(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::title(result); }
virtual HRESULT STDMETHODCALLTYPE setTitle(
- /* [in] */ BSTR title) { return DeprecatedDOMHTMLElement::setTitle(title); }
+ /* [in] */ BSTR title) { return DOMHTMLElement::setTitle(title); }
virtual HRESULT STDMETHODCALLTYPE lang(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::lang(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::lang(result); }
virtual HRESULT STDMETHODCALLTYPE setLang(
- /* [in] */ BSTR lang) { return DeprecatedDOMHTMLElement::setLang(lang); }
+ /* [in] */ BSTR lang) { return DOMHTMLElement::setLang(lang); }
virtual HRESULT STDMETHODCALLTYPE dir(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::dir(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::dir(result); }
virtual HRESULT STDMETHODCALLTYPE setDir(
- /* [in] */ BSTR dir) { return DeprecatedDOMHTMLElement::setDir(dir); }
+ /* [in] */ BSTR dir) { return DOMHTMLElement::setDir(dir); }
virtual HRESULT STDMETHODCALLTYPE className(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::className(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::className(result); }
virtual HRESULT STDMETHODCALLTYPE setClassName(
- /* [in] */ BSTR className) { return DeprecatedDOMHTMLElement::setClassName(className); }
+ /* [in] */ BSTR className) { return DOMHTMLElement::setClassName(className); }
virtual HRESULT STDMETHODCALLTYPE innerHTML(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::innerHTML(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::innerHTML(result); }
virtual HRESULT STDMETHODCALLTYPE setInnerHTML(
- /* [in] */ BSTR html) { return DeprecatedDOMHTMLElement::setInnerHTML(html); }
+ /* [in] */ BSTR html) { return DOMHTMLElement::setInnerHTML(html); }
virtual HRESULT STDMETHODCALLTYPE innerText(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::innerText(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::innerText(result); }
virtual HRESULT STDMETHODCALLTYPE setInnerText(
- /* [in] */ BSTR text) { return DeprecatedDOMHTMLElement::setInnerText(text); }
+ /* [in] */ BSTR text) { return DOMHTMLElement::setInnerText(text); }
- // IDeprecatedDOMHTMLSelectElement
+ // IDOMHTMLSelectElement
virtual HRESULT STDMETHODCALLTYPE type(
/* [retval][out] */ BSTR *result);
/* [retval][out] */ int *result);
virtual HRESULT STDMETHODCALLTYPE form(
- /* [retval][out] */ IDeprecatedDOMHTMLFormElement **result);
+ /* [retval][out] */ IDOMHTMLFormElement **result);
virtual HRESULT STDMETHODCALLTYPE options(
- /* [retval][out] */ IDeprecatedDOMHTMLOptionsCollection **result);
+ /* [retval][out] */ IDOMHTMLOptionsCollection **result);
virtual HRESULT STDMETHODCALLTYPE disabled(
/* [retval][out] */ BOOL *result);
/* [in] */ int tabIndex);
virtual HRESULT STDMETHODCALLTYPE add(
- /* [in] */ IDeprecatedDOMHTMLElement *element,
- /* [in] */ IDeprecatedDOMHTMLElement *before);
+ /* [in] */ IDOMHTMLElement *element,
+ /* [in] */ IDOMHTMLElement *before);
virtual HRESULT STDMETHODCALLTYPE remove(
/* [in] */ int index);
/* [in] */ int index);
};
-class DeprecatedDOMHTMLOptionElement : public DeprecatedDOMHTMLElement, public IDeprecatedDOMHTMLOptionElement
+class DOMHTMLOptionElement : public DOMHTMLElement, public IDOMHTMLOptionElement
{
protected:
- DeprecatedDOMHTMLOptionElement();
+ DOMHTMLOptionElement();
public:
- DeprecatedDOMHTMLOptionElement(WebCore::Element* e) : DeprecatedDOMHTMLElement(e) {}
+ DOMHTMLOptionElement(WebCore::Element* e) : DOMHTMLElement(e) {}
// IUnknown
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
- virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DeprecatedDOMHTMLElement::AddRef(); }
- virtual ULONG STDMETHODCALLTYPE Release(void) { return DeprecatedDOMHTMLElement::Release(); }
+ virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DOMHTMLElement::AddRef(); }
+ virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMHTMLElement::Release(); }
// IWebScriptObject
virtual HRESULT STDMETHODCALLTYPE throwException(
/* [in] */ BSTR exceptionMessage,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMHTMLElement::throwException(exceptionMessage, result); }
+ /* [retval][out] */ BOOL *result) { return DOMHTMLElement::throwException(exceptionMessage, result); }
virtual HRESULT STDMETHODCALLTYPE callWebScriptMethod(
/* [in] */ BSTR name,
/* [size_is][in] */ const VARIANT args[ ],
/* [in] */ int cArgs,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMHTMLElement::callWebScriptMethod(name, args, cArgs, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMHTMLElement::callWebScriptMethod(name, args, cArgs, result); }
virtual HRESULT STDMETHODCALLTYPE evaluateWebScript(
/* [in] */ BSTR script,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMHTMLElement::evaluateWebScript(script, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMHTMLElement::evaluateWebScript(script, result); }
virtual HRESULT STDMETHODCALLTYPE removeWebScriptKey(
- /* [in] */ BSTR name) { return DeprecatedDOMHTMLElement::removeWebScriptKey(name); }
+ /* [in] */ BSTR name) { return DOMHTMLElement::removeWebScriptKey(name); }
virtual HRESULT STDMETHODCALLTYPE stringRepresentation(
- /* [retval][out] */ BSTR* stringRepresentation) { return DeprecatedDOMHTMLElement::stringRepresentation(stringRepresentation); }
+ /* [retval][out] */ BSTR* stringRepresentation) { return DOMHTMLElement::stringRepresentation(stringRepresentation); }
virtual HRESULT STDMETHODCALLTYPE webScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMHTMLElement::webScriptValueAtIndex(index, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMHTMLElement::webScriptValueAtIndex(index, result); }
virtual HRESULT STDMETHODCALLTYPE setWebScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [in] */ VARIANT val) { return DeprecatedDOMHTMLElement::setWebScriptValueAtIndex(index, val); }
+ /* [in] */ VARIANT val) { return DOMHTMLElement::setWebScriptValueAtIndex(index, val); }
virtual HRESULT STDMETHODCALLTYPE setException(
- /* [in] */ BSTR description) { return DeprecatedDOMHTMLElement::setException(description); }
+ /* [in] */ BSTR description) { return DOMHTMLElement::setException(description); }
- // IDeprecatedDOMNode
+ // IDOMNode
virtual HRESULT STDMETHODCALLTYPE nodeName(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::nodeName(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::nodeName(result); }
virtual HRESULT STDMETHODCALLTYPE nodeValue(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::nodeValue(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::nodeValue(result); }
virtual HRESULT STDMETHODCALLTYPE setNodeValue(
- /* [in] */ BSTR value) { return DeprecatedDOMHTMLElement::setNodeValue(value); }
+ /* [in] */ BSTR value) { return DOMHTMLElement::setNodeValue(value); }
virtual HRESULT STDMETHODCALLTYPE nodeType(
- /* [retval][out] */ unsigned short *result) { return DeprecatedDOMHTMLElement::nodeType(result); }
+ /* [retval][out] */ unsigned short *result) { return DOMHTMLElement::nodeType(result); }
virtual HRESULT STDMETHODCALLTYPE parentNode(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::parentNode(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::parentNode(result); }
virtual HRESULT STDMETHODCALLTYPE childNodes(
- /* [retval][out] */ IDeprecatedDOMNodeList **result) { return DeprecatedDOMHTMLElement::childNodes(result); }
+ /* [retval][out] */ IDOMNodeList **result) { return DOMHTMLElement::childNodes(result); }
virtual HRESULT STDMETHODCALLTYPE firstChild(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::firstChild(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::firstChild(result); }
virtual HRESULT STDMETHODCALLTYPE lastChild(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::lastChild(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::lastChild(result); }
virtual HRESULT STDMETHODCALLTYPE previousSibling(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::previousSibling(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::previousSibling(result); }
virtual HRESULT STDMETHODCALLTYPE nextSibling(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::nextSibling(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::nextSibling(result); }
virtual HRESULT STDMETHODCALLTYPE attributes(
- /* [retval][out] */ IDeprecatedDOMNamedNodeMap **result) { return DeprecatedDOMHTMLElement::attributes(result); }
+ /* [retval][out] */ IDOMNamedNodeMap **result) { return DOMHTMLElement::attributes(result); }
virtual HRESULT STDMETHODCALLTYPE ownerDocument(
- /* [retval][out] */ IDeprecatedDOMDocument **result) { return DeprecatedDOMHTMLElement::ownerDocument(result); }
+ /* [retval][out] */ IDOMDocument **result) { return DOMHTMLElement::ownerDocument(result); }
virtual HRESULT STDMETHODCALLTYPE insertBefore(
- /* [in] */ IDeprecatedDOMNode *newChild,
- /* [in] */ IDeprecatedDOMNode *refChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::insertBefore(newChild, refChild, result); }
+ /* [in] */ IDOMNode *newChild,
+ /* [in] */ IDOMNode *refChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::insertBefore(newChild, refChild, result); }
virtual HRESULT STDMETHODCALLTYPE replaceChild(
- /* [in] */ IDeprecatedDOMNode *newChild,
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::replaceChild(newChild, oldChild, result); }
+ /* [in] */ IDOMNode *newChild,
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::replaceChild(newChild, oldChild, result); }
virtual HRESULT STDMETHODCALLTYPE removeChild(
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::removeChild(oldChild, result); }
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::removeChild(oldChild, result); }
virtual HRESULT STDMETHODCALLTYPE appendChild(
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::appendChild(oldChild, result); }
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::appendChild(oldChild, result); }
virtual HRESULT STDMETHODCALLTYPE hasChildNodes(
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMHTMLElement::hasChildNodes(result); }
+ /* [retval][out] */ BOOL *result) { return DOMHTMLElement::hasChildNodes(result); }
virtual HRESULT STDMETHODCALLTYPE cloneNode(
/* [in] */ BOOL deep,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::cloneNode(deep, result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::cloneNode(deep, result); }
- virtual HRESULT STDMETHODCALLTYPE normalize( void) { return DeprecatedDOMHTMLElement::normalize(); }
+ virtual HRESULT STDMETHODCALLTYPE normalize( void) { return DOMHTMLElement::normalize(); }
virtual HRESULT STDMETHODCALLTYPE isSupported(
/* [in] */ BSTR feature,
/* [in] */ BSTR version,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMHTMLElement::isSupported(feature, version, result); }
+ /* [retval][out] */ BOOL *result) { return DOMHTMLElement::isSupported(feature, version, result); }
virtual HRESULT STDMETHODCALLTYPE namespaceURI(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::namespaceURI(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::namespaceURI(result); }
virtual HRESULT STDMETHODCALLTYPE prefix(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::prefix(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::prefix(result); }
virtual HRESULT STDMETHODCALLTYPE setPrefix(
- /* [in] */ BSTR prefix) { return DeprecatedDOMHTMLElement::setPrefix(prefix); }
+ /* [in] */ BSTR prefix) { return DOMHTMLElement::setPrefix(prefix); }
virtual HRESULT STDMETHODCALLTYPE localName(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::localName(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::localName(result); }
virtual HRESULT STDMETHODCALLTYPE hasAttributes(
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMHTMLElement::hasAttributes(result); }
+ /* [retval][out] */ BOOL *result) { return DOMHTMLElement::hasAttributes(result); }
virtual HRESULT STDMETHODCALLTYPE isSameNode(
- /* [in] */ IDeprecatedDOMNode* other,
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMHTMLElement::isSameNode(other, result); }
+ /* [in] */ IDOMNode* other,
+ /* [retval][out] */ BOOL* result) { return DOMHTMLElement::isSameNode(other, result); }
virtual HRESULT STDMETHODCALLTYPE isEqualNode(
- /* [in] */ IDeprecatedDOMNode* other,
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMHTMLElement::isEqualNode(other, result); }
+ /* [in] */ IDOMNode* other,
+ /* [retval][out] */ BOOL* result) { return DOMHTMLElement::isEqualNode(other, result); }
virtual HRESULT STDMETHODCALLTYPE textContent(
- /* [retval][out] */ BSTR* result) { return DeprecatedDOMHTMLElement::textContent(result); }
+ /* [retval][out] */ BSTR* result) { return DOMHTMLElement::textContent(result); }
virtual HRESULT STDMETHODCALLTYPE setTextContent(
- /* [in] */ BSTR text) { return DeprecatedDOMHTMLElement::setTextContent(text); }
+ /* [in] */ BSTR text) { return DOMHTMLElement::setTextContent(text); }
- // IDeprecatedDOMElement
+ // IDOMElement
virtual HRESULT STDMETHODCALLTYPE tagName(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::tagName(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::tagName(result); }
virtual HRESULT STDMETHODCALLTYPE getAttribute(
/* [in] */ BSTR name,
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::getAttribute(name, result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::getAttribute(name, result); }
virtual HRESULT STDMETHODCALLTYPE setAttribute(
/* [in] */ BSTR name,
- /* [in] */ BSTR value) { return DeprecatedDOMHTMLElement::setAttribute(name, value); }
+ /* [in] */ BSTR value) { return DOMHTMLElement::setAttribute(name, value); }
virtual HRESULT STDMETHODCALLTYPE removeAttribute(
- /* [in] */ BSTR name) { return DeprecatedDOMHTMLElement::removeAttribute(name); }
+ /* [in] */ BSTR name) { return DOMHTMLElement::removeAttribute(name); }
virtual HRESULT STDMETHODCALLTYPE getAttributeNode(
/* [in] */ BSTR name,
- /* [retval][out] */ IDeprecatedDOMAttr **result) { return DeprecatedDOMHTMLElement::getAttributeNode(name, result); }
+ /* [retval][out] */ IDOMAttr **result) { return DOMHTMLElement::getAttributeNode(name, result); }
virtual HRESULT STDMETHODCALLTYPE setAttributeNode(
- /* [in] */ IDeprecatedDOMAttr *newAttr,
- /* [retval][out] */ IDeprecatedDOMAttr **result) { return DeprecatedDOMHTMLElement::setAttributeNode(newAttr, result); }
+ /* [in] */ IDOMAttr *newAttr,
+ /* [retval][out] */ IDOMAttr **result) { return DOMHTMLElement::setAttributeNode(newAttr, result); }
virtual HRESULT STDMETHODCALLTYPE removeAttributeNode(
- /* [in] */ IDeprecatedDOMAttr *oldAttr,
- /* [retval][out] */ IDeprecatedDOMAttr **result) { return DeprecatedDOMHTMLElement::removeAttributeNode(oldAttr, result); }
+ /* [in] */ IDOMAttr *oldAttr,
+ /* [retval][out] */ IDOMAttr **result) { return DOMHTMLElement::removeAttributeNode(oldAttr, result); }
virtual HRESULT STDMETHODCALLTYPE getElementsByTagName(
/* [in] */ BSTR name,
- /* [retval][out] */ IDeprecatedDOMNodeList **result) { return DeprecatedDOMHTMLElement::getElementsByTagName(name, result); }
+ /* [retval][out] */ IDOMNodeList **result) { return DOMHTMLElement::getElementsByTagName(name, result); }
virtual HRESULT STDMETHODCALLTYPE getAttributeNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR localName,
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::getAttributeNS(namespaceURI, localName, result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::getAttributeNS(namespaceURI, localName, result); }
virtual HRESULT STDMETHODCALLTYPE setAttributeNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR qualifiedName,
- /* [in] */ BSTR value) { return DeprecatedDOMHTMLElement::setAttributeNS(namespaceURI, qualifiedName, value); }
+ /* [in] */ BSTR value) { return DOMHTMLElement::setAttributeNS(namespaceURI, qualifiedName, value); }
virtual HRESULT STDMETHODCALLTYPE removeAttributeNS(
/* [in] */ BSTR namespaceURI,
- /* [in] */ BSTR localName) { return DeprecatedDOMHTMLElement::removeAttributeNS(namespaceURI, localName); }
+ /* [in] */ BSTR localName) { return DOMHTMLElement::removeAttributeNS(namespaceURI, localName); }
virtual HRESULT STDMETHODCALLTYPE getAttributeNodeNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR localName,
- /* [retval][out] */ IDeprecatedDOMAttr **result) { return DeprecatedDOMHTMLElement::getAttributeNodeNS(namespaceURI, localName, result); }
+ /* [retval][out] */ IDOMAttr **result) { return DOMHTMLElement::getAttributeNodeNS(namespaceURI, localName, result); }
virtual HRESULT STDMETHODCALLTYPE setAttributeNodeNS(
- /* [in] */ IDeprecatedDOMAttr *newAttr,
- /* [retval][out] */ IDeprecatedDOMAttr **result) { return DeprecatedDOMHTMLElement::setAttributeNodeNS(newAttr, result); }
+ /* [in] */ IDOMAttr *newAttr,
+ /* [retval][out] */ IDOMAttr **result) { return DOMHTMLElement::setAttributeNodeNS(newAttr, result); }
virtual HRESULT STDMETHODCALLTYPE getElementsByTagNameNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR localName,
- /* [retval][out] */ IDeprecatedDOMNodeList **result) { return DeprecatedDOMHTMLElement::getElementsByTagNameNS(namespaceURI, localName, result); }
+ /* [retval][out] */ IDOMNodeList **result) { return DOMHTMLElement::getElementsByTagNameNS(namespaceURI, localName, result); }
virtual HRESULT STDMETHODCALLTYPE hasAttribute(
/* [in] */ BSTR name,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMHTMLElement::hasAttribute(name, result); }
+ /* [retval][out] */ BOOL *result) { return DOMHTMLElement::hasAttribute(name, result); }
virtual HRESULT STDMETHODCALLTYPE hasAttributeNS(
/* [in] */ BSTR namespaceURI,
/* [in] */ BSTR localName,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMHTMLElement::hasAttributeNS(namespaceURI, localName, result); }
+ /* [retval][out] */ BOOL *result) { return DOMHTMLElement::hasAttributeNS(namespaceURI, localName, result); }
- virtual HRESULT STDMETHODCALLTYPE focus( void) { return DeprecatedDOMHTMLElement::focus(); }
+ virtual HRESULT STDMETHODCALLTYPE focus( void) { return DOMHTMLElement::focus(); }
- virtual HRESULT STDMETHODCALLTYPE blur( void) { return DeprecatedDOMHTMLElement::blur(); }
+ virtual HRESULT STDMETHODCALLTYPE blur( void) { return DOMHTMLElement::blur(); }
- // IDeprecatedDOMHTMLElement
+ // IDOMHTMLElement
virtual HRESULT STDMETHODCALLTYPE idName(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::idName(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::idName(result); }
virtual HRESULT STDMETHODCALLTYPE setIdName(
- /* [in] */ BSTR idName) { return DeprecatedDOMHTMLElement::setIdName(idName); }
+ /* [in] */ BSTR idName) { return DOMHTMLElement::setIdName(idName); }
virtual HRESULT STDMETHODCALLTYPE title(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::title(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::title(result); }
virtual HRESULT STDMETHODCALLTYPE setTitle(
- /* [in] */ BSTR title) { return DeprecatedDOMHTMLElement::setTitle(title); }
+ /* [in] */ BSTR title) { return DOMHTMLElement::setTitle(title); }
virtual HRESULT STDMETHODCALLTYPE lang(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::lang(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::lang(result); }
virtual HRESULT STDMETHODCALLTYPE setLang(
- /* [in] */ BSTR lang) { return DeprecatedDOMHTMLElement::setLang(lang); }
+ /* [in] */ BSTR lang) { return DOMHTMLElement::setLang(lang); }
virtual HRESULT STDMETHODCALLTYPE dir(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::dir(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::dir(result); }
virtual HRESULT STDMETHODCALLTYPE setDir(
- /* [in] */ BSTR dir) { return DeprecatedDOMHTMLElement::setDir(dir); }
+ /* [in] */ BSTR dir) { return DOMHTMLElement::setDir(dir); }
virtual HRESULT STDMETHODCALLTYPE className(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::className(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::className(result); }
virtual HRESULT STDMETHODCALLTYPE setClassName(
- /* [in] */ BSTR className) { return DeprecatedDOMHTMLElement::setClassName(className); }
+ /* [in] */ BSTR className) { return DOMHTMLElement::setClassName(className); }
virtual HRESULT STDMETHODCALLTYPE innerHTML(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::innerHTML(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::innerHTML(result); }
virtual HRESULT STDMETHODCALLTYPE setInnerHTML(
- /* [in] */ BSTR html) { return DeprecatedDOMHTMLElement::setInnerHTML(html); }
+ /* [in] */ BSTR html) { return DOMHTMLElement::setInnerHTML(html); }
virtual HRESULT STDMETHODCALLTYPE innerText(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::innerText(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::innerText(result); }
virtual HRESULT STDMETHODCALLTYPE setInnerText(
- /* [in] */ BSTR text) { return DeprecatedDOMHTMLElement::setInnerText(text); }
+ /* [in] */ BSTR text) { return DOMHTMLElement::setInnerText(text); }
- // IDeprecatedDOMHTMLOptionElement
+ // IDOMHTMLOptionElement
virtual HRESULT STDMETHODCALLTYPE form(
- /* [retval][out] */ IDeprecatedDOMHTMLFormElement **result);
+ /* [retval][out] */ IDOMHTMLFormElement **result);
virtual HRESULT STDMETHODCALLTYPE defaultSelected(
/* [retval][out] */ BOOL *result);
/* [in] */ BSTR value);
};
-class DeprecatedDOMHTMLInputElement : public DeprecatedDOMHTMLElement, public IDeprecatedDOMHTMLInputElement, public IFormsAutoFillTransition, public IFormPromptAdditions
+class DOMHTMLInputElement : public DOMHTMLElement, public IDOMHTMLInputElement, public IFormsAutoFillTransition, public IFormPromptAdditions
{
protected:
- DeprecatedDOMHTMLInputElement();
+ DOMHTMLInputElement();
public:
- DeprecatedDOMHTMLInputElement(WebCore::Element* e) : DeprecatedDOMHTMLElement(e) {}
+ DOMHTMLInputElement(WebCore::Element* e) : DOMHTMLElement(e) {}
// IUnknown
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
- virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DeprecatedDOMHTMLElement::AddRef(); }
- virtual ULONG STDMETHODCALLTYPE Release(void) { return DeprecatedDOMHTMLElement::Release(); }
+ virtual ULONG STDMETHODCALLTYPE AddRef(void) { return DOMHTMLElement::AddRef(); }
+ virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMHTMLElement::Release(); }
// IWebScriptObject
virtual HRESULT STDMETHODCALLTYPE throwException(
/* [in] */ BSTR exceptionMessage,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMHTMLElement::throwException(exceptionMessage, result); }
+ /* [retval][out] */ BOOL *result) { return DOMHTMLElement::throwException(exceptionMessage, result); }
virtual HRESULT STDMETHODCALLTYPE callWebScriptMethod(
/* [in] */ BSTR name,
/* [size_is][in] */ const VARIANT args[ ],
/* [in] */ int cArgs,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMHTMLElement::callWebScriptMethod(name, args, cArgs, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMHTMLElement::callWebScriptMethod(name, args, cArgs, result); }
virtual HRESULT STDMETHODCALLTYPE evaluateWebScript(
/* [in] */ BSTR script,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMHTMLElement::evaluateWebScript(script, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMHTMLElement::evaluateWebScript(script, result); }
virtual HRESULT STDMETHODCALLTYPE removeWebScriptKey(
- /* [in] */ BSTR name) { return DeprecatedDOMHTMLElement::removeWebScriptKey(name); }
+ /* [in] */ BSTR name) { return DOMHTMLElement::removeWebScriptKey(name); }
virtual HRESULT STDMETHODCALLTYPE stringRepresentation(
- /* [retval][out] */ BSTR* stringRepresentation) { return DeprecatedDOMHTMLElement::stringRepresentation(stringRepresentation); }
+ /* [retval][out] */ BSTR* stringRepresentation) { return DOMHTMLElement::stringRepresentation(stringRepresentation); }
virtual HRESULT STDMETHODCALLTYPE webScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [retval][out] */ VARIANT *result) { return DeprecatedDOMHTMLElement::webScriptValueAtIndex(index, result); }
+ /* [retval][out] */ VARIANT *result) { return DOMHTMLElement::webScriptValueAtIndex(index, result); }
virtual HRESULT STDMETHODCALLTYPE setWebScriptValueAtIndex(
/* [in] */ unsigned int index,
- /* [in] */ VARIANT val) { return DeprecatedDOMHTMLElement::setWebScriptValueAtIndex(index, val); }
+ /* [in] */ VARIANT val) { return DOMHTMLElement::setWebScriptValueAtIndex(index, val); }
virtual HRESULT STDMETHODCALLTYPE setException(
- /* [in] */ BSTR description) { return DeprecatedDOMHTMLElement::setException(description); }
+ /* [in] */ BSTR description) { return DOMHTMLElement::setException(description); }
- // IDeprecatedDOMNode
+ // IDOMNode
virtual HRESULT STDMETHODCALLTYPE nodeName(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::nodeName(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::nodeName(result); }
virtual HRESULT STDMETHODCALLTYPE nodeValue(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::nodeValue(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::nodeValue(result); }
virtual HRESULT STDMETHODCALLTYPE setNodeValue(
- /* [in] */ BSTR value) { return DeprecatedDOMHTMLElement::setNodeValue(value); }
+ /* [in] */ BSTR value) { return DOMHTMLElement::setNodeValue(value); }
virtual HRESULT STDMETHODCALLTYPE nodeType(
- /* [retval][out] */ unsigned short *result) { return DeprecatedDOMHTMLElement::nodeType(result); }
+ /* [retval][out] */ unsigned short *result) { return DOMHTMLElement::nodeType(result); }
virtual HRESULT STDMETHODCALLTYPE parentNode(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::parentNode(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::parentNode(result); }
virtual HRESULT STDMETHODCALLTYPE childNodes(
- /* [retval][out] */ IDeprecatedDOMNodeList **result) { return DeprecatedDOMHTMLElement::childNodes(result); }
+ /* [retval][out] */ IDOMNodeList **result) { return DOMHTMLElement::childNodes(result); }
virtual HRESULT STDMETHODCALLTYPE firstChild(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::firstChild(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::firstChild(result); }
virtual HRESULT STDMETHODCALLTYPE lastChild(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::lastChild(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::lastChild(result); }
virtual HRESULT STDMETHODCALLTYPE previousSibling(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::previousSibling(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::previousSibling(result); }
virtual HRESULT STDMETHODCALLTYPE nextSibling(
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::nextSibling(result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::nextSibling(result); }
virtual HRESULT STDMETHODCALLTYPE attributes(
- /* [retval][out] */ IDeprecatedDOMNamedNodeMap **result) { return DeprecatedDOMHTMLElement::attributes(result); }
+ /* [retval][out] */ IDOMNamedNodeMap **result) { return DOMHTMLElement::attributes(result); }
virtual HRESULT STDMETHODCALLTYPE ownerDocument(
- /* [retval][out] */ IDeprecatedDOMDocument **result) { return DeprecatedDOMHTMLElement::ownerDocument(result); }
+ /* [retval][out] */ IDOMDocument **result) { return DOMHTMLElement::ownerDocument(result); }
virtual HRESULT STDMETHODCALLTYPE insertBefore(
- /* [in] */ IDeprecatedDOMNode *newChild,
- /* [in] */ IDeprecatedDOMNode *refChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::insertBefore(newChild, refChild, result); }
+ /* [in] */ IDOMNode *newChild,
+ /* [in] */ IDOMNode *refChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::insertBefore(newChild, refChild, result); }
virtual HRESULT STDMETHODCALLTYPE replaceChild(
- /* [in] */ IDeprecatedDOMNode *newChild,
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::replaceChild(newChild, oldChild, result); }
+ /* [in] */ IDOMNode *newChild,
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::replaceChild(newChild, oldChild, result); }
virtual HRESULT STDMETHODCALLTYPE removeChild(
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::removeChild(oldChild, result); }
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::removeChild(oldChild, result); }
virtual HRESULT STDMETHODCALLTYPE appendChild(
- /* [in] */ IDeprecatedDOMNode *oldChild,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::appendChild(oldChild, result); }
+ /* [in] */ IDOMNode *oldChild,
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::appendChild(oldChild, result); }
virtual HRESULT STDMETHODCALLTYPE hasChildNodes(
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMHTMLElement::hasChildNodes(result); }
+ /* [retval][out] */ BOOL *result) { return DOMHTMLElement::hasChildNodes(result); }
virtual HRESULT STDMETHODCALLTYPE cloneNode(
/* [in] */ BOOL deep,
- /* [retval][out] */ IDeprecatedDOMNode **result) { return DeprecatedDOMHTMLElement::cloneNode(deep, result); }
+ /* [retval][out] */ IDOMNode **result) { return DOMHTMLElement::cloneNode(deep, result); }
- virtual HRESULT STDMETHODCALLTYPE normalize( void) { return DeprecatedDOMHTMLElement::normalize(); }
+ virtual HRESULT STDMETHODCALLTYPE normalize( void) { return DOMHTMLElement::normalize(); }
virtual HRESULT STDMETHODCALLTYPE isSupported(
/* [in] */ BSTR feature,
/* [in] */ BSTR version,
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMHTMLElement::isSupported(feature, version, result); }
+ /* [retval][out] */ BOOL *result) { return DOMHTMLElement::isSupported(feature, version, result); }
virtual HRESULT STDMETHODCALLTYPE namespaceURI(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::namespaceURI(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::namespaceURI(result); }
virtual HRESULT STDMETHODCALLTYPE prefix(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::prefix(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::prefix(result); }
virtual HRESULT STDMETHODCALLTYPE setPrefix(
- /* [in] */ BSTR prefix) { return DeprecatedDOMHTMLElement::setPrefix(prefix); }
+ /* [in] */ BSTR prefix) { return DOMHTMLElement::setPrefix(prefix); }
virtual HRESULT STDMETHODCALLTYPE localName(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::localName(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::localName(result); }
virtual HRESULT STDMETHODCALLTYPE hasAttributes(
- /* [retval][out] */ BOOL *result) { return DeprecatedDOMHTMLElement::hasAttributes(result); }
+ /* [retval][out] */ BOOL *result) { return DOMHTMLElement::hasAttributes(result); }
virtual HRESULT STDMETHODCALLTYPE isSameNode(
- /* [in] */ IDeprecatedDOMNode* other,
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMHTMLElement::isSameNode(other, result); }
+ /* [in] */ IDOMNode* other,
+ /* [retval][out] */ BOOL* result) { return DOMHTMLElement::isSameNode(other, result); }
virtual HRESULT STDMETHODCALLTYPE isEqualNode(
- /* [in] */ IDeprecatedDOMNode* other,
- /* [retval][out] */ BOOL* result) { return DeprecatedDOMHTMLElement::isEqualNode(other, result); }
+ /* [in] */ IDOMNode* other,
+ /* [retval][out] */ BOOL* result) { return DOMHTMLElement::isEqualNode(other, result); }
virtual HRESULT STDMETHODCALLTYPE textContent(
- /* [retval][out] */ BSTR* result) { return DeprecatedDOMHTMLElement::textContent(result); }
+ /* [retval][out] */ BSTR* result) { return DOMHTMLElement::textContent(result); }
virtual HRESULT STDMETHODCALLTYPE setTextContent(
- /* [in] */ BSTR text) { return DeprecatedDOMHTMLElement::setTextContent(text); }
+ /* [in] */ BSTR text) { return DOMHTMLElement::setTextContent(text); }
- // IDeprecatedDOMElement
+ // IDOMElement
virtual HRESULT STDMETHODCALLTYPE tagName(
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::tagName(result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::tagName(result); }
virtual HRESULT STDMETHODCALLTYPE getAttribute(
/* [in] */ BSTR name,
- /* [retval][out] */ BSTR *result) { return DeprecatedDOMHTMLElement::getAttribute(name, result); }
+ /* [retval][out] */ BSTR *result) { return DOMHTMLElement::getAttribute(name, result); }
virtual HRESULT STDMETHODCALLTYPE setAttribute(
/* [in] */ BSTR name,
- /* [in] */ BSTR value) { return DeprecatedDOMHTMLElement::setAttribute(name, value); }
+ /* [in] */ BSTR value) { return DOMHTMLElement::setAttribute(name, value); }
virtual HRESULT STDMETHODCALLTYPE removeAttribute(
- /* [in] */ BSTR name) { return DeprecatedDOMHTMLElement::removeAttribute(name); }
+ /* [in] */ BSTR name) { return DOMHTMLElement::removeAttribute(name); }
virtual HRESULT STDMETHODCALLTYPE getAttributeNode(
/* [in] */ BSTR name,
- /* [retval][out] */ IDeprecatedDOMAttr **result) { return DeprecatedDOMHTMLElement::getAttributeNode(name, result); }
+ /* [retval][out] */ IDOMAttr **result) { return DOMHTMLElement::getAttributeNode(name, result); }
virtual HRESULT STDMETHODCALLTYPE setAttributeNode(
- /* [in] */ IDeprecatedDOMAttr *newAttr,
- /* [retval][out] */ IDeprecatedDOMAttr **result) { return DeprecatedDOMHTMLElement::setAttributeNode(newAttr, result); }
+ /* [in] */ IDOMAttr *newAttr,
+ /* [retval][out] */ IDOMAttr **result) { return DOMHTMLElement::setAttributeNode(newAttr, result); }
virtual HRESULT STDMETHODCALLTYPE removeAttributeNode(
- /* [in] */ IDeprecatedDOMAttr *oldAttr,
- /* [retval][out] */ IDeprecatedDOMAttr **result) { return DeprecatedDOMHTMLElement::removeAttributeNode(oldAttr, result); }
+ /* [in] */ IDOMAttr *oldAttr,
+ /* [retval][out] */ IDOMAttr **result) { return DOMHTMLElement::removeAttributeNode(oldAttr, result); }
virtual HRESULT STDMETHODCALLTYPE getElementsByTagName(
/* [in] */ BSTR name,
- /* [retval][out] */ IDeprecatedDOMNodeList **result) { return DeprecatedDOMHTMLElement::getElementsByTagName(name, result); }
+ /* [retval][out] */ IDOMNodeList
git://git.webkit.org / WebKit-https.git / commitdiff