Commit ed1a4087 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

mshtml: Add IHTMLCSSStyleDeclaration2::transition property implementation.

parent 4b29a69b
...@@ -802,6 +802,10 @@ static const style_tbl_entry_t style_tbl[] = { ...@@ -802,6 +802,10 @@ static const style_tbl_entry_t style_tbl[] = {
DISPID_IHTMLCSSSTYLEDECLARATION2_TRANSFORM DISPID_IHTMLCSSSTYLEDECLARATION2_TRANSFORM
}, },
{ {
L"transition",
DISPID_IHTMLCSSSTYLEDECLARATION2_TRANSITION
},
{
vertical_alignW, vertical_alignW,
DISPID_IHTMLCSSSTYLEDECLARATION_VERTICALALIGN, DISPID_IHTMLCSSSTYLEDECLARATION_VERTICALALIGN,
DISPID_A_VERTICALALIGN, DISPID_A_VERTICALALIGN,
...@@ -9725,15 +9729,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_transitionDelay(IHTMLCSSStyle ...@@ -9725,15 +9729,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_transitionDelay(IHTMLCSSStyle
static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_transition(IHTMLCSSStyleDeclaration2 *iface, BSTR v) static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_transition(IHTMLCSSStyleDeclaration2 *iface, BSTR v)
{ {
CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface);
FIXME("(%p)->(%s)\n", This, debugstr_w(v)); TRACE("(%p)->(%s)\n", This, debugstr_w(v));
return E_NOTIMPL; return set_style_property(This, STYLEID_TRANSITION, v);
} }
static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_transition(IHTMLCSSStyleDeclaration2 *iface, BSTR *p) static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_transition(IHTMLCSSStyleDeclaration2 *iface, BSTR *p)
{ {
CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface);
FIXME("(%p)->(%p)\n", This, p); TRACE("(%p)->(%p)\n", This, p);
return E_NOTIMPL; return get_style_property(This, STYLEID_TRANSITION, p);
} }
static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_fontFeatureSettings(IHTMLCSSStyleDeclaration2 *iface, BSTR v) static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_fontFeatureSettings(IHTMLCSSStyleDeclaration2 *iface, BSTR v)
......
...@@ -128,6 +128,7 @@ typedef enum { ...@@ -128,6 +128,7 @@ typedef enum {
STYLEID_TEXT_TRANSFORM, STYLEID_TEXT_TRANSFORM,
STYLEID_TOP, STYLEID_TOP,
STYLEID_TRANSFORM, STYLEID_TRANSFORM,
STYLEID_TRANSITION,
STYLEID_VERTICAL_ALIGN, STYLEID_VERTICAL_ALIGN,
STYLEID_VISIBILITY, STYLEID_VISIBILITY,
STYLEID_WHITE_SPACE, STYLEID_WHITE_SPACE,
......
...@@ -872,6 +872,23 @@ static void test_css_style_declaration2(IHTMLCSSStyleDeclaration2 *css_style) ...@@ -872,6 +872,23 @@ static void test_css_style_declaration2(IHTMLCSSStyleDeclaration2 *css_style)
ok(hres == S_OK, "get_animationName failed: %08x\n", hres); ok(hres == S_OK, "get_animationName failed: %08x\n", hres);
ok(!lstrcmpW(str, L"none"), "animationName = %s\n", wine_dbgstr_w(str)); ok(!lstrcmpW(str, L"none"), "animationName = %s\n", wine_dbgstr_w(str));
SysFreeString(str); SysFreeString(str);
str = NULL;
hres = IHTMLCSSStyleDeclaration2_get_transition(css_style, &str);
ok(hres == S_OK, "get_transition failed: %08x\n", hres);
ok(!str, "transition = %s\n", wine_dbgstr_w(str));
SysFreeString(str);
str = SysAllocString(L"marigin-right 1s ease-out");
hres = IHTMLCSSStyleDeclaration2_put_transition(css_style, str);
ok(hres == S_OK, "put_transition failed: %08x\n", hres);
SysFreeString(str);
str = NULL;
hres = IHTMLCSSStyleDeclaration2_get_transition(css_style, &str);
ok(hres == S_OK, "get_transition failed: %08x\n", hres);
ok(!wcsncmp(str, L"marigin-right 1s", wcslen(L"marigin-right 1s")), "transition = %s\n", wine_dbgstr_w(str));
SysFreeString(str);
} }
static void test_body_style(IHTMLStyle *style) static void test_body_style(IHTMLStyle *style)
......
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