57402 2011-03-29 16:44:36 -0700 Introduce SimulatedMouseEvent and teach EventDispatcher how to use it. 2011-04-20 16:31:59 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 59037 55515 1 dglazkov dglazkov commit-queue darin oldest_to_newest 375878 0 dglazkov 2011-03-29 16:44:36 -0700 Introduce SimulatedMouseEvent and teach EventDispatcher how to use it. 375881 1 87430 dglazkov 2011-03-29 16:47:12 -0700 Created attachment 87430 Patch 375884 2 dglazkov 2011-03-29 16:48:10 -0700 Darin, can you take a look -- this is the lower-calorie alternative to bug 57391. 375952 3 87430 commit-queue 2011-03-29 18:07:41 -0700 Comment on attachment 87430 Patch Clearing flags on attachment: 87430 Committed r82376: <http://trac.webkit.org/changeset/82376> 375953 4 commit-queue 2011-03-29 18:07:51 -0700 All reviewed patches have been landed. Closing bug. 87430 2011-03-29 16:47:12 -0700 2011-03-29 18:07:40 -0700 Patch bug-57402-20110329164710.patch text/plain 14141 dglazkov U3VidmVyc2lvbiBSZXZpc2lvbjogODIzNDgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlYzE0MGRiZWMzZmI1NWE2 NTI4MDExNzUwZmUwZTlkMmNjMDg0M2Y0Li4yM2Y3NzFiNzY5N2EzYjg1ODViNzg0MmE5ZjM3MWUz MjZmMTM2ZTE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDMtMjkgIERpbWl0 cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbnRyb2R1Y2UgU2ltdWxhdGVkTW91c2VFdmVu dCBhbmQgdGVhY2ggRXZlbnREaXNwYXRjaGVyIGhvdyB0byB1c2UgaXQuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzQwMgorCisgICAgICAgIE5vIGZ1 bmN0aW9uYWwgY2hhbmdlcywgY292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAq IGRvbS9FdmVudERpc3BhdGNoZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnREaXNwYXRj aGVyOjpkaXNwYXRjaFNpbXVsYXRlZENsaWNrKTogQ2hhbmdlZCB0byB1c2UgU2ltdWxhdGVkTW91 c2VFdmVudC4KKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50RGlzcGF0Y2hlcjo6ZGlzcGF0Y2hNb3Vz ZUV2ZW50KTogQ29tYmluZWQgdHdvIGRpc3BhdGNoTW91c2VFdmVudCBtZXRob2RzCisgICAgICAg ICAgICBpbnRvIG9uZSwgbm93IHRoYXQgc2ltdWxhdGVkLWNsaWNrIGV2ZW50cyBkb24ndCBuZWVk IG9uZS4KKyAgICAgICAgKiBkb20vRXZlbnREaXNwYXRjaGVyLmg6IFVwZGF0ZWQgZGVjbHMuCisg ICAgICAgICogZG9tL01vdXNlRXZlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2ltdWxhdGVk TW91c2VFdmVudDo6Y3JlYXRlKTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpTaW11bGF0ZWRN b3VzZUV2ZW50Ojp+U2ltdWxhdGVkTW91c2VFdmVudCk6IEFkZGVkLgorICAgICAgICAoV2ViQ29y ZTo6U2ltdWxhdGVkTW91c2VFdmVudDo6U2ltdWxhdGVkTW91c2VFdmVudCk6IEFkZGVkLgorICAg ICAgICAqIGRvbS9Nb3VzZUV2ZW50Lmg6IE1hZGUgY29uc3RydWN0b3IgcHJvdGVjdGVkLgorCiAy MDExLTAzLTI5ICBUaG9tYXMgS2xhdXNuZXIgIDx0a0BnaWdhLm9yLmF0PgogCiAgICAgICAgIFJl dmlld2VkIGJ5IERhdmlkIExldmluLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0V2 ZW50RGlzcGF0Y2hlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnREaXNwYXRjaGVyLmNw cAppbmRleCAzNTZiMTZmOTU0YWI3MmMyNjkwM2RkYTAwYmJjOGNiYWFlMjFkZjgzLi44YzE3Mzdm OTQwZmM5NWI1ZThmOWQ3MjU5NmM5Y2JkNmY3ODBhYWRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9kb20vRXZlbnREaXNwYXRjaGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRXZl bnREaXNwYXRjaGVyLmNwcApAQCAtOTksMjcgKzk5LDcgQEAgdm9pZCBFdmVudERpc3BhdGNoZXI6 OmRpc3BhdGNoU2NvcGVkRXZlbnQoTm9kZSogbm9kZSwgUGFzc1JlZlB0cjxFdmVudD4gZXZlbnQp CiAgICAgU2NvcGVkRXZlbnRRdWV1ZTo6aW5zdGFuY2UoKS0+ZW5xdWV1ZUV2ZW50KGV2ZW50KTsK IH0KIAotYm9vbCBFdmVudERpc3BhdGNoZXI6OmRpc3BhdGNoTW91c2VFdmVudChOb2RlKiBub2Rl LCBjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmIGV2ZW50LCBjb25zdCBBdG9taWNTdHJpbmcmIGV2 ZW50VHlwZSwKLSAgICBpbnQgZGV0YWlsLCBOb2RlKiByZWxhdGVkVGFyZ2V0KQotewotICAgIEFT U0VSVCghZXZlbnREaXNwYXRjaEZvcmJpZGRlbigpKTsKLSAgICBFdmVudERpc3BhdGNoZXIgZGlz cGF0Y2hlcihub2RlKTsKLQotICAgIEludFBvaW50IGNvbnRlbnRzUG9zOwotICAgIGlmIChGcmFt ZVZpZXcqIHZpZXcgPSBub2RlLT5kb2N1bWVudCgpLT52aWV3KCkpCi0gICAgICAgIGNvbnRlbnRz UG9zID0gdmlldy0+d2luZG93VG9Db250ZW50cyhldmVudC5wb3MoKSk7Ci0KLSAgICBzaG9ydCBi dXR0b24gPSBldmVudC5idXR0b24oKTsKLQotICAgIEFTU0VSVChldmVudC5ldmVudFR5cGUoKSA9 PSBNb3VzZUV2ZW50TW92ZWQgfHwgYnV0dG9uICE9IE5vQnV0dG9uKTsKLQotICAgIHJldHVybiBk aXNwYXRjaGVyLmRpc3BhdGNoTW91c2VFdmVudChldmVudFR5cGUsIGJ1dHRvbiwgZGV0YWlsLAot ICAgICAgICBjb250ZW50c1Bvcy54KCksIGNvbnRlbnRzUG9zLnkoKSwgZXZlbnQuZ2xvYmFsWCgp LCBldmVudC5nbG9iYWxZKCksCi0gICAgICAgIGV2ZW50LmN0cmxLZXkoKSwgZXZlbnQuYWx0S2V5 KCksIGV2ZW50LnNoaWZ0S2V5KCksIGV2ZW50Lm1ldGFLZXkoKSwKLSAgICAgICAgZmFsc2UsIHJl bGF0ZWRUYXJnZXQsIDApOwotfQotCi12b2lkIEV2ZW50RGlzcGF0Y2hlcjo6ZGlzcGF0Y2hTaW11 bGF0ZWRDbGljayhOb2RlKiBub2RlLCBQYXNzUmVmUHRyPEV2ZW50PiBldmVudCwgYm9vbCBzZW5k TW91c2VFdmVudHMsIGJvb2wgc2hvd1ByZXNzZWRMb29rKQordm9pZCBFdmVudERpc3BhdGNoZXI6 OmRpc3BhdGNoU2ltdWxhdGVkQ2xpY2soTm9kZSogbm9kZSwgUGFzc1JlZlB0cjxFdmVudD4gdW5k ZXJseWluZ0V2ZW50LCBib29sIHNlbmRNb3VzZUV2ZW50cywgYm9vbCBzaG93UHJlc3NlZExvb2sp CiB7CiAgICAgRXZlbnREaXNwYXRjaGVyIGRpc3BhdGNoZXIobm9kZSk7CiAKQEAgLTEzMiwxNCAr MTEyLDE0IEBAIHZvaWQgRXZlbnREaXNwYXRjaGVyOjpkaXNwYXRjaFNpbXVsYXRlZENsaWNrKE5v ZGUqIG5vZGUsIFBhc3NSZWZQdHI8RXZlbnQ+IGV2ZW50CiAKICAgICAvLyBzZW5kIG1vdXNlZG93 biBhbmQgbW91c2V1cCBiZWZvcmUgdGhlIGNsaWNrLCBpZiByZXF1ZXN0ZWQKICAgICBpZiAoc2Vu ZE1vdXNlRXZlbnRzKQotICAgICAgICBkaXNwYXRjaGVyLmRpc3BhdGNoU2ltdWxhdGVkTW91c2VF dmVudChldmVudE5hbWVzKCkubW91c2Vkb3duRXZlbnQsIGV2ZW50LmdldCgpKTsKKyAgICAgICAg ZGlzcGF0Y2hlci5kaXNwYXRjaEV2ZW50KFNpbXVsYXRlZE1vdXNlRXZlbnQ6OmNyZWF0ZShldmVu dE5hbWVzKCkubW91c2Vkb3duRXZlbnQsIG5vZGUtPmRvY3VtZW50KCktPmRlZmF1bHRWaWV3KCks IHVuZGVybHlpbmdFdmVudCkpOwogICAgIG5vZGUtPnNldEFjdGl2ZSh0cnVlLCBzaG93UHJlc3Nl ZExvb2spOwogICAgIGlmIChzZW5kTW91c2VFdmVudHMpCi0gICAgICAgIGRpc3BhdGNoZXIuZGlz cGF0Y2hTaW11bGF0ZWRNb3VzZUV2ZW50KGV2ZW50TmFtZXMoKS5tb3VzZXVwRXZlbnQsIGV2ZW50 LmdldCgpKTsKKyAgICAgICAgZGlzcGF0Y2hlci5kaXNwYXRjaEV2ZW50KFNpbXVsYXRlZE1vdXNl RXZlbnQ6OmNyZWF0ZShldmVudE5hbWVzKCkubW91c2V1cEV2ZW50LCBub2RlLT5kb2N1bWVudCgp LT5kZWZhdWx0VmlldygpLCB1bmRlcmx5aW5nRXZlbnQpKTsKICAgICBub2RlLT5zZXRBY3RpdmUo ZmFsc2UpOwogCiAgICAgLy8gYWx3YXlzIHNlbmQgY2xpY2sKLSAgICBkaXNwYXRjaGVyLmRpc3Bh dGNoU2ltdWxhdGVkTW91c2VFdmVudChldmVudE5hbWVzKCkuY2xpY2tFdmVudCwgZXZlbnQpOwor ICAgIGRpc3BhdGNoZXIuZGlzcGF0Y2hFdmVudChTaW11bGF0ZWRNb3VzZUV2ZW50OjpjcmVhdGUo ZXZlbnROYW1lcygpLmNsaWNrRXZlbnQsIG5vZGUtPmRvY3VtZW50KCktPmRlZmF1bHRWaWV3KCks IHVuZGVybHlpbmdFdmVudCkpOwogCiAgICAgZ05vZGVzRGlzcGF0Y2hpbmdTaW11bGF0ZWRDbGlj a3MtPnJlbW92ZShub2RlKTsKIH0KQEAgLTMyOSwxOSArMzA5LDI1IEBAIGRvbmVXaXRoRGVmYXVs dDoKIAogICAgIHJldHVybiAhZXZlbnQtPmRlZmF1bHRQcmV2ZW50ZWQoKTsKIH0KLQotYm9vbCBF dmVudERpc3BhdGNoZXI6OmRpc3BhdGNoTW91c2VFdmVudChjb25zdCBBdG9taWNTdHJpbmcmIGV2 ZW50VHlwZSwgaW50IGJ1dHRvbiwgaW50IGRldGFpbCwKLSAgICBpbnQgcGFnZVgsIGludCBwYWdl WSwgaW50IHNjcmVlblgsIGludCBzY3JlZW5ZLAotICAgIGJvb2wgY3RybEtleSwgYm9vbCBhbHRL ZXksIGJvb2wgc2hpZnRLZXksIGJvb2wgbWV0YUtleSwKLSAgICBib29sIGlzU2ltdWxhdGVkLCBO b2RlKiByZWxhdGVkVGFyZ2V0QXJnLCBQYXNzUmVmUHRyPEV2ZW50PiB1bmRlcmx5aW5nRXZlbnQp Citib29sIEV2ZW50RGlzcGF0Y2hlcjo6ZGlzcGF0Y2hNb3VzZUV2ZW50KE5vZGUqIG5vZGUsIGNv bnN0IFBsYXRmb3JtTW91c2VFdmVudCYgZXZlbnQsIGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRU eXBlLAorICAgIGludCBkZXRhaWwsIE5vZGUqIHJlbGF0ZWRUYXJnZXRBcmcpCiB7CiAgICAgQVNT RVJUKCFldmVudERpc3BhdGNoRm9yYmlkZGVuKCkpOwotICAgIGlmIChtX25vZGUtPmRpc2FibGVk KCkpIC8vIERvbid0IGV2ZW4gc2VuZCBET00gZXZlbnRzIGZvciBkaXNhYmxlZCBjb250cm9scy4u CisgICAgaWYgKG5vZGUtPmRpc2FibGVkKCkpIC8vIERvbid0IGV2ZW4gc2VuZCBET00gZXZlbnRz IGZvciBkaXNhYmxlZCBjb250cm9scy4uCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgaWYg KGV2ZW50VHlwZS5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsgLy8gU2hvdWxkbid0 IGhhcHBlbi4KIAorICAgIEV2ZW50RGlzcGF0Y2hlciBkaXNwYXRjaGVyKG5vZGUpOworCisgICAg SW50UG9pbnQgY29udGVudHNQb3M7CisgICAgaWYgKEZyYW1lVmlldyogdmlldyA9IG5vZGUtPmRv Y3VtZW50KCktPnZpZXcoKSkKKyAgICAgICAgY29udGVudHNQb3MgPSB2aWV3LT53aW5kb3dUb0Nv bnRlbnRzKGV2ZW50LnBvcygpKTsKKworICAgIEFTU0VSVChldmVudC5ldmVudFR5cGUoKSA9PSBN b3VzZUV2ZW50TW92ZWQgfHwgZXZlbnQuYnV0dG9uKCkgIT0gTm9CdXR0b24pOworCisgICAgLy8g RklYTUU6IFRoaXMgc2hvdWxkIGJlIGluIG1vdXNlIGV2ZW50IGNvbnN0cnVjdG9yLgogICAgIGJv b2wgY2FuY2VsYWJsZSA9IGV2ZW50VHlwZSAhPSBldmVudE5hbWVzKCkubW91c2Vtb3ZlRXZlbnQ7 CiAKICAgICBib29sIHN3YWxsb3dFdmVudCA9IGZhbHNlOwpAQCAtMzQ5LDI2ICszMzUsMjYgQEAg Ym9vbCBFdmVudERpc3BhdGNoZXI6OmRpc3BhdGNoTW91c2VFdmVudChjb25zdCBBdG9taWNTdHJp bmcmIGV2ZW50VHlwZSwgaW50IGJ1dHQKICAgICAvLyBBdHRlbXB0aW5nIHRvIGRpc3BhdGNoIHdp dGggYSBub24tRXZlbnRUYXJnZXQgcmVsYXRlZFRhcmdldCBjYXVzZXMgdGhlIHJlbGF0ZWRUYXJn ZXQgdG8gYmUgc2lsZW50bHkgaWdub3JlZC4KICAgICBSZWZQdHI8Tm9kZT4gcmVsYXRlZFRhcmdl dCA9IHB1bGxPdXRPZlNoYWRvdyhyZWxhdGVkVGFyZ2V0QXJnKTsKIAotICAgIGludCBhZGp1c3Rl ZFBhZ2VYID0gcGFnZVg7Ci0gICAgaW50IGFkanVzdGVkUGFnZVkgPSBwYWdlWTsKLSAgICBpZiAo RnJhbWUqIGZyYW1lID0gbV9ub2RlLT5kb2N1bWVudCgpLT5mcmFtZSgpKSB7CisgICAgaW50IGFk anVzdGVkUGFnZVggPSBjb250ZW50c1Bvcy54KCk7CisgICAgaW50IGFkanVzdGVkUGFnZVkgPSBj b250ZW50c1Bvcy55KCk7CisgICAgaWYgKEZyYW1lKiBmcmFtZSA9IG5vZGUtPmRvY3VtZW50KCkt PmZyYW1lKCkpIHsKICAgICAgICAgZmxvYXQgcGFnZVpvb20gPSBmcmFtZS0+cGFnZVpvb21GYWN0 b3IoKTsKICAgICAgICAgaWYgKHBhZ2Vab29tICE9IDEuMGYpIHsKICAgICAgICAgICAgIC8vIEFk anVzdCBvdXIgcGFnZVggYW5kIHBhZ2VZIHRvIGFjY291bnQgZm9yIHRoZSBwYWdlIHpvb20uCi0g ICAgICAgICAgICBhZGp1c3RlZFBhZ2VYID0gbHJvdW5kZihwYWdlWCAvIHBhZ2Vab29tKTsKLSAg ICAgICAgICAgIGFkanVzdGVkUGFnZVkgPSBscm91bmRmKHBhZ2VZIC8gcGFnZVpvb20pOworICAg ICAgICAgICAgYWRqdXN0ZWRQYWdlWCA9IGxyb3VuZGYoY29udGVudHNQb3MueCgpIC8gcGFnZVpv b20pOworICAgICAgICAgICAgYWRqdXN0ZWRQYWdlWSA9IGxyb3VuZGYoY29udGVudHNQb3MueSgp IC8gcGFnZVpvb20pOwogICAgICAgICB9CiAgICAgfQogCiAgICAgUmVmUHRyPE1vdXNlRXZlbnQ+ IG1vdXNlRXZlbnQgPSBNb3VzZUV2ZW50OjpjcmVhdGUoZXZlbnRUeXBlLAotICAgICAgICB0cnVl LCBjYW5jZWxhYmxlLCBtX25vZGUtPmRvY3VtZW50KCktPmRlZmF1bHRWaWV3KCksCi0gICAgICAg IGRldGFpbCwgc2NyZWVuWCwgc2NyZWVuWSwgYWRqdXN0ZWRQYWdlWCwgYWRqdXN0ZWRQYWdlWSwK LSAgICAgICAgY3RybEtleSwgYWx0S2V5LCBzaGlmdEtleSwgbWV0YUtleSwgYnV0dG9uLAotICAg ICAgICByZWxhdGVkVGFyZ2V0LCAwLCBpc1NpbXVsYXRlZCk7Ci0gICAgbW91c2VFdmVudC0+c2V0 VW5kZXJseWluZ0V2ZW50KHVuZGVybHlpbmdFdmVudC5nZXQoKSk7Ci0gICAgbW91c2VFdmVudC0+ c2V0QWJzb2x1dGVMb2NhdGlvbihJbnRQb2ludChwYWdlWCwgcGFnZVkpKTsKLQotICAgIGRpc3Bh dGNoRXZlbnQobW91c2VFdmVudCk7CisgICAgICAgIHRydWUsIGNhbmNlbGFibGUsIG5vZGUtPmRv Y3VtZW50KCktPmRlZmF1bHRWaWV3KCksCisgICAgICAgIGRldGFpbCwgZXZlbnQuZ2xvYmFsWCgp LCBldmVudC5nbG9iYWxZKCksIGFkanVzdGVkUGFnZVgsIGFkanVzdGVkUGFnZVksCisgICAgICAg IGV2ZW50LmN0cmxLZXkoKSwgZXZlbnQuYWx0S2V5KCksIGV2ZW50LnNoaWZ0S2V5KCksIGV2ZW50 Lm1ldGFLZXkoKSwgZXZlbnQuYnV0dG9uKCksCisgICAgICAgIHJlbGF0ZWRUYXJnZXQsICAwLCBm YWxzZSk7CisgICAgLy8gRklYTUU6IFNob3VsZCB0aGlzIGJlIGFkanVzdGVkUGFnZVgsIGFkanVz dGVkUGFnZVk/CisgICAgbW91c2VFdmVudC0+c2V0QWJzb2x1dGVMb2NhdGlvbihJbnRQb2ludChj b250ZW50c1Bvcy54KCksIGNvbnRlbnRzUG9zLnkoKSkpOworCisgICAgZGlzcGF0Y2hlci5kaXNw YXRjaEV2ZW50KG1vdXNlRXZlbnQpOwogICAgIGJvb2wgZGVmYXVsdEhhbmRsZWQgPSBtb3VzZUV2 ZW50LT5kZWZhdWx0SGFuZGxlZCgpOwogICAgIGJvb2wgZGVmYXVsdFByZXZlbnRlZCA9IG1vdXNl RXZlbnQtPmRlZmF1bHRQcmV2ZW50ZWQoKTsKICAgICBpZiAoZGVmYXVsdEhhbmRsZWQgfHwgZGVm YXVsdFByZXZlbnRlZCkKQEAgLTM3OSwxNCArMzY1LDEzIEBAIGJvb2wgRXZlbnREaXNwYXRjaGVy OjpkaXNwYXRjaE1vdXNlRXZlbnQoY29uc3QgQXRvbWljU3RyaW5nJiBldmVudFR5cGUsIGludCBi dXR0CiAgICAgLy8gYXMgYSBzZXBhcmF0ZSBldmVudCBpbiBvdGhlciBET00tY29tcGxpYW50IGJy b3dzZXJzIGxpa2UgRmlyZWZveCwgYW5kIHNvIHdlIGRvIHRoZSBzYW1lLgogICAgIGlmIChldmVu dFR5cGUgPT0gZXZlbnROYW1lcygpLmNsaWNrRXZlbnQgJiYgZGV0YWlsID09IDIpIHsKICAgICAg ICAgUmVmUHRyPEV2ZW50PiBkb3VibGVDbGlja0V2ZW50ID0gTW91c2VFdmVudDo6Y3JlYXRlKGV2 ZW50TmFtZXMoKS5kYmxjbGlja0V2ZW50LAotICAgICAgICAgICAgdHJ1ZSwgY2FuY2VsYWJsZSwg bV9ub2RlLT5kb2N1bWVudCgpLT5kZWZhdWx0VmlldygpLAotICAgICAgICAgICAgZGV0YWlsLCBz Y3JlZW5YLCBzY3JlZW5ZLCBhZGp1c3RlZFBhZ2VYLCBhZGp1c3RlZFBhZ2VZLAotICAgICAgICAg ICAgY3RybEtleSwgYWx0S2V5LCBzaGlmdEtleSwgbWV0YUtleSwgYnV0dG9uLAotICAgICAgICAg ICAgcmVsYXRlZFRhcmdldCwgMCwgaXNTaW11bGF0ZWQpOwotICAgICAgICBkb3VibGVDbGlja0V2 ZW50LT5zZXRVbmRlcmx5aW5nRXZlbnQodW5kZXJseWluZ0V2ZW50LmdldCgpKTsKKyAgICAgICAg ICAgIHRydWUsIGNhbmNlbGFibGUsIG5vZGUtPmRvY3VtZW50KCktPmRlZmF1bHRWaWV3KCksCisg ICAgICAgICAgICBkZXRhaWwsIGV2ZW50Lmdsb2JhbFgoKSwgZXZlbnQuZ2xvYmFsWSgpLCBhZGp1 c3RlZFBhZ2VYLCBhZGp1c3RlZFBhZ2VZLAorICAgICAgICAgICAgZXZlbnQuY3RybEtleSgpLCBl dmVudC5hbHRLZXkoKSwgZXZlbnQuc2hpZnRLZXkoKSwgZXZlbnQubWV0YUtleSgpLCBldmVudC5i dXR0b24oKSwKKyAgICAgICAgICAgIHJlbGF0ZWRUYXJnZXQsIDAsIGZhbHNlKTsKICAgICAgICAg aWYgKGRlZmF1bHRIYW5kbGVkKQogICAgICAgICAgICAgZG91YmxlQ2xpY2tFdmVudC0+c2V0RGVm YXVsdEhhbmRsZWQoKTsKLSAgICAgICAgZGlzcGF0Y2hFdmVudChkb3VibGVDbGlja0V2ZW50KTsK KyAgICAgICAgZGlzcGF0Y2hlci5kaXNwYXRjaEV2ZW50KGRvdWJsZUNsaWNrRXZlbnQpOwogICAg ICAgICBpZiAoZG91YmxlQ2xpY2tFdmVudC0+ZGVmYXVsdEhhbmRsZWQoKSB8fCBkb3VibGVDbGlj a0V2ZW50LT5kZWZhdWx0UHJldmVudGVkKCkpCiAgICAgICAgICAgICBzd2FsbG93RXZlbnQgPSB0 cnVlOwogICAgIH0KQEAgLTM5NCwyNiArMzc5LDYgQEAgYm9vbCBFdmVudERpc3BhdGNoZXI6OmRp c3BhdGNoTW91c2VFdmVudChjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50VHlwZSwgaW50IGJ1dHQK ICAgICByZXR1cm4gc3dhbGxvd0V2ZW50OwogfQogCi12b2lkIEV2ZW50RGlzcGF0Y2hlcjo6ZGlz cGF0Y2hTaW11bGF0ZWRNb3VzZUV2ZW50KGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRUeXBlLCBQ YXNzUmVmUHRyPEV2ZW50PiB1bmRlcmx5aW5nRXZlbnQpCi17Ci0gICAgQVNTRVJUKCFldmVudERp c3BhdGNoRm9yYmlkZGVuKCkpOwotCi0gICAgYm9vbCBjdHJsS2V5ID0gZmFsc2U7Ci0gICAgYm9v bCBhbHRLZXkgPSBmYWxzZTsKLSAgICBib29sIHNoaWZ0S2V5ID0gZmFsc2U7Ci0gICAgYm9vbCBt ZXRhS2V5ID0gZmFsc2U7Ci0gICAgaWYgKFVJRXZlbnRXaXRoS2V5U3RhdGUqIGtleVN0YXRlRXZl bnQgPSBmaW5kRXZlbnRXaXRoS2V5U3RhdGUodW5kZXJseWluZ0V2ZW50LmdldCgpKSkgewotICAg ICAgICBjdHJsS2V5ID0ga2V5U3RhdGVFdmVudC0+Y3RybEtleSgpOwotICAgICAgICBhbHRLZXkg PSBrZXlTdGF0ZUV2ZW50LT5hbHRLZXkoKTsKLSAgICAgICAgc2hpZnRLZXkgPSBrZXlTdGF0ZUV2 ZW50LT5zaGlmdEtleSgpOwotICAgICAgICBtZXRhS2V5ID0ga2V5U3RhdGVFdmVudC0+bWV0YUtl eSgpOwotICAgIH0KLQotICAgIC8vIExpa2UgR2Vja28sIHdlIGp1c3QgcGFzcyAwIGZvciBldmVy eXRoaW5nIHdoZW4gd2UgbWFrZSBhIGZha2UgbW91c2UgZXZlbnQuCi0gICAgLy8gSW50ZXJuZXQg RXhwbG9yZXIgaW5zdGVhZCBnaXZlcyB0aGUgY3VycmVudCBtb3VzZSBwb3NpdGlvbiBhbmQgc3Rh dGUuCi0gICAgZGlzcGF0Y2hNb3VzZUV2ZW50KGV2ZW50VHlwZSwgMCwgMCwgMCwgMCwgMCwgMCwg Y3RybEtleSwgYWx0S2V5LCBzaGlmdEtleSwgbWV0YUtleSwgdHJ1ZSwgMCwgdW5kZXJseWluZ0V2 ZW50KTsKLX0KLQogY29uc3QgRXZlbnRDb250ZXh0KiBFdmVudERpc3BhdGNoZXI6OnRvcEV2ZW50 Q29udGV4dCgpCiB7CiAgICAgcmV0dXJuIG1fYW5jZXN0b3JzLmlzRW1wdHkoKSA/IDAgOiAmbV9h bmNlc3RvcnMubGFzdCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50RGlz cGF0Y2hlci5oIGIvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50RGlzcGF0Y2hlci5oCmluZGV4IDM3 MmM2NzhlYjJjMDViNzZkNDMwZmViZTMyYTg5MGVlNzAwNmI5YTUuLmQ0MzEyN2YzNjliYmYzMzg2 ZWVjNDA0YzRjZmU5M2I1MTI5NjkxYzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9F dmVudERpc3BhdGNoZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnREaXNwYXRjaGVy LmgKQEAgLTUxLDcgKzUxLDcgQEAgcHVibGljOgogICAgIHN0YXRpYyB2b2lkIGRpc3BhdGNoU2Nv cGVkRXZlbnQoTm9kZSosIFBhc3NSZWZQdHI8RXZlbnQ+KTsKIAogICAgIHN0YXRpYyBib29sIGRp c3BhdGNoTW91c2VFdmVudChOb2RlKiwgY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50JiwgY29uc3Qg QXRvbWljU3RyaW5nJiBldmVudFR5cGUsIGludCBjbGlja0NvdW50ID0gMCwgTm9kZSogcmVsYXRl ZFRhcmdldCA9IDApOwotICAgIHN0YXRpYyB2b2lkIGRpc3BhdGNoU2ltdWxhdGVkQ2xpY2soTm9k ZSosIFBhc3NSZWZQdHI8RXZlbnQ+IHVuZGVybHlpbmdFdmVudCwgYm9vbCBzZW5kTW91c2VFdmVu dHMgPSBmYWxzZSwgYm9vbCBzaG93UHJlc3NlZExvb2sgPSB0cnVlKTsKKyAgICBzdGF0aWMgdm9p ZCBkaXNwYXRjaFNpbXVsYXRlZENsaWNrKE5vZGUqLCBQYXNzUmVmUHRyPEV2ZW50PiB1bmRlcmx5 aW5nRXZlbnQsIGJvb2wgc2VuZE1vdXNlRXZlbnRzLCBib29sIHNob3dQcmVzc2VkTG9vayk7CiAg ICAgc3RhdGljIHZvaWQgZGlzcGF0Y2hXaGVlbEV2ZW50KE5vZGUqLCBQbGF0Zm9ybVdoZWVsRXZl bnQmKTsKIAogICAgIGJvb2wgZGlzcGF0Y2hFdmVudChQYXNzUmVmUHRyPEV2ZW50Pik7CkBAIC02 Niw3ICs2Niw2IEBAIHByaXZhdGU6CiAgICAgYm9vbCBkaXNwYXRjaE1vdXNlRXZlbnQoY29uc3Qg QXRvbWljU3RyaW5nJiBldmVudFR5cGUsIGludCBidXR0b24sIGludCBkZXRhaWwsCiAgICAgICAg IGludCBwYWdlWCwgaW50IHBhZ2VZLCBpbnQgc2NyZWVuWCwgaW50IHNjcmVlblksIGJvb2wgY3Ry bEtleSwgYm9vbCBhbHRLZXksIGJvb2wgc2hpZnRLZXksIGJvb2wgbWV0YUtleSwKICAgICAgICAg Ym9vbCBpc1NpbXVsYXRlZCwgTm9kZSogcmVsYXRlZFRhcmdldEFyZywgUGFzc1JlZlB0cjxFdmVu dD4gdW5kZXJseWluZ0V2ZW50KTsKLSAgICB2b2lkIGRpc3BhdGNoU2ltdWxhdGVkTW91c2VFdmVu dChjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50VHlwZSwgUGFzc1JlZlB0cjxFdmVudD4gdW5kZXJs eWluZ0V2ZW50KTsKIAogICAgIFZlY3RvcjxFdmVudENvbnRleHQ+IG1fYW5jZXN0b3JzOwogICAg IFJlZlB0cjxOb2RlPiBtX25vZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vTW91 c2VFdmVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTW91c2VFdmVudC5jcHAKaW5kZXggYmRk MzlkMzQzNmIyMGFkZjcxMmEyMTljOTgwZDQ5OGRjY2JhZDhmYS4uMmIzMzlkODRiYTM0ZDlkYTdk OWM0NmJlZjNjZmRlOWVlOWU1Mjk2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL01v dXNlRXZlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Nb3VzZUV2ZW50LmNwcApAQCAt MTE1LDQgKzExNSwyNSBAQCBOb2RlKiBNb3VzZUV2ZW50Ojpmcm9tRWxlbWVudCgpIGNvbnN0CiAg ICAgcmV0dXJuIHRhcmdldCgpID8gdGFyZ2V0KCktPnRvTm9kZSgpIDogMDsKIH0KIAorUGFzc1Jl ZlB0cjxTaW11bGF0ZWRNb3VzZUV2ZW50PiBTaW11bGF0ZWRNb3VzZUV2ZW50OjpjcmVhdGUoY29u c3QgQXRvbWljU3RyaW5nJiBldmVudFR5cGUsIFBhc3NSZWZQdHI8QWJzdHJhY3RWaWV3PiB2aWV3 LCBQYXNzUmVmUHRyPEV2ZW50PiB1bmRlcmx5aW5nRXZlbnQpCit7CisgICAgcmV0dXJuIGFkb3B0 UmVmKG5ldyBTaW11bGF0ZWRNb3VzZUV2ZW50KGV2ZW50VHlwZSwgdmlldywgdW5kZXJseWluZ0V2 ZW50KSk7Cit9CisKK1NpbXVsYXRlZE1vdXNlRXZlbnQ6On5TaW11bGF0ZWRNb3VzZUV2ZW50KCkK K3sKK30KKworU2ltdWxhdGVkTW91c2VFdmVudDo6U2ltdWxhdGVkTW91c2VFdmVudChjb25zdCBB dG9taWNTdHJpbmcmIGV2ZW50VHlwZSwgUGFzc1JlZlB0cjxBYnN0cmFjdFZpZXc+IHZpZXcsIFBh c3NSZWZQdHI8RXZlbnQ+IHVuZGVybHlpbmdFdmVudCkKKyAgICA6IE1vdXNlRXZlbnQoZXZlbnRU eXBlLCB0cnVlLCB0cnVlLCB2aWV3LCAwLCAwLCAwLCAwLCAwLCBmYWxzZSwgZmFsc2UsIGZhbHNl LCBmYWxzZSwgMCwgMCwgMCwgdHJ1ZSkKK3sKKyAgICBpZiAoVUlFdmVudFdpdGhLZXlTdGF0ZSog a2V5U3RhdGVFdmVudCA9IGZpbmRFdmVudFdpdGhLZXlTdGF0ZSh1bmRlcmx5aW5nRXZlbnQuZ2V0 KCkpKSB7CisgICAgICAgIG1fY3RybEtleSA9IGtleVN0YXRlRXZlbnQtPmN0cmxLZXkoKTsKKyAg ICAgICAgbV9hbHRLZXkgPSBrZXlTdGF0ZUV2ZW50LT5hbHRLZXkoKTsKKyAgICAgICAgbV9zaGlm dEtleSA9IGtleVN0YXRlRXZlbnQtPnNoaWZ0S2V5KCk7CisgICAgICAgIG1fbWV0YUtleSA9IGtl eVN0YXRlRXZlbnQtPm1ldGFLZXkoKTsKKyAgICB9CisgICAgc2V0VW5kZXJseWluZ0V2ZW50KHVu ZGVybHlpbmdFdmVudCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2RvbS9Nb3VzZUV2ZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vTW91 c2VFdmVudC5oCmluZGV4IDc0NTRiMDQ5MmQ2YmE3NjlmY2U5ZTRjYTBiZjY4OGY0ODExOGRlNWEu LjFjMGE3ZTBiM2IxZmRhZGQ0OGRlMTZmYjlkNDRmMjY5NjFjNzAxYmIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9Nb3VzZUV2ZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL01v dXNlRXZlbnQuaApAQCAtNDQsNiArNDQsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAg ICAgICByZXR1cm4gYWRvcHRSZWYobmV3IE1vdXNlRXZlbnQodHlwZSwgY2FuQnViYmxlLCBjYW5j ZWxhYmxlLCB2aWV3LCBkZXRhaWwsIHNjcmVlblgsIHNjcmVlblksIHBhZ2VYLCBwYWdlWSwKICAg ICAgICAgICAgICAgICBjdHJsS2V5LCBhbHRLZXksIHNoaWZ0S2V5LCBtZXRhS2V5LCBidXR0b24s IHJlbGF0ZWRUYXJnZXQsIGNsaXBib2FyZCwgaXNTaW11bGF0ZWQpKTsKICAgICAgICAgfQorICAg ICAgICBzdGF0aWMgUGFzc1JlZlB0cjxNb3VzZUV2ZW50PiBjcmVhdGVTaW11bGF0ZWQoY29uc3Qg QXRvbWljU3RyaW5nJiBldmVudFR5cGUsIFBhc3NSZWZQdHI8QWJzdHJhY3RWaWV3PiwgUGFzc1Jl ZlB0cjxFdmVudD4gdW5kZXJseWluZ0V2ZW50KTsKKwogICAgICAgICB2aXJ0dWFsIH5Nb3VzZUV2 ZW50KCk7CiAKICAgICAgICAgdm9pZCBpbml0TW91c2VFdmVudChjb25zdCBBdG9taWNTdHJpbmcm IHR5cGUsIGJvb2wgY2FuQnViYmxlLCBib29sIGNhbmNlbGFibGUsIFBhc3NSZWZQdHI8QWJzdHJh Y3RWaWV3PiwKQEAgLTY4LDE5ICs3MCwzMCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAg IHZpcnR1YWwgYm9vbCBpc0RyYWdFdmVudCgpIGNvbnN0OwogICAgICAgICB2aXJ0dWFsIGludCB3 aGljaCgpIGNvbnN0OwogCi0gICAgcHJpdmF0ZToKLSAgICAgICAgTW91c2VFdmVudCgpOworICAg IHByb3RlY3RlZDoKICAgICAgICAgTW91c2VFdmVudChjb25zdCBBdG9taWNTdHJpbmcmIHR5cGUs IGJvb2wgY2FuQnViYmxlLCBib29sIGNhbmNlbGFibGUsIFBhc3NSZWZQdHI8QWJzdHJhY3RWaWV3 PiwKICAgICAgICAgICAgICAgICAgICBpbnQgZGV0YWlsLCBpbnQgc2NyZWVuWCwgaW50IHNjcmVl blksIGludCBwYWdlWCwgaW50IHBhZ2VZLAogICAgICAgICAgICAgICAgICAgIGJvb2wgY3RybEtl eSwgYm9vbCBhbHRLZXksIGJvb2wgc2hpZnRLZXksIGJvb2wgbWV0YUtleSwgdW5zaWduZWQgc2hv cnQgYnV0dG9uLAogICAgICAgICAgICAgICAgICAgIFBhc3NSZWZQdHI8RXZlbnRUYXJnZXQ+IHJl bGF0ZWRUYXJnZXQsIFBhc3NSZWZQdHI8Q2xpcGJvYXJkPiBjbGlwYm9hcmQsIGJvb2wgaXNTaW11 bGF0ZWQpOwogCisgICAgcHJpdmF0ZToKKyAgICAgICAgTW91c2VFdmVudCgpOworCiAgICAgICAg IHVuc2lnbmVkIHNob3J0IG1fYnV0dG9uOwogICAgICAgICBib29sIG1fYnV0dG9uRG93bjsKICAg ICAgICAgUmVmUHRyPEV2ZW50VGFyZ2V0PiBtX3JlbGF0ZWRUYXJnZXQ7CiAgICAgICAgIFJlZlB0 cjxDbGlwYm9hcmQ+IG1fY2xpcGJvYXJkOwogICAgIH07CiAKK2NsYXNzIFNpbXVsYXRlZE1vdXNl RXZlbnQgOiBwdWJsaWMgTW91c2VFdmVudCB7CitwdWJsaWM6CisgICAgc3RhdGljIFBhc3NSZWZQ dHI8U2ltdWxhdGVkTW91c2VFdmVudD4gY3JlYXRlKGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRU eXBlLCBQYXNzUmVmUHRyPEFic3RyYWN0Vmlldz4sIFBhc3NSZWZQdHI8RXZlbnQ+IHVuZGVybHlp bmdFdmVudCk7CisgICAgdmlydHVhbCB+U2ltdWxhdGVkTW91c2VFdmVudCgpOworCitwcml2YXRl OgorICAgIFNpbXVsYXRlZE1vdXNlRXZlbnQoY29uc3QgQXRvbWljU3RyaW5nJiBldmVudFR5cGUs IFBhc3NSZWZQdHI8QWJzdHJhY3RWaWV3PiwgUGFzc1JlZlB0cjxFdmVudD4gdW5kZXJseWluZ0V2 ZW50KTsKK307CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIE1vdXNlRXZl bnRfaAo=