76414 2012-01-16 18:26:38 -0800 Clean EventContext class and move phase-tweaking logic to EventDispatcher class. 2012-01-17 21:50:28 -0800 1 1 1 Unclassified WebKit UI Events 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 76513 1 hayato hayato dglazkov webkit.review.bot oldest_to_newest 536839 0 hayato 2012-01-16 18:26:38 -0800 Clean EventContext class. See https://bugs.webkit.org/show_bug.cgi?id=76217#c10 for more info. This should be only refactoring, no functional changes. 536866 1 122707 hayato 2012-01-16 20:41:26 -0800 Created attachment 122707 clean EventContext 537163 2 122707 dglazkov 2012-01-17 09:47:19 -0800 Comment on attachment 122707 clean EventContext View in context: https://bugs.webkit.org/attachment.cgi?id=122707&action=review > Source/WebCore/dom/EventDispatcher.cpp:311 > + const EventContext& eventContext = m_ancestors[i-1]; I think you can do even better here: instead of exposing currentTarget, add a method that checks for equality of target and currentTarget (adjustedTargetSameAsTarget? atTarget?). This way, you aren't exposing unnecessary information from EventContext. 537591 3 122865 hayato 2012-01-17 20:25:44 -0800 Created attachment 122865 update 537592 4 hayato 2012-01-17 20:27:13 -0800 Thank you for the review. I've updated the patch. (In reply to comment #2) > (From update of attachment 122707 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=122707&action=review > > > Source/WebCore/dom/EventDispatcher.cpp:311 > > + const EventContext& eventContext = m_ancestors[i-1]; > > I think you can do even better here: instead of exposing currentTarget, add a method that checks for equality of target and currentTarget (adjustedTargetSameAsTarget? atTarget?). This way, you aren't exposing unnecessary information from EventContext. I named it EventContext::currentTargetSameAsTarget. 537602 5 122867 hayato 2012-01-17 20:46:47 -0800 Created attachment 122867 update 537603 6 hayato 2012-01-17 20:49:54 -0800 Ops. I updated the patch without the previous patch got r+. The new patch fixes one style issue. No behavior change. Could you review it again? 537618 7 122867 webkit.review.bot 2012-01-17 21:50:11 -0800 Comment on attachment 122867 update Clearing flags on attachment: 122867 Committed r105241: <http://trac.webkit.org/changeset/105241> 537619 8 webkit.review.bot 2012-01-17 21:50:28 -0800 All reviewed patches have been landed. Closing bug. 122707 2012-01-16 20:41:26 -0800 2012-01-17 20:25:39 -0800 clean EventContext bug-76414-20120117134124.patch text/plain 4164 hayato U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1MTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGEzNjQ4YWZhOTJkOTgz Y2RiOGY1ZjMzZDc1N2NmZDc2YzJkODAyMi4uNzQ2MWI2OGY5N2Q2MDlhMjkzM2NkN2Y2ZjZlZGJi NWRiYjY2ZjAzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDEyLTAxLTE2ICBIYXlh dG8gSXRvICA8aGF5YXRvQGNocm9taXVtLm9yZz4KIAorICAgICAgICBDbGVhbiBFdmVudENvbnRl eHQgYW5kIG1vdmUgcGhhc2UtdHdlYWtpbmcgbG9naWMgdG8gRXZlbnREaXNwYXRjaGVyLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzY0MTQKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyB0ZXN0cy4gTm8g Y2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogZG9tL0V2ZW50Q29udGV4dC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpFdmVudENvbnRleHQ6OmhhbmRsZUxvY2FsRXZlbnRzKToKKyAgICAg ICAgKiBkb20vRXZlbnRDb250ZXh0Lmg6CisgICAgICAgIChXZWJDb3JlOjpFdmVudENvbnRleHQ6 OmN1cnJlbnRUYXJnZXQpOgorICAgICAgICAqIGRvbS9FdmVudERpc3BhdGNoZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RXZlbnREaXNwYXRjaGVyOjpkaXNwYXRjaEV2ZW50KToKKworMjAxMi0w MS0xNiAgSGF5YXRvIEl0byAgPGhheWF0b0BjaHJvbWl1bS5vcmc+CisKICAgICAgICAgSW1wbGVt ZW50IG11bHRpcGxlIEFUX1RBUkdFVCBldmVudCBkaXNwYXRjaGluZyBpbiByZWdhcmQgdG8gc2hh ZG93IHRyZWUuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD03NjIxNwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnRDb250ZXh0LmNw cCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudENvbnRleHQuY3BwCmluZGV4IGRiYTQ2YWY1NDQ3 YWIxNzQ0YmJiMjQ3YjdlMjk3M2ExOGEwZWJlZjIuLjJhNWM1MjEwYWFlZjZiOTQxYmJkZTVkZTI5 NWNiYTMzOWQxNDJkZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudENvbnRl eHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudENvbnRleHQuY3BwCkBAIC00Mywx NiArNDMsOSBAQCBFdmVudENvbnRleHQ6OkV2ZW50Q29udGV4dChQYXNzUmVmUHRyPE5vZGU+IG5v ZGUsIFBhc3NSZWZQdHI8RXZlbnRUYXJnZXQ+IGN1cnJlbgogCiB2b2lkIEV2ZW50Q29udGV4dDo6 aGFuZGxlTG9jYWxFdmVudHMoRXZlbnQqIGV2ZW50KSBjb25zdAogewotICAgIHVuc2lnbmVkIHNo b3J0IGV2ZW50UGhhc2UgPSBldmVudC0+ZXZlbnRQaGFzZSgpOwotICAgIGlmIChtX3RhcmdldC5n ZXQoKSA9PSBtX2N1cnJlbnRUYXJnZXQuZ2V0KCkpIHsKLSAgICAgICAgaWYgKGV2ZW50UGhhc2Ug PT0gRXZlbnQ6OkNBUFRVUklOR19QSEFTRSAmJiBldmVudC0+YnViYmxlcygpKQotICAgICAgICAg ICAgcmV0dXJuOwotICAgICAgICBldmVudC0+c2V0RXZlbnRQaGFzZShFdmVudDo6QVRfVEFSR0VU KTsKLSAgICB9CiAgICAgZXZlbnQtPnNldFRhcmdldChtX3RhcmdldC5nZXQoKSk7CiAgICAgZXZl bnQtPnNldEN1cnJlbnRUYXJnZXQobV9jdXJyZW50VGFyZ2V0LmdldCgpKTsKICAgICBtX25vZGUt PmhhbmRsZUxvY2FsRXZlbnRzKGV2ZW50KTsKLSAgICBldmVudC0+c2V0RXZlbnRQaGFzZShldmVu dFBoYXNlKTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50Q29u dGV4dC5oIGIvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50Q29udGV4dC5oCmluZGV4IDliYWI5ZDQx NjJjMzViNjJjZmQ3MDYyMzZlZTFmNTQ3YmRkMjk3NGIuLjg4MjZiNTdiMDlkNzMyOWVmMWIxOWRh OGYwYjcwY2EwN2IxZDc3ZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudENv bnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnRDb250ZXh0LmgKQEAgLTQyLDYg KzQyLDcgQEAgcHVibGljOgogCiAgICAgTm9kZSogbm9kZSgpIGNvbnN0OwogICAgIEV2ZW50VGFy Z2V0KiB0YXJnZXQoKSBjb25zdDsKKyAgICBFdmVudFRhcmdldCogY3VycmVudFRhcmdldCgpIGNv bnN0OwogICAgIHZvaWQgaGFuZGxlTG9jYWxFdmVudHMoRXZlbnQqKSBjb25zdDsKIAogcHJpdmF0 ZToKQEAgLTYwLDYgKzYxLDExIEBAIGlubGluZSBFdmVudFRhcmdldCogRXZlbnRDb250ZXh0Ojp0 YXJnZXQoKSBjb25zdAogICAgIHJldHVybiBtX3RhcmdldC5nZXQoKTsKIH0KIAoraW5saW5lIEV2 ZW50VGFyZ2V0KiBFdmVudENvbnRleHQ6OmN1cnJlbnRUYXJnZXQoKSBjb25zdAoreworICAgIHJl dHVybiBtX2N1cnJlbnRUYXJnZXQuZ2V0KCk7Cit9CisKIH0KIAogI2VuZGlmIC8vIEV2ZW50Q29u dGV4dF9oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnREaXNwYXRjaGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudERpc3BhdGNoZXIuY3BwCmluZGV4IGM4NjQwYzkw NWQxZWQ5YjM0MDcwYzA3YTQ5MDQ5YjRmMDZmZGZhMjUuLjYzZjkzMzZjNDM0ZjI5ZmMzYWIzZDlk NTYwYmE2YzMyMDg5YWIxODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudERp c3BhdGNoZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudERpc3BhdGNoZXIuY3Bw CkBAIC0zMDgsNyArMzA4LDE0IEBAIGJvb2wgRXZlbnREaXNwYXRjaGVyOjpkaXNwYXRjaEV2ZW50 KFBhc3NSZWZQdHI8RXZlbnQ+IGV2ZW50KQogICAgICAgICBnb3RvIGRvbmVEaXNwYXRjaGluZzsK IAogICAgIGZvciAoc2l6ZV90IGkgPSBtX2FuY2VzdG9ycy5zaXplKCk7IGk7IC0taSkgewotICAg ICAgICBtX2FuY2VzdG9yc1tpIC0gMV0uaGFuZGxlTG9jYWxFdmVudHMoZXZlbnQuZ2V0KCkpOwor ICAgICAgICBjb25zdCBFdmVudENvbnRleHQmIGV2ZW50Q29udGV4dCA9IG1fYW5jZXN0b3JzW2kt MV07CisgICAgICAgIGlmIChldmVudENvbnRleHQudGFyZ2V0KCkgPT0gZXZlbnRDb250ZXh0LmN1 cnJlbnRUYXJnZXQoKSkgeworICAgICAgICAgICAgaWYgKGV2ZW50LT5idWJibGVzKCkpCisgICAg ICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICBldmVudC0+c2V0RXZlbnRQaGFzZShF dmVudDo6QVRfVEFSR0VUKTsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICBldmVudC0+c2V0 RXZlbnRQaGFzZShFdmVudDo6Q0FQVFVSSU5HX1BIQVNFKTsKKyAgICAgICAgZXZlbnRDb250ZXh0 LmhhbmRsZUxvY2FsRXZlbnRzKGV2ZW50LmdldCgpKTsKICAgICAgICAgaWYgKGV2ZW50LT5wcm9w YWdhdGlvblN0b3BwZWQoKSkKICAgICAgICAgICAgIGdvdG8gZG9uZURpc3BhdGNoaW5nOwogICAg IH0KQEAgLTMyNiw3ICszMzMsMTIgQEAgYm9vbCBFdmVudERpc3BhdGNoZXI6OmRpc3BhdGNoRXZl bnQoUGFzc1JlZlB0cjxFdmVudD4gZXZlbnQpCiAKICAgICAgICAgc2l6ZV90IHNpemUgPSBtX2Fu Y2VzdG9ycy5zaXplKCk7CiAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc2l6ZTsgKytp KSB7Ci0gICAgICAgICAgICBtX2FuY2VzdG9yc1tpXS5oYW5kbGVMb2NhbEV2ZW50cyhldmVudC5n ZXQoKSk7CisgICAgICAgICAgICBjb25zdCBFdmVudENvbnRleHQmIGV2ZW50Q29udGV4dCA9IG1f YW5jZXN0b3JzW2ldOworICAgICAgICAgICAgaWYgKGV2ZW50Q29udGV4dC50YXJnZXQoKSA9PSBl dmVudENvbnRleHQuY3VycmVudFRhcmdldCgpKQorICAgICAgICAgICAgICAgIGV2ZW50LT5zZXRF dmVudFBoYXNlKEV2ZW50OjpBVF9UQVJHRVQpOworICAgICAgICAgICAgZWxzZQorICAgICAgICAg ICAgICAgIGV2ZW50LT5zZXRFdmVudFBoYXNlKEV2ZW50OjpCVUJCTElOR19QSEFTRSk7CisgICAg ICAgICAgICBldmVudENvbnRleHQuaGFuZGxlTG9jYWxFdmVudHMoZXZlbnQuZ2V0KCkpOwogICAg ICAgICAgICAgaWYgKGV2ZW50LT5wcm9wYWdhdGlvblN0b3BwZWQoKSB8fCBldmVudC0+Y2FuY2Vs QnViYmxlKCkpCiAgICAgICAgICAgICAgICAgZ290byBkb25lRGlzcGF0Y2hpbmc7CiAgICAgICAg IH0K 122865 2012-01-17 20:25:44 -0800 2012-01-17 20:46:41 -0800 update bug-76414-20120118132542.patch text/plain 4176 hayato U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1MTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGEzNjQ4YWZhOTJkOTgz Y2RiOGY1ZjMzZDc1N2NmZDc2YzJkODAyMi4uODU1MWQ3NzI2OGUzNDQyYmI1ZTY0ZWM3OTBkZGFi NDAxYzQ5M2Q1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDEyLTAxLTE2ICBIYXlh dG8gSXRvICA8aGF5YXRvQGNocm9taXVtLm9yZz4KIAorICAgICAgICBDbGVhbiBFdmVudENvbnRl eHQgYW5kIG1vdmUgcGhhc2UtdHdlYWtpbmcgbG9naWMgdG8gRXZlbnREaXNwYXRjaGVyLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzY0MTQKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyB0ZXN0cy4gTm8g Y2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogZG9tL0V2ZW50Q29udGV4dC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpFdmVudENvbnRleHQ6OmhhbmRsZUxvY2FsRXZlbnRzKToKKyAgICAg ICAgKiBkb20vRXZlbnRDb250ZXh0Lmg6CisgICAgICAgIChXZWJDb3JlOjpFdmVudENvbnRleHQ6 OmN1cnJlbnRUYXJnZXRTYW1lQXNUYXJnZXQpOgorICAgICAgICAqIGRvbS9FdmVudERpc3BhdGNo ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnREaXNwYXRjaGVyOjpkaXNwYXRjaEV2ZW50 KToKKworMjAxMi0wMS0xNiAgSGF5YXRvIEl0byAgPGhheWF0b0BjaHJvbWl1bS5vcmc+CisKICAg ICAgICAgSW1wbGVtZW50IG11bHRpcGxlIEFUX1RBUkdFVCBldmVudCBkaXNwYXRjaGluZyBpbiBy ZWdhcmQgdG8gc2hhZG93IHRyZWUuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03NjIxNwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRXZl bnRDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudENvbnRleHQuY3BwCmluZGV4 IGRiYTQ2YWY1NDQ3YWIxNzQ0YmJiMjQ3YjdlMjk3M2ExOGEwZWJlZjIuLjJhNWM1MjEwYWFlZjZi OTQxYmJkZTVkZTI5NWNiYTMzOWQxNDJkZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9FdmVudENvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudENvbnRleHQu Y3BwCkBAIC00MywxNiArNDMsOSBAQCBFdmVudENvbnRleHQ6OkV2ZW50Q29udGV4dChQYXNzUmVm UHRyPE5vZGU+IG5vZGUsIFBhc3NSZWZQdHI8RXZlbnRUYXJnZXQ+IGN1cnJlbgogCiB2b2lkIEV2 ZW50Q29udGV4dDo6aGFuZGxlTG9jYWxFdmVudHMoRXZlbnQqIGV2ZW50KSBjb25zdAogewotICAg IHVuc2lnbmVkIHNob3J0IGV2ZW50UGhhc2UgPSBldmVudC0+ZXZlbnRQaGFzZSgpOwotICAgIGlm IChtX3RhcmdldC5nZXQoKSA9PSBtX2N1cnJlbnRUYXJnZXQuZ2V0KCkpIHsKLSAgICAgICAgaWYg KGV2ZW50UGhhc2UgPT0gRXZlbnQ6OkNBUFRVUklOR19QSEFTRSAmJiBldmVudC0+YnViYmxlcygp KQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBldmVudC0+c2V0RXZlbnRQaGFzZShFdmVu dDo6QVRfVEFSR0VUKTsKLSAgICB9CiAgICAgZXZlbnQtPnNldFRhcmdldChtX3RhcmdldC5nZXQo KSk7CiAgICAgZXZlbnQtPnNldEN1cnJlbnRUYXJnZXQobV9jdXJyZW50VGFyZ2V0LmdldCgpKTsK ICAgICBtX25vZGUtPmhhbmRsZUxvY2FsRXZlbnRzKGV2ZW50KTsKLSAgICBldmVudC0+c2V0RXZl bnRQaGFzZShldmVudFBoYXNlKTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv ZG9tL0V2ZW50Q29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50Q29udGV4dC5oCmlu ZGV4IDliYWI5ZDQxNjJjMzViNjJjZmQ3MDYyMzZlZTFmNTQ3YmRkMjk3NGIuLjVlNzMxN2Y0NWNm NTQ4NTZhMzI0OWQ4N2RkMjdhMDgxNjYyZDY3NDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9FdmVudENvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnRDb250ZXh0 LmgKQEAgLTQyLDYgKzQyLDcgQEAgcHVibGljOgogCiAgICAgTm9kZSogbm9kZSgpIGNvbnN0Owog ICAgIEV2ZW50VGFyZ2V0KiB0YXJnZXQoKSBjb25zdDsKKyAgICBib29sIGN1cnJlbnRUYXJnZXRT YW1lQXNUYXJnZXQoKSBjb25zdDsKICAgICB2b2lkIGhhbmRsZUxvY2FsRXZlbnRzKEV2ZW50Kikg Y29uc3Q7CiAKIHByaXZhdGU6CkBAIC02MCw2ICs2MSwxMSBAQCBpbmxpbmUgRXZlbnRUYXJnZXQq IEV2ZW50Q29udGV4dDo6dGFyZ2V0KCkgY29uc3QKICAgICByZXR1cm4gbV90YXJnZXQuZ2V0KCk7 CiB9CiAKK2lubGluZSBib29sIEV2ZW50Q29udGV4dDo6Y3VycmVudFRhcmdldFNhbWVBc1Rhcmdl dCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fY3VycmVudFRhcmdldC5nZXQoKSA9PSBtX3Rhcmdl dC5nZXQoKTsKK30KKwogfQogCiAjZW5kaWYgLy8gRXZlbnRDb250ZXh0X2gKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudERpc3BhdGNoZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv ZG9tL0V2ZW50RGlzcGF0Y2hlci5jcHAKaW5kZXggYzg2NDBjOTA1ZDFlZDliMzQwNzBjMDdhNDkw NDliNGYwNmZkZmEyNS4uNzU3MzgzMmJhMzM1MGQwZmNiMzNmMTMyZDc5OWJlNjJjN2IxYWIxNyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50RGlzcGF0Y2hlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvZG9tL0V2ZW50RGlzcGF0Y2hlci5jcHAKQEAgLTMwOCw3ICszMDgsMTQg QEAgYm9vbCBFdmVudERpc3BhdGNoZXI6OmRpc3BhdGNoRXZlbnQoUGFzc1JlZlB0cjxFdmVudD4g ZXZlbnQpCiAgICAgICAgIGdvdG8gZG9uZURpc3BhdGNoaW5nOwogCiAgICAgZm9yIChzaXplX3Qg aSA9IG1fYW5jZXN0b3JzLnNpemUoKTsgaTsgLS1pKSB7Ci0gICAgICAgIG1fYW5jZXN0b3JzW2kg LSAxXS5oYW5kbGVMb2NhbEV2ZW50cyhldmVudC5nZXQoKSk7CisgICAgICAgIGNvbnN0IEV2ZW50 Q29udGV4dCYgZXZlbnRDb250ZXh0ID0gbV9hbmNlc3RvcnNbaS0xXTsKKyAgICAgICAgaWYgKGV2 ZW50Q29udGV4dC5jdXJyZW50VGFyZ2V0U2FtZUFzVGFyZ2V0KCkpIHsKKyAgICAgICAgICAgIGlm IChldmVudC0+YnViYmxlcygpKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAg ICAgZXZlbnQtPnNldEV2ZW50UGhhc2UoRXZlbnQ6OkFUX1RBUkdFVCk7CisgICAgICAgIH0gZWxz ZQorICAgICAgICAgICAgZXZlbnQtPnNldEV2ZW50UGhhc2UoRXZlbnQ6OkNBUFRVUklOR19QSEFT RSk7CisgICAgICAgIGV2ZW50Q29udGV4dC5oYW5kbGVMb2NhbEV2ZW50cyhldmVudC5nZXQoKSk7 CiAgICAgICAgIGlmIChldmVudC0+cHJvcGFnYXRpb25TdG9wcGVkKCkpCiAgICAgICAgICAgICBn b3RvIGRvbmVEaXNwYXRjaGluZzsKICAgICB9CkBAIC0zMjYsNyArMzMzLDEyIEBAIGJvb2wgRXZl bnREaXNwYXRjaGVyOjpkaXNwYXRjaEV2ZW50KFBhc3NSZWZQdHI8RXZlbnQ+IGV2ZW50KQogCiAg ICAgICAgIHNpemVfdCBzaXplID0gbV9hbmNlc3RvcnMuc2l6ZSgpOwogICAgICAgICBmb3IgKHNp emVfdCBpID0gMDsgaSA8IHNpemU7ICsraSkgewotICAgICAgICAgICAgbV9hbmNlc3RvcnNbaV0u aGFuZGxlTG9jYWxFdmVudHMoZXZlbnQuZ2V0KCkpOworICAgICAgICAgICAgY29uc3QgRXZlbnRD b250ZXh0JiBldmVudENvbnRleHQgPSBtX2FuY2VzdG9yc1tpXTsKKyAgICAgICAgICAgIGlmIChl dmVudENvbnRleHQuY3VycmVudFRhcmdldFNhbWVBc1RhcmdldCgpKQorICAgICAgICAgICAgICAg IGV2ZW50LT5zZXRFdmVudFBoYXNlKEV2ZW50OjpBVF9UQVJHRVQpOworICAgICAgICAgICAgZWxz ZQorICAgICAgICAgICAgICAgIGV2ZW50LT5zZXRFdmVudFBoYXNlKEV2ZW50OjpCVUJCTElOR19Q SEFTRSk7CisgICAgICAgICAgICBldmVudENvbnRleHQuaGFuZGxlTG9jYWxFdmVudHMoZXZlbnQu Z2V0KCkpOwogICAgICAgICAgICAgaWYgKGV2ZW50LT5wcm9wYWdhdGlvblN0b3BwZWQoKSB8fCBl dmVudC0+Y2FuY2VsQnViYmxlKCkpCiAgICAgICAgICAgICAgICAgZ290byBkb25lRGlzcGF0Y2hp bmc7CiAgICAgICAgIH0K 122867 2012-01-17 20:46:47 -0800 2012-01-17 21:50:10 -0800 update bug-76414-20120118134645.patch text/plain 4176 hayato U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1MTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGEzNjQ4YWZhOTJkOTgz Y2RiOGY1ZjMzZDc1N2NmZDc2YzJkODAyMi4uODU1MWQ3NzI2OGUzNDQyYmI1ZTY0ZWM3OTBkZGFi NDAxYzQ5M2Q1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDEyLTAxLTE2ICBIYXlh dG8gSXRvICA8aGF5YXRvQGNocm9taXVtLm9yZz4KIAorICAgICAgICBDbGVhbiBFdmVudENvbnRl eHQgYW5kIG1vdmUgcGhhc2UtdHdlYWtpbmcgbG9naWMgdG8gRXZlbnREaXNwYXRjaGVyLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzY0MTQKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyB0ZXN0cy4gTm8g Y2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogZG9tL0V2ZW50Q29udGV4dC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpFdmVudENvbnRleHQ6OmhhbmRsZUxvY2FsRXZlbnRzKToKKyAgICAg ICAgKiBkb20vRXZlbnRDb250ZXh0Lmg6CisgICAgICAgIChXZWJDb3JlOjpFdmVudENvbnRleHQ6 OmN1cnJlbnRUYXJnZXRTYW1lQXNUYXJnZXQpOgorICAgICAgICAqIGRvbS9FdmVudERpc3BhdGNo ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnREaXNwYXRjaGVyOjpkaXNwYXRjaEV2ZW50 KToKKworMjAxMi0wMS0xNiAgSGF5YXRvIEl0byAgPGhheWF0b0BjaHJvbWl1bS5vcmc+CisKICAg ICAgICAgSW1wbGVtZW50IG11bHRpcGxlIEFUX1RBUkdFVCBldmVudCBkaXNwYXRjaGluZyBpbiBy ZWdhcmQgdG8gc2hhZG93IHRyZWUuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03NjIxNwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRXZl bnRDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudENvbnRleHQuY3BwCmluZGV4 IGRiYTQ2YWY1NDQ3YWIxNzQ0YmJiMjQ3YjdlMjk3M2ExOGEwZWJlZjIuLjJhNWM1MjEwYWFlZjZi OTQxYmJkZTVkZTI5NWNiYTMzOWQxNDJkZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9FdmVudENvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudENvbnRleHQu Y3BwCkBAIC00MywxNiArNDMsOSBAQCBFdmVudENvbnRleHQ6OkV2ZW50Q29udGV4dChQYXNzUmVm UHRyPE5vZGU+IG5vZGUsIFBhc3NSZWZQdHI8RXZlbnRUYXJnZXQ+IGN1cnJlbgogCiB2b2lkIEV2 ZW50Q29udGV4dDo6aGFuZGxlTG9jYWxFdmVudHMoRXZlbnQqIGV2ZW50KSBjb25zdAogewotICAg IHVuc2lnbmVkIHNob3J0IGV2ZW50UGhhc2UgPSBldmVudC0+ZXZlbnRQaGFzZSgpOwotICAgIGlm IChtX3RhcmdldC5nZXQoKSA9PSBtX2N1cnJlbnRUYXJnZXQuZ2V0KCkpIHsKLSAgICAgICAgaWYg KGV2ZW50UGhhc2UgPT0gRXZlbnQ6OkNBUFRVUklOR19QSEFTRSAmJiBldmVudC0+YnViYmxlcygp KQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBldmVudC0+c2V0RXZlbnRQaGFzZShFdmVu dDo6QVRfVEFSR0VUKTsKLSAgICB9CiAgICAgZXZlbnQtPnNldFRhcmdldChtX3RhcmdldC5nZXQo KSk7CiAgICAgZXZlbnQtPnNldEN1cnJlbnRUYXJnZXQobV9jdXJyZW50VGFyZ2V0LmdldCgpKTsK ICAgICBtX25vZGUtPmhhbmRsZUxvY2FsRXZlbnRzKGV2ZW50KTsKLSAgICBldmVudC0+c2V0RXZl bnRQaGFzZShldmVudFBoYXNlKTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv ZG9tL0V2ZW50Q29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50Q29udGV4dC5oCmlu ZGV4IDliYWI5ZDQxNjJjMzViNjJjZmQ3MDYyMzZlZTFmNTQ3YmRkMjk3NGIuLjVlNzMxN2Y0NWNm NTQ4NTZhMzI0OWQ4N2RkMjdhMDgxNjYyZDY3NDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9FdmVudENvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnRDb250ZXh0 LmgKQEAgLTQyLDYgKzQyLDcgQEAgcHVibGljOgogCiAgICAgTm9kZSogbm9kZSgpIGNvbnN0Owog ICAgIEV2ZW50VGFyZ2V0KiB0YXJnZXQoKSBjb25zdDsKKyAgICBib29sIGN1cnJlbnRUYXJnZXRT YW1lQXNUYXJnZXQoKSBjb25zdDsKICAgICB2b2lkIGhhbmRsZUxvY2FsRXZlbnRzKEV2ZW50Kikg Y29uc3Q7CiAKIHByaXZhdGU6CkBAIC02MCw2ICs2MSwxMSBAQCBpbmxpbmUgRXZlbnRUYXJnZXQq IEV2ZW50Q29udGV4dDo6dGFyZ2V0KCkgY29uc3QKICAgICByZXR1cm4gbV90YXJnZXQuZ2V0KCk7 CiB9CiAKK2lubGluZSBib29sIEV2ZW50Q29udGV4dDo6Y3VycmVudFRhcmdldFNhbWVBc1Rhcmdl dCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fY3VycmVudFRhcmdldC5nZXQoKSA9PSBtX3Rhcmdl dC5nZXQoKTsKK30KKwogfQogCiAjZW5kaWYgLy8gRXZlbnRDb250ZXh0X2gKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudERpc3BhdGNoZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv ZG9tL0V2ZW50RGlzcGF0Y2hlci5jcHAKaW5kZXggYzg2NDBjOTA1ZDFlZDliMzQwNzBjMDdhNDkw NDliNGYwNmZkZmEyNS4uNzU3MzgzMmJhMzM1MGQwZmNiMzNmMTMyZDc5OWJlNjJjN2IxYWIxNyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50RGlzcGF0Y2hlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvZG9tL0V2ZW50RGlzcGF0Y2hlci5jcHAKQEAgLTMwOCw3ICszMDgsMTQg QEAgYm9vbCBFdmVudERpc3BhdGNoZXI6OmRpc3BhdGNoRXZlbnQoUGFzc1JlZlB0cjxFdmVudD4g ZXZlbnQpCiAgICAgICAgIGdvdG8gZG9uZURpc3BhdGNoaW5nOwogCiAgICAgZm9yIChzaXplX3Qg aSA9IG1fYW5jZXN0b3JzLnNpemUoKTsgaTsgLS1pKSB7Ci0gICAgICAgIG1fYW5jZXN0b3JzW2kg LSAxXS5oYW5kbGVMb2NhbEV2ZW50cyhldmVudC5nZXQoKSk7CisgICAgICAgIGNvbnN0IEV2ZW50 Q29udGV4dCYgZXZlbnRDb250ZXh0ID0gbV9hbmNlc3RvcnNbaS0xXTsKKyAgICAgICAgaWYgKGV2 ZW50Q29udGV4dC5jdXJyZW50VGFyZ2V0U2FtZUFzVGFyZ2V0KCkpIHsKKyAgICAgICAgICAgIGlm IChldmVudC0+YnViYmxlcygpKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAg ICAgZXZlbnQtPnNldEV2ZW50UGhhc2UoRXZlbnQ6OkFUX1RBUkdFVCk7CisgICAgICAgIH0gZWxz ZQorICAgICAgICAgICAgZXZlbnQtPnNldEV2ZW50UGhhc2UoRXZlbnQ6OkNBUFRVUklOR19QSEFT RSk7CisgICAgICAgIGV2ZW50Q29udGV4dC5oYW5kbGVMb2NhbEV2ZW50cyhldmVudC5nZXQoKSk7 CiAgICAgICAgIGlmIChldmVudC0+cHJvcGFnYXRpb25TdG9wcGVkKCkpCiAgICAgICAgICAgICBn b3RvIGRvbmVEaXNwYXRjaGluZzsKICAgICB9CkBAIC0zMjYsNyArMzMzLDEyIEBAIGJvb2wgRXZl bnREaXNwYXRjaGVyOjpkaXNwYXRjaEV2ZW50KFBhc3NSZWZQdHI8RXZlbnQ+IGV2ZW50KQogCiAg ICAgICAgIHNpemVfdCBzaXplID0gbV9hbmNlc3RvcnMuc2l6ZSgpOwogICAgICAgICBmb3IgKHNp emVfdCBpID0gMDsgaSA8IHNpemU7ICsraSkgewotICAgICAgICAgICAgbV9hbmNlc3RvcnNbaV0u aGFuZGxlTG9jYWxFdmVudHMoZXZlbnQuZ2V0KCkpOworICAgICAgICAgICAgY29uc3QgRXZlbnRD b250ZXh0JiBldmVudENvbnRleHQgPSBtX2FuY2VzdG9yc1tpXTsKKyAgICAgICAgICAgIGlmIChl dmVudENvbnRleHQuY3VycmVudFRhcmdldFNhbWVBc1RhcmdldCgpKQorICAgICAgICAgICAgICAg IGV2ZW50LT5zZXRFdmVudFBoYXNlKEV2ZW50OjpBVF9UQVJHRVQpOworICAgICAgICAgICAgZWxz ZQorICAgICAgICAgICAgICAgIGV2ZW50LT5zZXRFdmVudFBoYXNlKEV2ZW50OjpCVUJCTElOR19Q SEFTRSk7CisgICAgICAgICAgICBldmVudENvbnRleHQuaGFuZGxlTG9jYWxFdmVudHMoZXZlbnQu Z2V0KCkpOwogICAgICAgICAgICAgaWYgKGV2ZW50LT5wcm9wYWdhdGlvblN0b3BwZWQoKSB8fCBl dmVudC0+Y2FuY2VsQnViYmxlKCkpCiAgICAgICAgICAgICAgICAgZ290byBkb25lRGlzcGF0Y2hp bmc7CiAgICAgICAgIH0K