77626 2012-02-02 04:34:52 -0800 Make the tap highlighting work for all test cases 2012-02-02 05:54:17 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kenneth kenneth hausmann webkit.review.bot oldest_to_newest 547783 0 kenneth 2012-02-02 04:34:52 -0800 SSIA 547785 1 125113 kenneth 2012-02-02 04:35:36 -0800 Created attachment 125113 Patch 547830 2 125113 webkit.review.bot 2012-02-02 05:54:13 -0800 Comment on attachment 125113 Patch Clearing flags on attachment: 125113 Committed r106547: <http://trac.webkit.org/changeset/106547> 547831 3 webkit.review.bot 2012-02-02 05:54:17 -0800 All reviewed patches have been landed. Closing bug. 125113 2012-02-02 04:35:36 -0800 2012-02-02 05:54:12 -0800 Patch 0001-Make-the-tap-highlighting-work-for-all-test-cases.patch text/plain 9118 kenneth RnJvbSAzMDIxNGNkNWY4MGI1ZWQ4MDEwOTlmNzA0MzNhOWMxMjk1MzcyNDk0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiA8a2VubmV0aEB3 ZWJraXQub3JnPgpEYXRlOiBUaHUsIDIgRmViIDIwMTIgMTE6Mjg6MjAgKzAxMDAKU3ViamVjdDog W1BBVENIXSBNYWtlIHRoZSB0YXAgaGlnaGxpZ2h0aW5nIHdvcmsgZm9yIGFsbCB0ZXN0IGNhc2Vz CiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzc2MjYKClJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgoKQ2xlYW4gdXAgb2YgdGhlIGN1cnJlbnQgY29kZSB0byBtYWtl IGl0IG1vcmUgZ2VuZXJpYy4gTm93IHVzZXMKYWRkRm9jdXNSaW5nUmVjdHMgZm9yIGZpbmRpbmcg dGhlIGFyZWFzIHRvIGhpZ2hsaWdodC4KClRlc3RlZCBieSBjdXJyZW50IG1hbnVhbCB0ZXN0cy4K CiogcGFnZS9HZXN0dXJlVGFwSGlnaGxpZ2h0ZXIuY3BwOgooV2ViQ29yZTo6R2VzdHVyZVRhcEhp Z2hsaWdodGVyOjpwYXRoRm9yTm9kZUhpZ2hsaWdodCk6Ci0tLQogU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nICAgICAgICAgICAgICAgICAgICAgIHwgICAxNSArKysKIFNvdXJjZS9XZWJDb3JlL3Bh Z2UvR2VzdHVyZVRhcEhpZ2hsaWdodGVyLmNwcCB8ICAxNDIgKysrKysrKysrKysrLS0tLS0tLS0t LS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA4NCBpbnNlcnRpb25zKCspLCA3MyBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKaW5kZXggMjJkNzlmMC4uODNkMTY3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDEyLTAyLTAyICBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Vi a2l0Lm9yZz4KKworICAgICAgICBNYWtlIHRoZSB0YXAgaGlnaGxpZ2h0aW5nIHdvcmsgZm9yIGFs bCB0ZXN0IGNhc2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD03NzYyNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIENsZWFuIHVwIG9mIHRoZSBjdXJyZW50IGNvZGUgdG8gbWFrZSBpdCBtb3JlIGdlbmVyaWMu IE5vdyB1c2VzCisgICAgICAgIGFkZEZvY3VzUmluZ1JlY3RzIGZvciBmaW5kaW5nIHRoZSBhcmVh cyB0byBoaWdobGlnaHQuCisKKyAgICAgICAgVGVzdGVkIGJ5IGN1cnJlbnQgbWFudWFsIHRlc3Rz LgorCisgICAgICAgICogcGFnZS9HZXN0dXJlVGFwSGlnaGxpZ2h0ZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6R2VzdHVyZVRhcEhpZ2hsaWdodGVyOjpwYXRoRm9yTm9kZUhpZ2hsaWdodCk6CisK IDIwMTItMDItMDIgIFJhdWwgSHVkZWEgIDxyaHVkZWFAYWRvYmUuY29tPgogCiAgICAgICAgIFJl Z2lvbnMgc2hvdWxkIGlnbm9yZSB0aGUgc2F2ZWQgY3VycmVudFJlbmRlckZsb3dUaHJlYWQgZHVy aW5nIHJlcGFpbnRpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvR2VzdHVyZVRh cEhpZ2hsaWdodGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvR2VzdHVyZVRhcEhpZ2hsaWdo dGVyLmNwcAppbmRleCA3NTQ4YWJlLi4yMDM4YjBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0dlc3R1cmVUYXBIaWdobGlnaHRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9HZXN0dXJlVGFwSGlnaGxpZ2h0ZXIuY3BwCkBAIC04MSw0MSArODEsNDIgQEAgQWZmaW5lVHJh bnNmb3JtIGxvY2FsVG9BYnNvbHV0ZVRyYW5zZm9ybShjb25zdCBSZW5kZXJPYmplY3QqIG8pCiAg ICAgcmV0dXJuIHRyYW5zZm9ybTsKIH0KIAotUGF0aCBwYXRoRm9yUmVuZGVyQm94KFJlbmRlckJv eCogbykKK2lubGluZSBib29sIGNvbnRhaW5zKGNvbnN0IExheW91dFJlY3QmIHJlY3QsIGludCB4 KQogewotICAgIEFTU0VSVChvKTsKLSAgICBjb25zdCBpbnQgcm91bmRpbmcgPSA0OwotCi0gICAg TGF5b3V0UmVjdCBjb250ZW50Qm94OwotICAgIExheW91dFJlY3QgcGFkZGluZ0JveDsKLSAgICBM YXlvdXRSZWN0IGJvcmRlckJveDsKLQotICAgIGNvbnRlbnRCb3ggPSBvLT5jb250ZW50Qm94UmVj dCgpOwotICAgIHBhZGRpbmdCb3ggPSBMYXlvdXRSZWN0KAotICAgICAgICAgICAgY29udGVudEJv eC54KCkgLSBvLT5wYWRkaW5nTGVmdCgpLAotICAgICAgICAgICAgY29udGVudEJveC55KCkgLSBv LT5wYWRkaW5nVG9wKCksCi0gICAgICAgICAgICBjb250ZW50Qm94LndpZHRoKCkgKyBvLT5wYWRk aW5nTGVmdCgpICsgby0+cGFkZGluZ1JpZ2h0KCksCi0gICAgICAgICAgICBjb250ZW50Qm94Lmhl aWdodCgpICsgby0+cGFkZGluZ1RvcCgpICsgby0+cGFkZGluZ0JvdHRvbSgpKTsKLSAgICBib3Jk ZXJCb3ggPSBMYXlvdXRSZWN0KAotICAgICAgICAgICAgcGFkZGluZ0JveC54KCkgLSBvLT5ib3Jk ZXJMZWZ0KCksCi0gICAgICAgICAgICBwYWRkaW5nQm94LnkoKSAtIG8tPmJvcmRlclRvcCgpLAot ICAgICAgICAgICAgcGFkZGluZ0JveC53aWR0aCgpICsgby0+Ym9yZGVyTGVmdCgpICsgby0+Ym9y ZGVyUmlnaHQoKSwKLSAgICAgICAgICAgIHBhZGRpbmdCb3guaGVpZ2h0KCkgKyBvLT5ib3JkZXJU b3AoKSArIG8tPmJvcmRlckJvdHRvbSgpKTsKKyAgICByZXR1cm4gIXJlY3QuaXNFbXB0eSgpICYm IHggPj0gcmVjdC54KCkgJiYgeCA8PSByZWN0Lm1heFgoKTsKK30KIAotICAgIEZsb2F0UmVjdCBy ZWN0KGJvcmRlckJveCk7Ci0gICAgcmVjdC5pbmZsYXRlKHJvdW5kaW5nKTsKK2lubGluZSBib29s IHN0cmlrZXMoY29uc3QgTGF5b3V0UmVjdCYgYSwgY29uc3QgTGF5b3V0UmVjdCYgYikKK3sKKyAg ICByZXR1cm4gIWEuaXNFbXB0eSgpICYmICFiLmlzRW1wdHkoKQorICAgICAgICAmJiBhLngoKSA8 PSBiLm1heFgoKSAmJiBiLngoKSA8PSBhLm1heFgoKQorICAgICAgICAmJiBhLnkoKSA8PSBiLm1h eFkoKSAmJiBiLnkoKSA8PSBhLm1heFkoKTsKK30KIAotICAgIHJlY3QubW92ZSh0b0xheW91dFNp emUob3duZXJGcmFtZVRvTWFpbkZyYW1lT2Zmc2V0KG8pKSk7CitpbmxpbmUgdm9pZCBzaGlmdFhF ZGdlc1RvQ29udGFpbklmU3RyaWtlcyhMYXlvdXRSZWN0JiByZWN0LCBjb25zdCBMYXlvdXRSZWN0 JiBvdGhlcikKK3sKKyAgICBpbnQgbGVmdFNpZGUgPSByZWN0LngoKTsKKyAgICBpbnQgcmlnaHRT aWRlID0gcmVjdC5tYXhYKCk7CiAKLSAgICBQYXRoIHBhdGg7Ci0gICAgRmxvYXRTaXplIHJvdW5k ZWQocm91bmRpbmcgKiAxLjgsIHJvdW5kaW5nICogMS44KTsKLSAgICBwYXRoLmFkZFJvdW5kZWRS ZWN0KHJlY3QsIHJvdW5kZWQpOworICAgIGlmICghb3RoZXIuaXNFbXB0eSgpICYmIHN0cmlrZXMo cmVjdCwgb3RoZXIpKSB7CisgICAgICAgIGxlZnRTaWRlID0gc3RkOjptaW4obGVmdFNpZGUsIG90 aGVyLngoKSk7CisgICAgICAgIHJpZ2h0U2lkZSA9IHN0ZDo6bWF4KHJpZ2h0U2lkZSwgb3RoZXIu bWF4WCgpKTsKKyAgICB9CiAKLSAgICByZXR1cm4gcGF0aDsKKyAgICByZWN0LnNldFgobGVmdFNp ZGUpOworICAgIHJlY3Quc2V0V2lkdGgocmlnaHRTaWRlIC0gbGVmdFNpZGUpOwogfQogCi12b2lk IGFkZFJlY3RXaXRoUm91bmRlZENvcm5lcnMoUGF0aCYgcGF0aCwgY29uc3QgTGF5b3V0UmVjdCYg cmVjdCwgYm9vbCB0b3BMZWZ0LCBib29sIHRvcFJpZ2h0LCBib29sIGJvdHRvbUxlZnQsIGJvb2wg Ym90dG9tUmlnaHQpCitpbmxpbmUgdm9pZCBhZGRIaWdobGlnaHRSZWN0KFBhdGgmIHBhdGgsIGNv bnN0IExheW91dFJlY3QmIHJlY3QsIGNvbnN0IExheW91dFJlY3QmIHByZXYsIGNvbnN0IExheW91 dFJlY3QmIG5leHQpCiB7CisgICAgLy8gVGhlIHJvdW5kaW5nIGNoZWNrIGRlcGVuZHMgb24gdGhl IHJlY3RzIG5vdCBpbnRlcnNlY3RpbmcgZWFjaG90aGVyLAorICAgIC8vIG9yIGJlaW5nIGNvbnRh aW5lZCBmb3IgdGhhdCBtYXR0ZXIuCisgICAgQVNTRVJUKCFyZWN0LmludGVyc2VjdHMocHJldikp OworICAgIEFTU0VSVCghcmVjdC5pbnRlcnNlY3RzKG5leHQpKTsKKworICAgIGlmIChyZWN0Lmlz RW1wdHkoKSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgY29uc3QgaW50IHJvdW5kaW5nID0gNDsK IAogICAgIEZsb2F0UmVjdCBjb3B5KHJlY3QpOwpAQCAtMTI2LDYyICsxMjcsNjAgQEAgdm9pZCBh ZGRSZWN0V2l0aFJvdW5kZWRDb3JuZXJzKFBhdGgmIHBhdGgsIGNvbnN0IExheW91dFJlY3QmIHJl Y3QsIGJvb2wgdG9wTGVmdCwKICAgICBGbG9hdFNpemUgc3F1YXJlZCgwLCAwKTsKIAogICAgIHBh dGguYWRkQmV6aWVyc0ZvclJvdW5kZWRSZWN0KGNvcHksCi0gICAgICAgICAgICB0b3BMZWZ0ID8g cm91bmRlZCA6IHNxdWFyZWQsIHRvcFJpZ2h0ID8gcm91bmRlZCA6IHNxdWFyZWQsCi0gICAgICAg ICAgICBib3R0b21MZWZ0ID8gcm91bmRlZCA6IHNxdWFyZWQsIGJvdHRvbVJpZ2h0ID8gcm91bmRl ZCA6IHNxdWFyZWQpOwotfQotCi1pbmxpbmUgYm9vbCBjb250YWlucyhMYXlvdXRSZWN0IHJlY3Qs IGludCB4KQotewotICAgIHJldHVybiAhcmVjdC5pc0VtcHR5KCkgJiYgeCA+PSByZWN0LngoKSAm JiB4IDw9IHJlY3QubWF4WCgpOworICAgICAgICAgICAgY29udGFpbnMocHJldiwgcmVjdC54KCkp ID8gc3F1YXJlZCA6IHJvdW5kZWQsCisgICAgICAgICAgICBjb250YWlucyhwcmV2LCByZWN0Lm1h eFgoKSkgPyBzcXVhcmVkIDogcm91bmRlZCwKKyAgICAgICAgICAgIGNvbnRhaW5zKG5leHQsIHJl Y3QueCgpKSA/IHNxdWFyZWQgOiByb3VuZGVkLAorICAgICAgICAgICAgY29udGFpbnMobmV4dCwg cmVjdC5tYXhYKCkpID8gc3F1YXJlZCA6IHJvdW5kZWQpOwogfQogCi1QYXRoIHBhdGhGb3JSZW5k ZXJJbmxpbmUoUmVuZGVySW5saW5lKiBvKQorUGF0aCBwYXRoRm9yUmVuZGVyZXIoUmVuZGVyT2Jq ZWN0KiBvKQogewogICAgIEFTU0VSVChvKTsKICAgICBQYXRoIHBhdGg7CiAKICAgICBWZWN0b3I8 TGF5b3V0UmVjdD4gcmVjdHM7Ci0gICAgby0+YWJzb2x1dGVSZWN0cyhyZWN0cywgLyogYWNjLiBv ZmZzZXQgKi8gb3duZXJGcmFtZVRvTWFpbkZyYW1lT2Zmc2V0KG8pKTsKKyAgICBvLT5hZGRGb2N1 c1JpbmdSZWN0cyhyZWN0cywgLyogYWNjLiBvZmZzZXQgKi8gb3duZXJGcmFtZVRvTWFpbkZyYW1l T2Zmc2V0KG8pKTsKIAotICAgIExheW91dFJlY3QgZmlyc3QgPSByZWN0cy5zaXplKCkgPyByZWN0 cy5maXJzdCgpIDogTGF5b3V0UmVjdCgpOwotICAgIExheW91dFJlY3QgbGFzdCA9IHJlY3RzLnNp emUoKSA+IDEgPyByZWN0cy5sYXN0KCkgOiBMYXlvdXRSZWN0KCk7Ci0gICAgTGF5b3V0UmVjdCBt aWRkbGU7CisgICAgLy8gVGhlIGJhc2ljIGlkZWEgaXMgdG8gYWxsb3cgdXAgdG8gdGhyZWUgZGlm ZmVyZW50IGJveGVzIGluIG9yZGVyIHRvIGhpZ2hsaWdodAorICAgIC8vIHRleHQgd2l0aCBsaW5l IGJyZWFrcyBtb3JlIG5pY2VyIHRoYW4gdXNpbmcgYSBib3VuZGluZyBib3guCisKKyAgICAvLyBN ZXJnZSBhbGwgY2VudGVyIGJveGVzIChhbGwgYnV0IHRoZSBmaXJzdCBhbmQgdGhlIGxhc3QpLgor ICAgIExheW91dFJlY3QgbWlkOwogICAgIGZvciAoaW50IGkgPSAxOyBpIDwgcmVjdHMuc2l6ZSgp IC0gMTsgKytpKQotICAgICAgICBtaWRkbGUudW5pdGVJZk5vblplcm8ocmVjdHMuYXQoaSkpOwot Ci0gICAgaWYgKCFtaWRkbGUuaXNFbXB0eSgpKSB7Ci0gICAgICAgIGludCBsZWZ0U2lkZSA9IG1p ZGRsZS54KCk7Ci0gICAgICAgIGludCByaWdodFNpZGUgPSBtaWRkbGUubWF4WCgpOwotCi0gICAg ICAgIGlmICghZmlyc3QuaXNFbXB0eSgpKSB7Ci0gICAgICAgICAgICBsZWZ0U2lkZSA9IHN0ZDo6 bWluKGxlZnRTaWRlLCBmaXJzdC54KCkpOwotICAgICAgICAgICAgcmlnaHRTaWRlID0gc3RkOjpt YXgocmlnaHRTaWRlLCBmaXJzdC5tYXhYKCkpOwotICAgICAgICB9Ci0gICAgICAgIGlmICghbGFz dC5pc0VtcHR5KCkpIHsKLSAgICAgICAgICAgIGxlZnRTaWRlID0gc3RkOjptaW4obGVmdFNpZGUs IGxhc3QueCgpKTsKLSAgICAgICAgICAgIHJpZ2h0U2lkZSA9IHN0ZDo6bWF4KHJpZ2h0U2lkZSwg bGFzdC5tYXhYKCkpOwotICAgICAgICB9Ci0KLSAgICAgICAgbWlkZGxlLnNldFgobGVmdFNpZGUp OwotICAgICAgICBtaWRkbGUuc2V0V2lkdGgocmlnaHRTaWRlIC0gbGVmdFNpZGUpOworICAgICAg ICBtaWQudW5pdGVJZk5vblplcm8ocmVjdHMuYXQoaSkpOworCisgICAgVmVjdG9yPExheW91dFJl Y3Q+IGRyYXdhYmxlUmVjdHM7CisKKyAgICBpZiAoIW1pZC5pc0VtcHR5KCkpCisgICAgICAgIGRy YXdhYmxlUmVjdHMuYXBwZW5kKG1pZCk7CisKKyAgICAvLyBBZGQgdGhlIGZpcnN0IGJveCwgYnV0 IG1lcmdlIGl0IHdpdGggdGhlIGNlbnRlciBib3hlcyBpZiBpdCBpbnRlcnNlY3RzLgorICAgIGlm IChyZWN0cy5zaXplKCkgJiYgIXJlY3RzLmZpcnN0KCkuaXNFbXB0eSgpKSB7CisgICAgICAgIGlm IChkcmF3YWJsZVJlY3RzLnNpemUoKSAmJiBkcmF3YWJsZVJlY3RzLmxhc3QoKS5pbnRlcnNlY3Rz KHJlY3RzLmZpcnN0KCkpKQorICAgICAgICAgICAgZHJhd2FibGVSZWN0cy5sYXN0KCkudW5pdGUo cmVjdHMuZmlyc3QoKSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGRyYXdhYmxlUmVjdHMu cHJlcGVuZChyZWN0cy5maXJzdCgpKTsKICAgICB9CiAKLSAgICBpZiAoIWZpcnN0LmlzRW1wdHko KSkgewotICAgICAgICBib29sIHJvdW5kQm90dG9tTGVmdCA9ICFjb250YWlucyhtaWRkbGUsIGZp cnN0LngoKSkgJiYgIWNvbnRhaW5zKGxhc3QsIGZpcnN0LngoKSk7Ci0gICAgICAgIGJvb2wgcm91 bmRCb3R0b21SaWdodCA9ICFjb250YWlucyhtaWRkbGUsIGZpcnN0Lm1heFgoKSkgJiYgIWNvbnRh aW5zKGxhc3QsIGZpcnN0Lm1heFgoKSk7Ci0gICAgICAgIGFkZFJlY3RXaXRoUm91bmRlZENvcm5l cnMocGF0aCwgZmlyc3QsIC8qIHJvdW5kVG9wTGVmdCAqLyB0cnVlLCAvKiByb3VuZFRvcFJpZ2h0 ICovIHRydWUsIHJvdW5kQm90dG9tTGVmdCwgcm91bmRCb3R0b21SaWdodCk7CisgICAgLy8gQWRk IHRoZSBsYXN0IGJveCwgYnV0IG1lcmdlIGl0IHdpdGggdGhlIGNlbnRlciBib3hlcyBpZiBpdCBp bnRlcnNlY3RzLgorICAgIGlmIChyZWN0cy5zaXplKCkgPiAxICYmICFyZWN0cy5sYXN0KCkuaXNF bXB0eSgpKSB7CisgICAgICAgIGlmIChkcmF3YWJsZVJlY3RzLnNpemUoKSAmJiBkcmF3YWJsZVJl Y3RzLmxhc3QoKS5pbnRlcnNlY3RzKHJlY3RzLmxhc3QoKSkpCisgICAgICAgICAgICBkcmF3YWJs ZVJlY3RzLmxhc3QoKS51bml0ZShyZWN0cy5sYXN0KCkpOworICAgICAgICBlbHNlCisgICAgICAg ICAgICBkcmF3YWJsZVJlY3RzLmFwcGVuZChyZWN0cy5sYXN0KCkpOwogICAgIH0KIAotICAgIGlm ICghbWlkZGxlLmlzRW1wdHkoKSkgewotICAgICAgICBib29sIHJvdW5kVG9wTGVmdCA9ICFjb250 YWlucyhmaXJzdCwgbWlkZGxlLngoKSk7Ci0gICAgICAgIGJvb2wgcm91bmRCb3R0b21SaWdodCA9 ICFjb250YWlucyhsYXN0LCBtaWRkbGUubWF4WCgpKTsKLSAgICAgICAgYWRkUmVjdFdpdGhSb3Vu ZGVkQ29ybmVycyhwYXRoLCBtaWRkbGUsIHJvdW5kVG9wTGVmdCwgLyogcm91bmRUb3BSaWdodCAq LyBmYWxzZSwgLyogcm91bmRCb3R0b21MZWZ0ICovIGZhbHNlLCByb3VuZEJvdHRvbVJpZ2h0KTsK KyAgICAvLyBBZGp1c3QgbWlkZGxlIHRvIGJvdW5kYXJpZXMgb2YgZmlyc3QgYW5kIGxhc3QuCisg ICAgaWYgKGRyYXdhYmxlUmVjdHMuc2l6ZSgpID09IDMpIHsKKyAgICAgICAgTGF5b3V0UmVjdCYg bWlkZGxlID0gZHJhd2FibGVSZWN0cy5hdCgxKTsKKyAgICAgICAgc2hpZnRYRWRnZXNUb0NvbnRh aW5JZlN0cmlrZXMobWlkZGxlLCBkcmF3YWJsZVJlY3RzLmF0KDApKTsKKyAgICAgICAgc2hpZnRY RWRnZXNUb0NvbnRhaW5JZlN0cmlrZXMobWlkZGxlLCBkcmF3YWJsZVJlY3RzLmF0KDIpKTsKICAg ICB9CiAKLSAgICBpZiAoIWxhc3QuaXNFbXB0eSgpKSB7Ci0gICAgICAgIGJvb2wgcm91bmRUb3BM ZWZ0ID0gIWNvbnRhaW5zKG1pZGRsZSwgbGFzdC54KCkpICYmICFjb250YWlucyhmaXJzdCwgbGFz dC54KCkpOwotICAgICAgICBib29sIHJvdW5kVG9wUmlnaHQgPSAhY29udGFpbnMobWlkZGxlLCBs YXN0Lm1heFgoKSkgJiYgIWNvbnRhaW5zKGZpcnN0LCBsYXN0Lm1heFgoKSk7Ci0gICAgICAgIGFk ZFJlY3RXaXRoUm91bmRlZENvcm5lcnMocGF0aCwgbGFzdCwgcm91bmRUb3BMZWZ0LCByb3VuZFRv cFJpZ2h0LCAvKiByb3VuZEJvdHRvbUxlZnQgKi8gdHJ1ZSwgLyogcm91bmRCb3R0b21SaWdodCAq LyB0cnVlKTsKKyAgICBmb3IgKGludCBpID0gMDsgaSA8IGRyYXdhYmxlUmVjdHMuc2l6ZSgpOyAr K2kpIHsKKyAgICAgICAgTGF5b3V0UmVjdCBwcmV2ID0gKGkgLSAxKSA+PSAwID8gZHJhd2FibGVS ZWN0cy5hdChpIC0gMSkgOiBMYXlvdXRSZWN0KCk7CisgICAgICAgIExheW91dFJlY3QgbmV4dCA9 IChpICsgMSkgPCBkcmF3YWJsZVJlY3RzLnNpemUoKSA/IGRyYXdhYmxlUmVjdHMuYXQoaSArIDEp IDogTGF5b3V0UmVjdCgpOworICAgICAgICBhZGRIaWdobGlnaHRSZWN0KHBhdGgsIGRyYXdhYmxl UmVjdHMuYXQoaSksIHByZXYsIG5leHQpOwogICAgIH0KIAogICAgIHJldHVybiBwYXRoOwpAQCAt MTk5LDEyICsxOTgsOSBAQCBQYXRoIHBhdGhGb3JOb2RlSGlnaGxpZ2h0KGNvbnN0IE5vZGUqIG5v ZGUpCiAgICAgaWYgKCFyZW5kZXJlciB8fCAoIXJlbmRlcmVyLT5pc0JveCgpICYmICFyZW5kZXJl ci0+aXNSZW5kZXJJbmxpbmUoKSkpCiAgICAgICAgIHJldHVybiBwYXRoOwogCi0gICAgaWYgKHJl bmRlcmVyLT5pc0JveCgpKQotICAgICAgICBwYXRoID0gcGF0aEZvclJlbmRlckJveCh0b1JlbmRl ckJveChyZW5kZXJlcikpOwotICAgIGVsc2UKLSAgICAgICAgcGF0aCA9IHBhdGhGb3JSZW5kZXJJ bmxpbmUodG9SZW5kZXJJbmxpbmUocmVuZGVyZXIpKTsKLQorICAgIHBhdGggPSBwYXRoRm9yUmVu ZGVyZXIocmVuZGVyZXIpOwogICAgIHBhdGgudHJhbnNmb3JtKGxvY2FsVG9BYnNvbHV0ZVRyYW5z Zm9ybShyZW5kZXJlcikpOworCiAgICAgcmV0dXJuIHBhdGg7CiB9CiAKLS0gCjEuNy41LjQKCg==