GitLab

at 2024-07-23T21:29:24+02:00

mshtml: Implement event.cancelBubble.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>

mshtml: Implement HTMLEventObj's cancelBubble on top of the underlying event's cancelBubble.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>

mshtml: Fix special case between stopImmediatePropagation and setting cancelBubble to false.

This implements same buggy style as native, where cancelBubble = false
does not affect the immediate propagation flag, while it does affect normal
propagation flag.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>

mshtml: Use bitfields for the event BOOL fields.

Since there's a lot of them.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>

mshtml: Don't use -moz prefix for box-sizing CSS property.

It was already pretty much broken because the table must be sorted, and
'-' comes first, and IE uses unprefixed version anyway.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>

mshtml/tests: Add more tests with invalid CSS props for (get|set)PropertyValue.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>

mshtml: Compactify the style_props expose tests for each style object into a single function.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>

mshtml: Implement style msTransition.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>

mshtml: Implement style msTransform.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>

     TRACE("(%p)->(%x)\n", This, v);

     if(This->event)

-        IDOMEvent_stopPropagation(&This->event->IDOMEvent_iface);

+        IDOMEvent_put_cancelBubble(&This->event->IDOMEvent_iface, v);

     return S_OK;

 }

     TRACE("(%p)->(%p)\n", This, p);

-    *p = variant_bool(This->event && This->event->stop_propagation);

-    return S_OK;

+    return IDOMEvent_get_cancelBubble(&This->event->IDOMEvent_iface, p);

 }

 static HRESULT WINAPI HTMLEventObj_get_fromElement(IHTMLEventObj *iface, IHTMLElement **p)

     TRACE("(%p)\n", This);

     This->stop_propagation = TRUE;

-    nsIDOMEvent_StopPropagation(This->nsevent);

     return S_OK;

 }

 static HRESULT WINAPI DOMEvent_put_cancelBubble(IDOMEvent *iface, VARIANT_BOOL v)

 {

     DOMEvent *This = impl_from_IDOMEvent(iface);

-    FIXME("(%p)->(%x)\n", This, v);

-    return E_NOTIMPL;

+

+    TRACE("(%p)->(%x)\n", This, v);

+

+    if(This->phase < 2)

+        return S_OK;

+

+    /* stop_immediate_propagation is not able to be interrupted, but native has a weird behavior. */

+    This->stop_propagation = (v != VARIANT_FALSE);

+    return S_OK;

 }

 static HRESULT WINAPI DOMEvent_get_cancelBubble(IDOMEvent *iface, VARIANT_BOOL *p)

 {

     DOMEvent *This = impl_from_IDOMEvent(iface);

-    FIXME("(%p)->(%p)\n", This, p);

-    return E_NOTIMPL;

+

+    TRACE("(%p)->(%p)\n", This, p);

+

+    *p = variant_bool(This->stop_propagation);

+    return S_OK;

 }

 static HRESULT WINAPI DOMEvent_get_srcElement(IDOMEvent *iface, IHTMLElement **p)

         }

     }

-    for(listener = listeners; !event->stop_immediate_propagation

-            && listener < listeners + listeners_cnt; listener++) {

+    for(listener = listeners; listener < listeners + listeners_cnt; listener++) {

         if(listener->type != LISTENER_TYPE_ATTACHED) {

             DISPID named_arg = DISPID_THIS;

             VARIANTARG args[2];

                 WARN("%p %s attached <<< %08lx\n", event_target, debugstr_w(event->type), hres);

             }

         }

+

+        if(event->stop_immediate_propagation)

+            break;

     }

     for(listener = listeners; listener < listeners + listeners_cnt; listener++)

             call_event_handlers(target_chain[i], event, dispatch_mode);

     }

+    if(event->stop_propagation)

+        nsIDOMEvent_StopPropagation(event->nsevent);

+

     if(r)

         *r = variant_bool(!event->prevent_default);

     EventTarget *target;

     EventTarget *current_target;

     ULONGLONG time_stamp;

-    BOOL bubbles;

-    BOOL cancelable;

-    BOOL prevent_default;

-    BOOL stop_propagation;

-    BOOL stop_immediate_propagation;

-    BOOL trusted;

+    unsigned bubbles : 1;

+    unsigned cancelable : 1;

+    unsigned prevent_default : 1;

+    unsigned stop_propagation : 1;

+    unsigned stop_immediate_propagation : 1;

+    unsigned trusted : 1;

+    unsigned no_event_obj : 1;

     DOM_EVENT_PHASE phase;

     IHTMLEventObj *event_obj;

-    BOOL no_event_obj;

 } DOMEvent;

 const WCHAR *get_event_name(eventid_t);

 } style_tbl_entry_t;

 static const style_tbl_entry_t style_tbl[] = {

+    {

+        L"-ms-transform",

+        DISPID_IHTMLCSSSTYLEDECLARATION_MSTRANSFORM,

+        DISPID_UNKNOWN

+    },

+    {

+        L"-ms-transition",

+        DISPID_IHTMLCSSSTYLEDECLARATION2_MSTRANSITION,

+        DISPID_UNKNOWN,

+        ATTR_COMPAT_IE10

+    },

     {

         L"animation",

         DISPID_IHTMLCSSSTYLEDECLARATION2_ANIMATION,

         ATTR_FIX_PX

     },

     {

-        L"-moz-box-sizing",

+        L"box-sizing",

         DISPID_IHTMLCSSSTYLEDECLARATION_BOXSIZING,

         DISPID_A_BOXSIZING

     },

 C_ASSERT(ARRAY_SIZE(style_tbl) == STYLEID_MAX_VALUE);

+static const WCHAR *get_style_nsname(const style_tbl_entry_t *style_entry)

+{

+    if(style_entry->name[0] == '-')

+        return style_entry->name + sizeof("-ms-")-1;

+    return style_entry->name;

+}

+

+static const WCHAR *get_style_prop_nsname(const style_tbl_entry_t *style_entry, const WCHAR *orig_name)

+{

+    return style_entry ? get_style_nsname(style_entry) : orig_name;

+}

+

 static const style_tbl_entry_t *lookup_style_tbl(CSSStyle *style, const WCHAR *name)

 {

     int c, i, min = 0, max = ARRAY_SIZE(style_tbl)-1;

     nsAString str_name, str_empty;

     nsresult nsres;

-    nsAString_InitDepend(&str_name, style_tbl[sid].name);

+    nsAString_InitDepend(&str_name, get_style_nsname(&style_tbl[sid]));

     nsAString_InitDepend(&str_empty, L"");

     nsres = nsIDOMCSSStyleDeclaration_SetProperty(nsstyle, &str_name, value, &str_empty);

     nsAString_Finish(&str_name);

     nsAString str_name;

     nsresult nsres;

-    nsAString_InitDepend(&str_name, style_tbl[sid].name);

+    nsAString_InitDepend(&str_name, get_style_nsname(&style_tbl[sid]));

     nsres = nsIDOMCSSStyleDeclaration_GetPropertyValue(nsstyle, &str_name, value);

     nsAString_Finish(&str_name);

     if(NS_FAILED(nsres))

         return S_OK;

     }

-    nsAString_InitDepend(&name_str, style_entry->name);

+    nsAString_InitDepend(&name_str, get_style_nsname(style_entry));

     nsAString_Init(&ret_str, NULL);

     nsres = nsIDOMCSSStyleDeclaration_RemoveProperty(This->css_style.nsstyle, &name_str, &ret_str);

     if(NS_SUCCEEDED(nsres)) {

     TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), value);

     style_entry = lookup_style_tbl(This, name);

-    nsAString_InitDepend(&name_str, style_entry ? style_entry->name : name);

+    nsAString_InitDepend(&name_str, get_style_prop_nsname(style_entry, name));

     nsAString_InitDepend(&value_str, NULL);

     nsres = nsIDOMCSSStyleDeclaration_GetPropertyValue(This->nsstyle, &name_str, &value_str);

     nsAString_Finish(&name_str);

     TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrPropertyName), pbstrPropertyValue);

     style_entry = lookup_style_tbl(This, bstrPropertyName);

-    nsAString_InitDepend(&name_str, style_entry ? style_entry->name : bstrPropertyName);

+    nsAString_InitDepend(&name_str, get_style_prop_nsname(style_entry, bstrPropertyName));

     nsAString_Init(&ret_str, NULL);

     nsres = nsIDOMCSSStyleDeclaration_RemoveProperty(This->nsstyle, &name_str, &ret_str);

     nsAString_Finish(&name_str);

         nsAString_InitDepend(&priority_str, NULL);

     }

-    nsAString_InitDepend(&name_str, style_entry ? style_entry->name : name);

+    nsAString_InitDepend(&name_str, get_style_prop_nsname(style_entry, name));

     nsres = nsIDOMCSSStyleDeclaration_SetProperty(This->nsstyle, &name_str, &value_str, &priority_str);

     nsAString_Finish(&name_str);

     nsAString_Finish(&value_str);

 static HRESULT WINAPI HTMLCSSStyleDeclaration_put_msTransform(IHTMLCSSStyleDeclaration *iface, BSTR v)

 {

     CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface);

-    FIXME("(%p)->(%s)\n", This, debugstr_w(v));

-    return E_NOTIMPL;

+

+    TRACE("(%p)->(%s)\n", This, debugstr_w(v));

+

+    return set_style_property(This, STYLEID_MSTRANSFORM, v);

 }

 static HRESULT WINAPI HTMLCSSStyleDeclaration_get_msTransform(IHTMLCSSStyleDeclaration *iface, BSTR *p)

 {

     CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface);

-    FIXME("(%p)->(%p)\n", This, p);

-    return E_NOTIMPL;

+

+    TRACE("(%p)->(%p)\n", This, p);

+

+    return get_style_property(This, STYLEID_MSTRANSFORM, p);

 }

 static HRESULT WINAPI HTMLCSSStyleDeclaration_put_msTransformOrigin(IHTMLCSSStyleDeclaration *iface, BSTR v)

 static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_msTransition(IHTMLCSSStyleDeclaration2 *iface, BSTR v)

 {

     CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface);

-    FIXME("(%p)->(%s)\n", This, debugstr_w(v));

-    return E_NOTIMPL;

+

+    TRACE("(%p)->(%s)\n", This, debugstr_w(v));

+

+    return set_style_property(This, STYLEID_MSTRANSITION, v);

 }

 static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_msTransition(IHTMLCSSStyleDeclaration2 *iface, BSTR *p)

 {

     CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface);

-    FIXME("(%p)->(%p)\n", This, p);

-    return E_NOTIMPL;

+

+    TRACE("(%p)->(%p)\n", This, p);

+

+    return get_style_property(This, STYLEID_MSTRANSITION, p);

 }

 static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_msTouchAction(IHTMLCSSStyleDeclaration2 *iface, BSTR v)

 /* NOTE: Make sure to keep in sync with style_tbl in htmlstyle.c */

 typedef enum {

+    STYLEID_MSTRANSFORM,

+    STYLEID_MSTRANSITION,

     STYLEID_ANIMATION,

     STYLEID_ANIMATION_NAME,

     STYLEID_BACKGROUND,

 });

 sync_test("style_props", function() {

-    var style = document.body.style;

+    var style = document.body.style, currentStyle = document.body.currentStyle, computedStyle = window.getComputedStyle ? window.getComputedStyle(document.body) : undefined;

-    function test_exposed(prop, expect) {

-        if(expect)

+    function test_exposed(prop, expect_style, expect_currentStyle, expect_computedStyle) {

+        if(expect_style)

             ok(prop in style, prop + " not found in style object.");

         else

             ok(!(prop in style), prop + " found in style object.");

+        if(expect_currentStyle)

+            ok(prop in currentStyle, prop + " not found in currentStyle object.");

+        else

+            ok(!(prop in currentStyle), prop + " found in currentStyle object.");

+        if(computedStyle) {

+            if(expect_computedStyle)

+                ok(prop in computedStyle, prop + " not found in computedStyle object.");

+            else

+                ok(!(prop in computedStyle), prop + " found in computedStyle object.");

+        }

     }

     var v = document.documentMode;

-    test_exposed("removeAttribute", true);

-    test_exposed("zIndex", true);

-    test_exposed("z-index", true);

-    test_exposed("filter", true);

-    test_exposed("pixelTop", true);

-    test_exposed("float", true);

-    test_exposed("css-float", false);

-    test_exposed("style-float", false);

-    test_exposed("setProperty", v >= 9);

-    test_exposed("removeProperty", v >= 9);

-    test_exposed("background-clip", v >= 9);

-    test_exposed("msTransform", v >= 9);

-    test_exposed("transform", v >= 10);

-

-    style = document.body.currentStyle;

-

-    test_exposed("zIndex", true);

-    test_exposed("z-index", true);

-    test_exposed("filter", true);

-    test_exposed("pixelTop", false);

-    test_exposed("float", true);

-    test_exposed("css-float", false);

-    test_exposed("style-float", false);

-    test_exposed("setProperty", v >= 9);

-    test_exposed("removeProperty", v >= 9);

-    test_exposed("background-clip", v >= 9);

-    test_exposed("transform", v >= 10);

-

-    if(window.getComputedStyle) {

-        style = window.getComputedStyle(document.body);

-

-        test_exposed("removeAttribute", false);

-        test_exposed("zIndex", true);

-        test_exposed("z-index", true);

-        test_exposed("pixelTop", false);

-        test_exposed("float", true);

-        test_exposed("css-float", false);

-        test_exposed("style-float", false);

-        test_exposed("setProperty", v >= 9);

-        test_exposed("removeProperty", v >= 9);

-        test_exposed("background-clip", v >= 9);

-        test_exposed("transform", v >= 10);

-    }

+    test_exposed("removeAttribute", true, broken(true) ? v >= 9 : false /* todo_wine */, false);

+    test_exposed("zIndex", true, true, true);

+    test_exposed("z-index", true, true, true);

+    test_exposed("filter", true, true, broken(true) ? v >= 10 : v >= 9 /* todo_wine */);

+    test_exposed("pixelTop", true, false, false);

+    test_exposed("float", true, true, true);

+    test_exposed("css-float", false, false, false);

+    test_exposed("style-float", false, false, false);

+    test_exposed("setProperty", v >= 9, v >= 9, v >= 9);

+    test_exposed("removeProperty", v >= 9, v >= 9, v >= 9);

+    test_exposed("background-clip", v >= 9, v >= 9, v >= 9);

+    test_exposed("msTransform", v >= 9, v >= 9, v >= 9);

+    test_exposed("msTransition", v >= 10, v >= 10, v >= 10);

+    test_exposed("transform", v >= 10, v >= 10, v >= 10);

+    test_exposed("transition", v >= 10, v >= 10, v >= 10);

 });

 sync_test("createElement_inline_attr", function() {

     ok(val === "", "removeProperty() returned " + val);

     ok(style.testVal === "test", "testVal = " + style.testVal);

+    val = style.getPropertyValue("testVal");

+    ok(val === "", 'style.getPropertyValue("testVal") = ' + val);

+    ok(style.testVal === "test", "testVal = " + style.testVal);

+

+    style.setProperty("testVal", "1px");

+    val = style.getPropertyValue("testVal");

+    ok(val === "", 'style.getPropertyValue("testVal") = ' + val);

+    ok(style.testVal === "test", "testVal = " + style.testVal);

+

+    style.setProperty("test", "1px");

+    val = style.getPropertyValue("test");

+    ok(val === "", 'style.getPropertyValue("test") = ' + val);

+    ok(!("test" in style), "test in style");

+

     style["z-index"] = 1;

     ok(style.zIndex === 1, "zIndex = " + style.zIndex);

     ok(style["z-index"] === 1, "z-index = " + style["z-index"]);

     ok(computed_style.zIndex === 4, "computed_style.zIndex = " + computed_style.zIndex);

     window.getComputedStyle(elem, null);

+

+    /* ms* prefixed styles alias */

+    var list = [

+        [ "transform", "translate(5px, 5px)" ],

+        [ "transition", "background-color 0.5s linear 0.1s" ]

+    ];

+    for(var i = 0; i < list.length; i++) {

+        var s = list[i][0], v = list[i][1], ms = "ms" + s[0].toUpperCase() + s.substring(1);

+        style[s] = v;

+        ok(style[s] === v, "style." + s + " = " + style[s] + ", expected " + v);

+        ok(style[ms] === v, "style." + ms + " = " + style[ms] + ", expected " + v);

+        elem.style[ms] = v;

+        ok(elem.style[s] === v, "elem.style." + s + " = " + elem.style[s] + ", expected " + v);

+        ok(elem.style[ms] === v, "elem.style." + ms + " = " + elem.style[ms] + ", expected " + v);

+    }

 });

 sync_test("stylesheets", function() {

     function stop_propagation(e) {

         calls += "stop,";

+        ok(e.cancelBubble === (e.cancelBubble_winetest ? true : false), "cancelBubble before stopPropagation = " + e.cancelBubble);

         e.stopPropagation();

+        e.cancelBubble_winetest = true;

+        ok(e.cancelBubble === true, "cancelBubble after stopPropagation = " + e.cancelBubble);

         ok(e.bubbles === true, "bubbles = " + e.bubbles);

         ok(e.defaultPrevented === false, "defaultPrevented = " + e.defaultPrevented);

     }

     function stop_immediate_propagation(e) {

         calls += "immediateStop,";

+        ok(e.cancelBubble === (e.cancelBubble_winetest ? true : false), "cancelBubble before stopImmediatePropagation = " + e.cancelBubble);

         e.stopImmediatePropagation();

+        e.cancelBubble_winetest = true;

+        ok(e.cancelBubble === true, "cancelBubble after stopImmediatePropagation = " + e.cancelBubble);

         ok(e.bubbles === true, "bubbles = " + e.bubbles);

         ok(e.cancelable === true, "cancelable = " + e.cancelable);

         ok(e.defaultPrevented === false, "defaultPrevented = " + e.defaultPrevented);

     }

-    div1.addEventListener("click", stop_immediate_propagation, true);

+    function stop_immediate_propagation_cancel_bubble_false(e) {

+        calls += "immediateStop and cancelBubble(false),";

+        ok(e.cancelBubble === (e.cancelBubble_winetest ? true : false), "cancelBubble before stopImmediatePropagation = " + e.cancelBubble);

+        e.stopImmediatePropagation();

+        e.cancelBubble = false;

+        e.cancelBubble_winetest = e.eventPhase < 2 ? true : false;

+        ok(e.cancelBubble === (e.cancelBubble_winetest ? true : false), "cancelBubble after stopImmediatePropagation and setting cancelBubble to false = " + e.cancelBubble);

+        ok(e.bubbles === true, "bubbles = " + e.bubbles);

+        ok(e.cancelable === true, "cancelable = " + e.cancelable);

+        ok(e.defaultPrevented === false, "defaultPrevented = " + e.defaultPrevented);

+    }

+

+    function cancel_bubble_impl(i) {

+        return function(e) {

+            calls += "cancelBubble["+i+"],";

+            ok(e.cancelBubble === (e.cancelBubble_winetest ? true : false), "cancelBubble before setting cancelBubble = " + e.cancelBubble);

+            e.cancelBubble = true;

+            if(e.eventPhase < 2)

+                ok(e.cancelBubble === (e.cancelBubble_winetest ? true : false), "cancelBubble after setting cancelBubble during capture phase = " + e.cancelBubble);

+            else

+                ok(e.cancelBubble === true, "cancelBubble after setting cancelBubble during bubble phase = " + e.cancelBubble);

+            e.cancelBubble_winetest = e.cancelBubble;

+            ok(e.bubbles === true, "bubbles = " + e.bubbles);

+            ok(e.cancelable === true, "cancelable = " + e.cancelable);

+            ok(e.defaultPrevented === false, "defaultPrevented = " + e.defaultPrevented);

+        }

+    }

+

+    var cancel_bubble = [];

+    for(var i = 0; i < 4; i++)

+        cancel_bubble.push(cancel_bubble_impl(i));

+

+    function cancel_bubble_false(e) {

+        calls += "cancelBubble(false),";

+        ok(e.cancelBubble === (e.cancelBubble_winetest ? true : false), "cancelBubble before setting cancelBubble to false = " + e.cancelBubble);

+        e.cancelBubble = false;

+        if(e.cancelBubble_winetest && e.eventPhase !== 1)

+            delete e.cancelBubble_winetest;

+        ok(e.cancelBubble === (e.cancelBubble_winetest ? true : false), "cancelBubble after setting cancelBubble to false = " + e.cancelBubble);

+        ok(e.bubbles === true, "bubbles = " + e.bubbles);

+        ok(e.cancelable === true, "cancelable = " + e.cancelable);

+        ok(e.defaultPrevented === false, "defaultPrevented = " + e.defaultPrevented);

+    }

+

+    div1.addEventListener("click", stop_immediate_propagation_cancel_bubble_false, true);

     div1.addEventListener("click", stop_propagation, true);

+    div1.addEventListener("click", cancel_bubble[0], true);

+    div1.addEventListener("click", cancel_bubble_false, true);

     div1.addEventListener("click", record_call("div1.click(capture)"), true);

     div2.addEventListener("click", stop_immediate_propagation, true);

+    div2.addEventListener("click", cancel_bubble[1], true);

     div2.addEventListener("click", stop_propagation, true);

     div2.addEventListener("click", record_call("div2.click(capture)"), true);

+    div1.addEventListener("click", cancel_bubble[2], false);

+    div1.addEventListener("click", cancel_bubble_false, false);

     div1.addEventListener("click", stop_propagation, false);

     div1.addEventListener("click", record_call("div1.click(bubble)"), false);

+    div2.addEventListener("click", stop_immediate_propagation_cancel_bubble_false, false);

     div2.addEventListener("click", stop_propagation, false);

+    div2.addEventListener("click", cancel_bubble[3], false);

+    div2.addEventListener("click", cancel_bubble_false, false);

     div2.addEventListener("click", record_call("div2.click(bubble)"), false);

     calls = "";

     div2.click();

-    ok(calls === "immediateStop,", "calls = " + calls);

+    ok(calls === "immediateStop and cancelBubble(false),", "calls = " + calls);

-    div1.removeEventListener("click", stop_immediate_propagation, true);

+    div1.removeEventListener("click", stop_immediate_propagation_cancel_bubble_false, true);

     calls = "";

     div2.click();

-    ok(calls === "stop,div1.click(capture),", "calls = " + calls);

+    ok(calls === "stop,cancelBubble[0],cancelBubble(false),div1.click(capture),", "calls = " + calls);

     div1.removeEventListener("click", stop_propagation, true);

     calls = "";

     div2.click();

-    ok(calls === "div1.click(capture),immediateStop,", "calls = " + calls);

+    ok(calls === "cancelBubble[0],cancelBubble(false),div1.click(capture),immediateStop,", "calls = " + calls);

+

+    div1.removeEventListener("click", cancel_bubble[0], true);

+    calls = "";

+    div2.click();

+    ok(calls === "cancelBubble(false),div1.click(capture),immediateStop,", "calls = " + calls);

     div2.removeEventListener("click", stop_immediate_propagation, true);

     calls = "";

     div2.click();

-    ok(calls === "div1.click(capture),stop,div2.click(capture),stop,div2.click(bubble),",

+    ok(calls === "cancelBubble(false),div1.click(capture),cancelBubble[1],stop,div2.click(capture),immediateStop and cancelBubble(false),cancelBubble[2],",  // weird native behavior

+       "calls = " + calls);

+

+    div2.removeEventListener("click", stop_immediate_propagation_cancel_bubble_false, false);

+    calls = "";

+    div2.click();

+    ok(calls === "cancelBubble(false),div1.click(capture),cancelBubble[1],stop,div2.click(capture),stop,cancelBubble[3],cancelBubble(false),div2.click(bubble),cancelBubble[2],cancelBubble(false),stop,div1.click(bubble),",

+       "calls = " + calls);

+

+    div2.removeEventListener("click", cancel_bubble_false, false);

+    calls = "";

+    div2.click();

+    ok(calls === "cancelBubble(false),div1.click(capture),cancelBubble[1],stop,div2.click(capture),stop,cancelBubble[3],div2.click(bubble),",

+       "calls = " + calls);

+

+    div2.removeEventListener("click", cancel_bubble[1], true);

+    calls = "";

+    div2.click();

+    ok(calls === "cancelBubble(false),div1.click(capture),stop,div2.click(capture),stop,cancelBubble[3],div2.click(bubble),",

        "calls = " + calls);

     div2.removeEventListener("click", stop_propagation, true);

     calls = "";

     div2.click();

-    ok(calls === "div1.click(capture),div2.click(capture),stop,div2.click(bubble),",

+    ok(calls === "cancelBubble(false),div1.click(capture),div2.click(capture),stop,cancelBubble[3],div2.click(bubble),",

        "calls = " + calls);

     div2.removeEventListener("click", stop_propagation, false);

     calls = "";

     div2.click();

-    ok(calls === "div1.click(capture),div2.click(capture),div2.click(bubble),stop,div1.click(bubble),",

+    ok(calls === "cancelBubble(false),div1.click(capture),div2.click(capture),cancelBubble[3],div2.click(bubble),",

+       "calls = " + calls);

+

+    div2.removeEventListener("click", cancel_bubble[3], false);

+    calls = "";

+    div2.click();

+    ok(calls === "cancelBubble(false),div1.click(capture),div2.click(capture),div2.click(bubble),cancelBubble[2],cancelBubble(false),stop,div1.click(bubble),",

        "calls = " + calls);

 });

Alexandre Julliard pushed to branch master at wine / wine

Commits:

7 changed files:

Changes: