122500 2013-10-08 02:00:59 -0700 Simplify the loop in EventRetargeter::calculateEventPath 2013-10-08 12:43:05 -0700 1 1 1 Unclassified WebKit UI Events 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 122494 1 rniwa rniwa benjamin commit-queue esprehn+autocc kangil.han kling koivisto sam oldest_to_newest 937469 0 rniwa 2013-10-08 02:00:59 -0700 The loop in EventRetargeter::calculateEventPath is better expressed as two nested loops along the line of: for (Node* node = nodeOrHostIfPseudoElement(targetNode); node; node = toShadowRoot(node)->hostElement()) { if (!target || !isSVGElement) target = &eventTargetRespectingTargetRules(*node); for (; node; node = node->parentNode()) { ... if (!inDocument) return; if (node->isShadowRoot()) break; } if (!shouldEventCrossShadowBoundary(event, toShadowRoot(node), targetStack.last())) return; } This codifies the semantics much more clearly. 937620 1 213706 rniwa 2013-10-08 12:39:09 -0700 Created attachment 213706 Cleanup 937623 2 rniwa 2013-10-08 12:43:05 -0700 Committed r157127: <http://trac.webkit.org/changeset/157127> 213706 2013-10-08 12:39:09 -0700 2013-10-08 12:42:14 -0700 Cleanup bug-122500-20131008123908.patch text/plain 3030 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NzEyNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEzLTEwLTA4ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFNpbXBsaWZ5IHRoZSBsb29wIGlu IEV2ZW50UmV0YXJnZXRlcjo6Y2FsY3VsYXRlRXZlbnRQYXRoCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjI1MDAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXBsYWNlZCB0aGUgY29udm9sdXRlZCBsb29w IGJ5IHR3byBuZXN0ZWQgbG9vcHMgdG8gbWFrZSBzZW1hbnRpY3MgY2xlYXIuCisKKyAgICAgICAg KiBkb20vRXZlbnRSZXRhcmdldGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50UmV0YXJn ZXRlcjo6Y2FsY3VsYXRlRXZlbnRQYXRoKToKKwogMjAxMy0xMC0wOCAgQ2hhbmdTZW9rIE9oICA8 Y2hhbmdzZW9rLm9oQGNvbGxhYm9yYS5jb20+CiAKICAgICAgICAgW0dUS10gTGVhazogR2RrRXZl bnQgcmV0dXJlZCBieSBndGtfZ2V0X2N1cnJlbnRfZXZlbnQgaXMgbm90IGZyZWVkLgpJbmRleDog U291cmNlL1dlYkNvcmUvZG9tL0V2ZW50UmV0YXJnZXRlci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvZG9tL0V2ZW50UmV0YXJnZXRlci5jcHAJKHJldmlzaW9uIDE1NzEyNCkKKysr IFNvdXJjZS9XZWJDb3JlL2RvbS9FdmVudFJldGFyZ2V0ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC04MywyNyArODMsMjggQEAgdm9pZCBFdmVudFJldGFyZ2V0ZXI6OmNhbGN1bGF0ZUV2ZW50UGF0 aAogI2VuZGlmCiAgICAgRXZlbnRUYXJnZXQqIHRhcmdldCA9IDA7CiAKLSAgICBmb3IgKE5vZGUq IG5vZGUgPSBub2RlT3JIb3N0SWZQc2V1ZG9FbGVtZW50KCZ0YXJnZXROb2RlKTsgbm9kZTsgbm9k ZSA9IG5vZGUtPnBhcmVudE9yU2hhZG93SG9zdE5vZGUoKSkgewotICAgICAgICBpZiAoIXRhcmdl dCkKKyAgICBOb2RlKiBub2RlID0gbm9kZU9ySG9zdElmUHNldWRvRWxlbWVudCgmdGFyZ2V0Tm9k ZSk7CisgICAgd2hpbGUgKG5vZGUpIHsKKyAgICAgICAgaWYgKCF0YXJnZXQgfHwgIWlzU1ZHRWxl bWVudCkgLy8gRklYTUU6IFRoaXMgY29kZSBkb2Vzbid0IG1ha2Ugc2Vuc2Ugb25jZSB3ZSd2ZSBj bGltYmVkIG91dCBvZiB0aGUgU1ZHIHN1YnRyZWUgaW4gYSBIVE1MIGRvY3VtZW50LgogICAgICAg ICAgICAgdGFyZ2V0ID0gJmV2ZW50VGFyZ2V0UmVzcGVjdGluZ1RhcmdldFJ1bGVzKCpub2RlKTsK LQotICAgICAgICBFdmVudFRhcmdldCYgY3VycmVudFRhcmdldCA9IGV2ZW50VGFyZ2V0UmVzcGVj dGluZ1RhcmdldFJ1bGVzKCpub2RlKTsKLSAgICAgICAgaWYgKGlzTW91c2VPckZvY3VzRXZlbnQp Ci0gICAgICAgICAgICBldmVudFBhdGguYXBwZW5kKGFkb3B0UHRyKG5ldyBNb3VzZU9yRm9jdXNF dmVudENvbnRleHQobm9kZSwgJmN1cnJlbnRUYXJnZXQsIHRhcmdldCkpKTsKKyAgICAgICAgZm9y ICg7IG5vZGU7IG5vZGUgPSBub2RlLT5wYXJlbnROb2RlKCkpIHsKKyAgICAgICAgICAgIEV2ZW50 VGFyZ2V0JiBjdXJyZW50VGFyZ2V0ID0gZXZlbnRUYXJnZXRSZXNwZWN0aW5nVGFyZ2V0UnVsZXMo Km5vZGUpOworICAgICAgICAgICAgaWYgKGlzTW91c2VPckZvY3VzRXZlbnQpCisgICAgICAgICAg ICAgICAgZXZlbnRQYXRoLmFwcGVuZChhZG9wdFB0cihuZXcgTW91c2VPckZvY3VzRXZlbnRDb250 ZXh0KG5vZGUsICZjdXJyZW50VGFyZ2V0LCB0YXJnZXQpKSk7CiAjaWYgRU5BQkxFKFRPVUNIX0VW RU5UUykKLSAgICAgICAgZWxzZSBpZiAoaXNUb3VjaEV2ZW50KQotICAgICAgICAgICAgZXZlbnRQ YXRoLmFwcGVuZChhZG9wdFB0cihuZXcgVG91Y2hFdmVudENvbnRleHQobm9kZSwgJmN1cnJlbnRU YXJnZXQsIHRhcmdldCkpKTsKKyAgICAgICAgICAgIGVsc2UgaWYgKGlzVG91Y2hFdmVudCkKKyAg ICAgICAgICAgICAgICBldmVudFBhdGguYXBwZW5kKGFkb3B0UHRyKG5ldyBUb3VjaEV2ZW50Q29u dGV4dChub2RlLCAmY3VycmVudFRhcmdldCwgdGFyZ2V0KSkpOwogI2VuZGlmCi0gICAgICAgIGVs c2UKLSAgICAgICAgICAgIGV2ZW50UGF0aC5hcHBlbmQoYWRvcHRQdHIobmV3IEV2ZW50Q29udGV4 dChub2RlLCAmY3VycmVudFRhcmdldCwgdGFyZ2V0KSkpOwotICAgICAgICBpZiAoIWluRG9jdW1l bnQpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIGlmICghbm9kZS0+aXNTaGFkb3dSb290 KCkpCi0gICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgaWYgKCFzaG91bGRFdmVudENyb3Nz U2hhZG93Qm91bmRhcnkoZXZlbnQsICp0b1NoYWRvd1Jvb3Qobm9kZSksICp0YXJnZXQpKQorICAg ICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIGV2ZW50UGF0aC5hcHBlbmQoYWRvcHRQdHIo bmV3IEV2ZW50Q29udGV4dChub2RlLCAmY3VycmVudFRhcmdldCwgdGFyZ2V0KSkpOworICAgICAg ICAgICAgaWYgKCFpbkRvY3VtZW50KQorICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAg ICAgIGlmIChub2RlLT5pc1NoYWRvd1Jvb3QoKSkKKyAgICAgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgfQorICAgICAgICBpZiAoIW5vZGUgfHwgIXNob3VsZEV2ZW50Q3Jvc3NTaGFkb3dCb3Vu ZGFyeShldmVudCwgKnRvU2hhZG93Um9vdChub2RlKSwgKnRhcmdldCkpCiAgICAgICAgICAgICBy ZXR1cm47Ci0gICAgICAgIGlmICghaXNTVkdFbGVtZW50KQotICAgICAgICAgICAgdGFyZ2V0ID0g MDsKKyAgICAgICAgbm9kZSA9IHRvU2hhZG93Um9vdChub2RlKS0+aG9zdEVsZW1lbnQoKTsKICAg ICB9CiB9CiAK