Commit 46de3fcf authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

mshtml: Add IHTMLRectCollection implementation.

parent 454a5323
...@@ -650,8 +650,15 @@ static HRESULT WINAPI HTMLRectCollection_Invoke(IHTMLRectCollection *iface, DISP ...@@ -650,8 +650,15 @@ static HRESULT WINAPI HTMLRectCollection_Invoke(IHTMLRectCollection *iface, DISP
static HRESULT WINAPI HTMLRectCollection_get_length(IHTMLRectCollection *iface, LONG *p) static HRESULT WINAPI HTMLRectCollection_get_length(IHTMLRectCollection *iface, LONG *p)
{ {
HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface);
FIXME("(%p)->(%p)\n", This, p); UINT32 length;
return E_NOTIMPL; nsresult nsres;
TRACE("(%p)->(%p)\n", This, p);
nsres = nsIDOMClientRectList_GetLength(This->rect_list, &length);
assert(nsres == NS_OK);
*p = length;
return S_OK;
} }
static HRESULT WINAPI HTMLRectCollection_get__newEnum(IHTMLRectCollection *iface, IUnknown **p) static HRESULT WINAPI HTMLRectCollection_get__newEnum(IHTMLRectCollection *iface, IUnknown **p)
...@@ -681,12 +688,82 @@ static const IHTMLRectCollectionVtbl HTMLRectCollectionVtbl = { ...@@ -681,12 +688,82 @@ static const IHTMLRectCollectionVtbl HTMLRectCollectionVtbl = {
HTMLRectCollection_item HTMLRectCollection_item
}; };
static inline HTMLRectCollection *HTMLRectCollection_from_DispatchEx(DispatchEx *iface)
{
return CONTAINING_RECORD(iface, HTMLRectCollection, dispex);
}
static HRESULT HTMLRectCollection_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid)
{
HTMLRectCollection *This = HTMLRectCollection_from_DispatchEx(dispex);
UINT32 len = 0;
DWORD idx = 0;
WCHAR *ptr;
for(ptr = name; *ptr && isdigitW(*ptr); ptr++)
idx = idx*10 + (*ptr-'0');
if(*ptr)
return DISP_E_UNKNOWNNAME;
nsIDOMClientRectList_GetLength(This->rect_list, &len);
if(idx >= len)
return DISP_E_UNKNOWNNAME;
*dispid = MSHTML_DISPID_CUSTOM_MIN + idx;
TRACE("ret %x\n", *dispid);
return S_OK;
}
static HRESULT HTMLRectCollection_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params,
VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller)
{
HTMLRectCollection *This = HTMLRectCollection_from_DispatchEx(dispex);
TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, flags, params, res, ei, caller);
switch(flags) {
case DISPATCH_PROPERTYGET: {
nsIDOMClientRect *rect;
IHTMLRect *html_rect;
nsresult nsres;
HRESULT hres;
nsres = nsIDOMClientRectList_Item(This->rect_list, id - MSHTML_DISPID_CUSTOM_MIN, &rect);
if(NS_FAILED(nsres) || !rect) {
WARN("Unknown item\n");
return DISP_E_UNKNOWNNAME;
}
hres = create_html_rect(rect, &html_rect);
nsIDOMClientRect_Release(rect);
if(FAILED(hres))
return hres;
V_VT(res) = VT_DISPATCH;
V_DISPATCH(res) = (IDispatch*)html_rect;
break;
}
default:
FIXME("unimplemented flags %x\n", flags);
return E_NOTIMPL;
}
return S_OK;
}
static const dispex_static_data_vtbl_t HTMLRectCollection_dispex_vtbl = {
NULL,
HTMLRectCollection_get_dispid,
HTMLRectCollection_invoke,
NULL
};
static const tid_t HTMLRectCollection_iface_tids[] = { static const tid_t HTMLRectCollection_iface_tids[] = {
IHTMLRectCollection_tid, IHTMLRectCollection_tid,
0 0
}; };
static dispex_static_data_t HTMLRectCollection_dispex = { static dispex_static_data_t HTMLRectCollection_dispex = {
NULL, &HTMLRectCollection_dispex_vtbl,
IHTMLRectCollection_tid, IHTMLRectCollection_tid,
HTMLRectCollection_iface_tids HTMLRectCollection_iface_tids
}; };
......
...@@ -211,6 +211,23 @@ function test_compare_position() { ...@@ -211,6 +211,23 @@ function test_compare_position() {
next_test(); next_test();
} }
function test_rects() {
document.body.innerHTML = '<div>test</div>';
var elem = document.body.firstChild;
var rects = elem.getClientRects();
var rect = elem.getBoundingClientRect();
ok(rects.length === 1, "rect.length = " + rects.length);
ok(rects[0].top === rect.top, "rects[0].top = " + rects[0].top + " rect.top = " + rect.top);
ok(rects[0].bottom === rect.bottom, "rects[0].bottom = " + rects[0].bottom + " rect.bottom = " + rect.bottom);
elem = document.createElement("style");
rects = elem.getClientRects();
ok(rects.length === 0, "rect.length = " + rects.length);
next_test();
}
function test_document_owner() { function test_document_owner() {
var node; var node;
...@@ -339,6 +356,7 @@ var tests = [ ...@@ -339,6 +356,7 @@ var tests = [
test_anchor, test_anchor,
test_query_selector, test_query_selector,
test_compare_position, test_compare_position,
test_rects,
test_document_owner, test_document_owner,
test_style_properties, test_style_properties,
test_storage test_storage
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment