diff --git a/mozilla/webshell/embed/ActiveX/IEHtmlDocument.cpp b/mozilla/webshell/embed/ActiveX/IEHtmlDocument.cpp
index adb6723f163..b1b62e48104 100644
--- a/mozilla/webshell/embed/ActiveX/IEHtmlDocument.cpp
+++ b/mozilla/webshell/embed/ActiveX/IEHtmlDocument.cpp
@@ -20,6 +20,7 @@
 #include "IEHtmlElementCollection.h"
 #include "MozillaBrowser.h"
 
+#include <stack>
 
 CIEHtmlDocument::CIEHtmlDocument()
 {
@@ -31,11 +32,13 @@ CIEHtmlDocument::~CIEHtmlDocument()
 {
 }
 
+
 void CIEHtmlDocument::SetParent(CMozillaBrowser *parent)
 {
 	m_pParent = parent;
 }
 
+
 HRESULT CIEHtmlDocument::GetIDispatch(IDispatch **pDispatch)
 {
 	if (pDispatch == NULL)
@@ -57,6 +60,19 @@ HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_Script(IDispatch __RPC_FAR *__RPC
 ///////////////////////////////////////////////////////////////////////////////
 // IHTMLDocument2 methods
 
+struct HtmlPos
+{
+	CIPtr(IHTMLElementCollection) m_cpCollection;
+	long m_nPos;
+
+	HtmlPos(IHTMLElementCollection *pCol, long nPos) :
+		m_cpCollection(pCol),
+		m_nPos(nPos)
+	{
+	}
+};
+
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_all(IHTMLElementCollection __RPC_FAR *__RPC_FAR *p)
 {
 	// Validate parameters
@@ -67,408 +83,484 @@ HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_all(IHTMLElementCollection __RPC_
 
 	*p = NULL;
 
-	// TODO get all elements
+	std::vector< CIPtr(IDispatch) > cNodeList;
+
+	// Get all elements
 	CIEHtmlElementCollectionInstance *pCollection = NULL;
-	CIEHtmlElementCollection::CreateFromParentNode(this, (CIEHtmlElementCollection **) &pCollection);
+	CIEHtmlElementCollection::CreateFromParentNode(this, (CIEHtmlElementCollection **) &pCollection, TRUE);
 	if (pCollection)
 	{
 		pCollection->AddRef();
-		*p = pCollection;
 	}
 
+	*p = pCollection;
+
 	return S_OK;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_body(IHTMLElement __RPC_FAR *__RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_activeElement(IHTMLElement __RPC_FAR *__RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_images(IHTMLElementCollection __RPC_FAR *__RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_applets(IHTMLElementCollection __RPC_FAR *__RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_links(IHTMLElementCollection __RPC_FAR *__RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_forms(IHTMLElementCollection __RPC_FAR *__RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_anchors(IHTMLElementCollection __RPC_FAR *__RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_title(BSTR v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_title(BSTR __RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_scripts(IHTMLElementCollection __RPC_FAR *__RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_designMode(BSTR v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_designMode(BSTR __RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_selection(IHTMLSelectionObject __RPC_FAR *__RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_readyState(BSTR __RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_frames(IHTMLFramesCollection2 __RPC_FAR *__RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_embeds(IHTMLElementCollection __RPC_FAR *__RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_plugins(IHTMLElementCollection __RPC_FAR *__RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_alinkColor(VARIANT v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_alinkColor(VARIANT __RPC_FAR *p)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_bgColor(VARIANT v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_bgColor(VARIANT __RPC_FAR *p)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_fgColor(VARIANT v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_fgColor(VARIANT __RPC_FAR *p)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_linkColor(VARIANT v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_linkColor(VARIANT __RPC_FAR *p)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_vlinkColor(VARIANT v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_vlinkColor(VARIANT __RPC_FAR *p)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_referrer(BSTR __RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_location(IHTMLLocation __RPC_FAR *__RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_lastModified(BSTR __RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_URL(BSTR v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_URL(BSTR __RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_domain(BSTR v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_domain(BSTR __RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_cookie(BSTR v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_cookie(BSTR __RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_expando(VARIANT_BOOL v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_expando(VARIANT_BOOL __RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_charset(BSTR v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_charset(BSTR __RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_defaultCharset(BSTR v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_defaultCharset(BSTR __RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_mimeType(BSTR __RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_fileSize(BSTR __RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_fileCreatedDate(BSTR __RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_fileModifiedDate(BSTR __RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_fileUpdatedDate(BSTR __RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_security(BSTR __RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_protocol(BSTR __RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_nameProp(BSTR __RPC_FAR *p)
 {
 	*p = NULL;
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::write(SAFEARRAY __RPC_FAR * psarray)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::writeln(SAFEARRAY __RPC_FAR * psarray)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::open(BSTR url, VARIANT name, VARIANT features, VARIANT replace, IDispatch __RPC_FAR *__RPC_FAR *pomWindowResult)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::close(void)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::clear(void)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::queryCommandSupported(BSTR cmdID, VARIANT_BOOL __RPC_FAR *pfRet)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::queryCommandEnabled(BSTR cmdID, VARIANT_BOOL __RPC_FAR *pfRet)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::queryCommandState(BSTR cmdID, VARIANT_BOOL __RPC_FAR *pfRet)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::queryCommandIndeterm(BSTR cmdID, VARIANT_BOOL __RPC_FAR *pfRet)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::queryCommandText(BSTR cmdID, BSTR __RPC_FAR *pcmdText)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::queryCommandValue(BSTR cmdID, VARIANT __RPC_FAR *pcmdValue)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::execCommand(BSTR cmdID, VARIANT_BOOL showUI, VARIANT value, VARIANT_BOOL __RPC_FAR *pfRet)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::execCommandShowHelp(BSTR cmdID, VARIANT_BOOL __RPC_FAR *pfRet)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::createElement(BSTR eTag, IHTMLElement __RPC_FAR *__RPC_FAR *newElem)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_onhelp(VARIANT v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_onhelp(VARIANT __RPC_FAR *p)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_onclick(VARIANT v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_onclick(VARIANT __RPC_FAR *p)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_ondblclick(VARIANT v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_ondblclick(VARIANT __RPC_FAR *p)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_onkeyup(VARIANT v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_onkeyup(VARIANT __RPC_FAR *p)
 {
 	return E_NOTIMPL;
+
 }
 
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_onkeydown(VARIANT v)
@@ -476,171 +568,205 @@ HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_onkeydown(VARIANT v)
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_onkeydown(VARIANT __RPC_FAR *p)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_onkeypress(VARIANT v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_onkeypress(VARIANT __RPC_FAR *p)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_onmouseup(VARIANT v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_onmouseup(VARIANT __RPC_FAR *p)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_onmousedown(VARIANT v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_onmousedown(VARIANT __RPC_FAR *p)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_onmousemove(VARIANT v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_onmousemove(VARIANT __RPC_FAR *p)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_onmouseout(VARIANT v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_onmouseout(VARIANT __RPC_FAR *p)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_onmouseover(VARIANT v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_onmouseover(VARIANT __RPC_FAR *p)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_onreadystatechange(VARIANT v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_onreadystatechange(VARIANT __RPC_FAR *p)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_onafterupdate(VARIANT v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_onafterupdate(VARIANT __RPC_FAR *p)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_onrowexit(VARIANT v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_onrowexit(VARIANT __RPC_FAR *p)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_onrowenter(VARIANT v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_onrowenter(VARIANT __RPC_FAR *p)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_ondragstart(VARIANT v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_ondragstart(VARIANT __RPC_FAR *p)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_onselectstart(VARIANT v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_onselectstart(VARIANT __RPC_FAR *p)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::elementFromPoint(long x, long y, IHTMLElement __RPC_FAR *__RPC_FAR *elementHit)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_parentWindow(IHTMLWindow2 __RPC_FAR *__RPC_FAR *p)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_styleSheets(IHTMLStyleSheetsCollection __RPC_FAR *__RPC_FAR *p)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_onbeforeupdate(VARIANT v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_onbeforeupdate(VARIANT __RPC_FAR *p)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::put_onerrorupdate(VARIANT v)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::get_onerrorupdate(VARIANT __RPC_FAR *p)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::toString(BSTR __RPC_FAR *String)
 {
 	return E_NOTIMPL;
 }
 
+
 HRESULT STDMETHODCALLTYPE CIEHtmlDocument::createStyleSheet(BSTR bstrHref, long lIndex, IHTMLStyleSheet __RPC_FAR *__RPC_FAR *ppnewStyleSheet)
 {
 	return E_NOTIMPL;
diff --git a/mozilla/webshell/embed/ActiveX/IEHtmlElement.cpp b/mozilla/webshell/embed/ActiveX/IEHtmlElement.cpp
index acba7815bfa..8ec6be0287d 100644
--- a/mozilla/webshell/embed/ActiveX/IEHtmlElement.cpp
+++ b/mozilla/webshell/embed/ActiveX/IEHtmlElement.cpp
@@ -40,6 +40,30 @@ HRESULT CIEHtmlElement::GetIDispatch(IDispatch **pDispatch)
 	return QueryInterface(IID_IDispatch, (void **) pDispatch);
 }
 
+
+HRESULT CIEHtmlElement::GetChildren(CIEHtmlElementCollectionInstance **ppCollection)
+{
+	// Validate parameters
+	if (ppCollection == NULL)
+	{
+		return E_INVALIDARG;
+	}
+
+	*ppCollection = NULL;
+
+	// Create a collection representing the children of this node
+	CIEHtmlElementCollectionInstance *pCollection = NULL;
+	CIEHtmlElementCollection::CreateFromParentNode(this, (CIEHtmlElementCollection **) &pCollection);
+	if (pCollection)
+	{
+		pCollection->AddRef();
+		*ppCollection = pCollection;
+	}
+
+	return S_OK;
+}
+
+
 ///////////////////////////////////////////////////////////////////////////////
 // IHTMLElement implementation
 
@@ -626,14 +650,13 @@ HRESULT STDMETHODCALLTYPE CIEHtmlElement::get_children(IDispatch __RPC_FAR *__RP
 
 	// Create a collection representing the children of this node
 	CIEHtmlElementCollectionInstance *pCollection = NULL;
-	CIEHtmlElementCollection::CreateFromParentNode(this, (CIEHtmlElementCollection **) &pCollection);
-	if (pCollection)
+	HRESULT hr = GetChildren(&pCollection);
+	if (SUCCEEDED(hr))
 	{
-		pCollection->AddRef();
 		*p = pCollection;
 	}
 
-	return S_OK;
+	return hr;
 }
 
 HRESULT STDMETHODCALLTYPE CIEHtmlElement::get_all(IDispatch __RPC_FAR *__RPC_FAR *p)
diff --git a/mozilla/webshell/embed/ActiveX/IEHtmlElement.h b/mozilla/webshell/embed/ActiveX/IEHtmlElement.h
index c93d1350956..42d0eea98f7 100644
--- a/mozilla/webshell/embed/ActiveX/IEHtmlElement.h
+++ b/mozilla/webshell/embed/ActiveX/IEHtmlElement.h
@@ -19,6 +19,7 @@
 #define IEHTMLELEMENT_H
 
 #include "IEHtmlNode.h"
+#include "IEHtmlElementCollection.h"
 
 class CIEHtmlElement :	public CIEHtmlNode,
 						public IDispatchImpl<IHTMLElement, &IID_IHTMLElement, &LIBID_MSHTML>
@@ -36,6 +37,7 @@ BEGIN_COM_MAP(CIEHtmlElement)
 END_COM_MAP()
 
 	virtual HRESULT GetIDispatch(IDispatch **pDispatch);
+	virtual HRESULT GetChildren(CIEHtmlElementCollectionInstance **ppCollection);
 
 	// Implementation of IHTMLElement
 	virtual HRESULT STDMETHODCALLTYPE setAttribute(BSTR strAttributeName, VARIANT AttributeValue, LONG lFlags);
diff --git a/mozilla/webshell/embed/ActiveX/IEHtmlElementCollection.cpp b/mozilla/webshell/embed/ActiveX/IEHtmlElementCollection.cpp
index 834f327c9e3..5abd5fe8e58 100644
--- a/mozilla/webshell/embed/ActiveX/IEHtmlElementCollection.cpp
+++ b/mozilla/webshell/embed/ActiveX/IEHtmlElementCollection.cpp
@@ -16,6 +16,9 @@
  * Reserved.
  */
 #include "stdafx.h"
+
+#include <stack>
+
 #include "IEHtmlElement.h"
 #include "IEHtmlElementCollection.h"
 
@@ -34,7 +37,25 @@ HRESULT CIEHtmlElementCollection::SetParentNode(IDispatch *pIDispParent)
 	return S_OK;
 }
 
-HRESULT CIEHtmlElementCollection::CreateFromParentNode(CIEHtmlNode *pParentNode, CIEHtmlElementCollection **pInstance)
+
+struct NodeListPos
+{
+	nsIDOMNodeList *m_pIDOMNodeList;
+	PRUint32 m_nListPos;
+
+	NodeListPos(nsIDOMNodeList *pIDOMNodeList, PRUint32 nListPos) :
+		m_pIDOMNodeList(pIDOMNodeList),
+		m_nListPos(nListPos)
+	{
+	}
+
+	NodeListPos()
+	{
+	};
+};
+
+
+HRESULT CIEHtmlElementCollection::CreateFromParentNode(CIEHtmlNode *pParentNode, CIEHtmlElementCollection **pInstance, BOOL bRecurseChildren)
 {
 	if (pInstance == NULL)
 	{
@@ -63,13 +84,25 @@ HRESULT CIEHtmlElementCollection::CreateFromParentNode(CIEHtmlNode *pParentNode,
 	pCollection->SetParentNode(cpDispNode);
 
 	// Get elements
+
+	std::stack< NodeListPos > cNodeStack;
+
 	nsIDOMNodeList *pIDOMNodeList = nsnull;
 	pIDOMNode->GetChildNodes(&pIDOMNodeList);
+
 	if (pIDOMNodeList)
 	{
+		cNodeStack.push(NodeListPos(pIDOMNodeList, 0));
+	}
+	while (!cNodeStack.empty())
+	{
+		NodeListPos pos = cNodeStack.top();
+		cNodeStack.pop();
+
+		nsIDOMNodeList *pIDOMNodeList = pos.m_pIDOMNodeList;
 		PRUint32 aLength = 0;
 		pIDOMNodeList->GetLength(&aLength);
-		for (PRUint32 i = 0; i < aLength; i++)
+		for (PRUint32 i = pos.m_nListPos; i < aLength; i++)
 		{
 			nsIDOMNode *pChildNode = nsnull;
 			pIDOMNodeList->Item(i, &pChildNode);
@@ -86,6 +119,12 @@ HRESULT CIEHtmlElementCollection::CreateFromParentNode(CIEHtmlNode *pParentNode,
 				pElement->SetDOMNode(pChildNode);
 				pElement->SetParentNode(pCollection->m_pIDispParent);
 				pCollection->AddNode(pElement);
+
+				if (bRecurseChildren)
+				{
+					// TODO recurse through
+					CIPtr(IHTMLElementCollection) cpCollection;
+				}
 			}
 			pChildNode->Release();
 		}
diff --git a/mozilla/webshell/embed/ActiveX/IEHtmlElementCollection.h b/mozilla/webshell/embed/ActiveX/IEHtmlElementCollection.h
index e1205b81e43..236b1ee6739 100644
--- a/mozilla/webshell/embed/ActiveX/IEHtmlElementCollection.h
+++ b/mozilla/webshell/embed/ActiveX/IEHtmlElementCollection.h
@@ -22,13 +22,20 @@
 
 class CIEHtmlElement;
 
+
+
 class CIEHtmlElementCollection : public CComObjectRootEx<CComSingleThreadModel>,
 							  public IDispatchImpl<IHTMLElementCollection, &IID_IHTMLElementCollection, &LIBID_MSHTML>
 {
-	std::vector< CComQIPtr<IDispatch, &IID_IDispatch> > m_cNodeList;
+public:
+	typedef std::vector< CIPtr(IDispatch) > ElementList;
+
+private:
+	ElementList m_cNodeList;
 
 public:
 	CIEHtmlElementCollection();
+
 protected:
 	virtual ~CIEHtmlElementCollection();
 
@@ -43,7 +50,13 @@ public:
 	virtual HRESULT SetParentNode(IDispatch *pIDispParent);
 
 	// Helper method creates a collection from a parent node
-	static HRESULT CreateFromParentNode(CIEHtmlNode *pParentNode, CIEHtmlElementCollection **pInstance);
+	static HRESULT CreateFromParentNode(CIEHtmlNode *pParentNode, CIEHtmlElementCollection **pInstance, BOOL bRecurseChildren = FALSE);
+
+
+	ElementList &GetElements()
+	{
+		return m_cNodeList;
+	}
 
 BEGIN_COM_MAP(CIEHtmlElementCollection)
 	COM_INTERFACE_ENTRY_IID(IID_IDispatch, IHTMLElementCollection)