117647 2013-06-14 11:55:46 -0700 WKPageFindStringMatches ignores the kWKFindOptionsBackwards option 2013-06-14 15:21:58 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 enrica enrica buildbot rniwa oldest_to_newest 900615 0 enrica 2013-06-14 11:55:46 -0700 The API will always return the matched ranges in the DOM order and that is the expected behavior, but it should respect the backwards options when considering the match after the user selection. <rdar://problem/13881024> 900638 1 204733 enrica 2013-06-14 13:31:36 -0700 Created attachment 204733 Patch 900648 2 204733 buildbot 2013-06-14 14:16:04 -0700 Comment on attachment 204733 Patch Attachment 204733 did not pass mac-ews (mac): Output: http://webkit-queues.appspot.com/results/846302 900652 3 204733 darin 2013-06-14 14:25:45 -0700 Comment on attachment 204733 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=204733&action=review I think the test coverage might still be a bit light. It would be good to exercise even more edge cases. No specific ideas for that, though. r=me if you fix the header and thus fix the build > Source/WebKit2/Shared/API/c/WKFindOptions.h:45 > +const int kWKFindResultNoMatchAfterUserSelection = -1; Since this is a C header we can’t use: const int kWKFindResultNoMatchAfterUserSelection = -1; We can follow the CoreFoundation style and use an enum for this: enum { kWKFindResultNoMatchAfterUserSelection = -1 }; Or we can perhaps use this: static const int kWKFindResultNoMatchAfterUserSelection = -1; This is why the Mac build is failing. 900670 4 enrica 2013-06-14 15:21:58 -0700 Fixed header file to use enum. Committed revision 151607. 204733 2013-06-14 13:31:36 -0700 2013-06-14 14:25:45 -0700 Patch findbackwards.txt text/plain 14846 enrica SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MTYwNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEzLTA2LTE0ICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgV0tQYWdlRmluZFN0cmluZ01h dGNoZXMgaWdub3JlcyB0aGUga1dLRmluZE9wdGlvbnNCYWNrd2FyZHMgb3B0aW9uLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE3NjQ3CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8xMzg4MTAyND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFRoZSBBUEkgcmV0dXJucyB0aGUgbWF0Y2hlZCBy YW5nZXMgaW4gdGhlIERPTSBvcmRlciByZWdhcmRsZXNzIG9mIHRoZQorICAgICAgICBmaW5kIGRp cmVjdGlvbiwgYnV0IHRoZSBpbmRleCBvZiB0aGUgZmlyc3QgbWF0Y2ggYWZ0ZXIgdGhlIHVzZXIg c2VsZWN0aW9uCisgICAgICAgIHNob3VsZCB0YWtlIHRoZSBmaW5kIGRpcmVjdGlvbiBpbnRvIGFj Y291bnQuCisKKyAgICAgICAgRXh0ZW5kZWQgZXhpc3RpbmcgdGVzdCBpbiBUZXN0V2ViS2l0QVBJ LgorCisgICAgICAgICogcGFnZS9QYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OmZp bmRTdHJpbmdNYXRjaGluZ1Jhbmdlcyk6IEFkZGVkIGhhbmRsaW5nIG9mIHRoZSBCYWNrd2FyZHMg Y2FzZS4KKyAgICAgICAgKiBwYWdlL1BhZ2UuaDogRml4ZWQgaW5jb3JyZWN0IG5hbWUgb2YgdGhl IGVudW0uCisKIDIwMTMtMDYtMTQgIEFycGl0YSBCYWh1Z3VuYSAgPGEuYmFoQHNhbXN1bmcuY29t PgogCiAgICAgICAgIEVkaXRpbmc6IHdyb25nIHRleHQgcG9zaXRpb24gd2hlbiB5b3UgY2xpY2sg ZW50ZXIgb24gdGhlIHRleHQgYmVoaW5kIHRoZSBpbWFnZQpJbmRleDogU291cmNlL1dlYkNvcmUv cGFnZS9QYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3Bw CShyZXZpc2lvbiAxNTE1NzApCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC02MDksMTIgKzYwOSwyMSBAQCB2b2lkIFBhZ2U6OmZpbmRTdHJpbmdNYXRj aGluZ1Jhbmdlcyhjb25zCiAgICAgICAgIHJldHVybjsKIAogICAgIGlmIChmcmFtZVdpdGhTZWxl Y3Rpb24pIHsKLSAgICAgICAgaW5kZXhGb3JTZWxlY3Rpb24gPSBOb01hdGNoQmVmb3JlVXNlclNl bGVjdGlvbjsKKyAgICAgICAgaW5kZXhGb3JTZWxlY3Rpb24gPSBOb01hdGNoQWZ0ZXJVc2VyU2Vs ZWN0aW9uOwogICAgICAgICBSZWZQdHI8UmFuZ2U+IHNlbGVjdGVkUmFuZ2UgPSBmcmFtZVdpdGhT ZWxlY3Rpb24tPnNlbGVjdGlvbigpLT5zZWxlY3Rpb24oKS5maXJzdFJhbmdlKCk7Ci0gICAgICAg IGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbWF0Y2hSYW5nZXMtPnNpemUoKTsgKytpKSB7Ci0gICAg ICAgICAgICBpZiAoc2VsZWN0ZWRSYW5nZS0+Y29tcGFyZUJvdW5kYXJ5UG9pbnRzKFJhbmdlOjpT VEFSVF9UT19FTkQsIG1hdGNoUmFuZ2VzLT5hdChpKS5nZXQoKSwgSUdOT1JFX0VYQ0VQVElPTikg PCAwKSB7Ci0gICAgICAgICAgICAgICAgaW5kZXhGb3JTZWxlY3Rpb24gPSBpOwotICAgICAgICAg ICAgICAgIGJyZWFrOworICAgICAgICBpZiAob3B0aW9ucyAmIEJhY2t3YXJkcykgeworICAgICAg ICAgICAgZm9yIChzaXplX3QgaSA9IG1hdGNoUmFuZ2VzLT5zaXplKCk7IGkgPiAwOyAtLWkpIHsK KyAgICAgICAgICAgICAgICBpZiAoc2VsZWN0ZWRSYW5nZS0+Y29tcGFyZUJvdW5kYXJ5UG9pbnRz KFJhbmdlOjpTVEFSVF9UT19FTkQsIG1hdGNoUmFuZ2VzLT5hdChpIC0gMSkuZ2V0KCksIElHTk9S RV9FWENFUFRJT04pID4gMCkgeworICAgICAgICAgICAgICAgICAgICBpbmRleEZvclNlbGVjdGlv biA9IGkgLSAxOworICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICB9 CisgICAgICAgICAgICB9CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBmb3IgKHNpemVf dCBpID0gMDsgaSA8IG1hdGNoUmFuZ2VzLT5zaXplKCk7ICsraSkgeworICAgICAgICAgICAgICAg IGlmIChzZWxlY3RlZFJhbmdlLT5jb21wYXJlQm91bmRhcnlQb2ludHMoUmFuZ2U6OlNUQVJUX1RP X0VORCwgbWF0Y2hSYW5nZXMtPmF0KGkpLmdldCgpLCBJR05PUkVfRVhDRVBUSU9OKSA8IDApIHsK KyAgICAgICAgICAgICAgICAgICAgaW5kZXhGb3JTZWxlY3Rpb24gPSBpOworICAgICAgICAgICAg ICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAg IH0KICAgICB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAkocmV2aXNpb24gMTUxNTcwKQorKysgU291cmNl L1dlYkNvcmUvcGFnZS9QYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTI0Niw4ICsyNDYsOCBAQCBw dWJsaWM6CiAgICAgLy8gVXBvbiByZXR1cm4sIGluZGV4Rm9yU2VsZWN0aW9uIHdpbGwgYmUgb25l IG9mIHRoZSBmb2xsb3dpbmc6CiAgICAgLy8gMCBpZiB0aGVyZSBpcyBubyB1c2VyIHNlbGVjdGlv bgogICAgIC8vIHRoZSBpbmRleCBvZiB0aGUgZmlyc3QgcmFuZ2UgYWZ0ZXIgdGhlIHVzZXIgc2Vs ZWN0aW9uCi0gICAgLy8gTm9NYXRjaEJlZm9yZVVzZXJTZWxlY3Rpb24gaWYgdGhlcmUgaXMgbm8g bWF0Y2hpbmcgdGV4dCBhZnRlciB0aGUgdXNlciBzZWxlY3Rpb24uCi0gICAgZW51bSB7IE5vTWF0 Y2hCZWZvcmVVc2VyU2VsZWN0aW9uID0gLTEgfTsKKyAgICAvLyBOb01hdGNoQWZ0ZXJVc2VyU2Vs ZWN0aW9uIGlmIHRoZXJlIGlzIG5vIG1hdGNoaW5nIHRleHQgYWZ0ZXIgdGhlIHVzZXIgc2VsZWN0 aW9uLgorICAgIGVudW0geyBOb01hdGNoQWZ0ZXJVc2VyU2VsZWN0aW9uID0gLTEgfTsKICAgICB2 b2lkIGZpbmRTdHJpbmdNYXRjaGluZ1Jhbmdlcyhjb25zdCBTdHJpbmcmLCBGaW5kT3B0aW9ucywg aW50IG1heENvdW50LCBWZWN0b3I8UmVmUHRyPFJhbmdlPiA+KiwgaW50JiBpbmRleEZvclNlbGVj dGlvbik7CiAjaWYgUExBVEZPUk0oTUFDKQogICAgIHZvaWQgYWRkU2NoZWR1bGVQYWlyKFBhc3NS ZWZQdHI8U2NoZWR1bGVQYWlyPik7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNTE2MDQpCisr KyBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMiBA QAorMjAxMy0wNi0xNCAgRW5yaWNhIENhc3VjY2kgIDxlbnJpY2FAYXBwbGUuY29tPgorCisgICAg ICAgIFdLUGFnZUZpbmRTdHJpbmdNYXRjaGVzIGlnbm9yZXMgdGhlIGtXS0ZpbmRPcHRpb25zQmFj a3dhcmRzIG9wdGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTExNzY0NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTM4ODEwMjQ+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBUaGUgQVBJ IHJldHVybnMgdGhlIG1hdGNoZWQgcmFuZ2VzIGluIHRoZSBET00gb3JkZXIgcmVnYXJkbGVzcyBv ZiB0aGUKKyAgICAgICAgZmluZCBkaXJlY3Rpb24sIGJ1dCB0aGUgaW5kZXggb2YgdGhlIGZpcnN0 IG1hdGNoIGFmdGVyIHRoZSB1c2VyIHNlbGVjdGlvbgorICAgICAgICBzaG91bGQgdGFrZSB0aGUg ZmluZCBkaXJlY3Rpb24gaW50byBhY2NvdW50LgorCisgICAgICAgIEV4dGVuZGVkIGV4aXN0aW5n IHRlc3QgaW4gVGVzdFdlYktpdEFQSS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFNoYXJlZC9BUEkvYy9XS0ZpbmRPcHRpb25zLmg6IEFkZGVkIGNv bnN0YW50IGZvciB0aGUgY2FzZSB3aGVyZSB0aGVyZSBhcmUKKyAgICAgICAgbm8gbWF0Y2hlcyBh ZnRlciB0aGUgdXNlciBzZWxlY3Rpb24gaW4gdGhlIGRpcmVjdGlvbiBvZiB0aGUgZmluZC4KKwog MjAxMy0wNi0xNCAgQW5kcmVzIEdvbWV6ICA8YWdvbWV6QGlnYWxpYS5jb20+CiAKICAgICAgICAg W0dUS10gQ29tcGlsYXRpb24gcHJvYmxlbXMgLSBoYi5oIG5vdCBmb3VuZApJbmRleDogU291cmNl L1dlYktpdDIvU2hhcmVkL0FQSS9jL1dLRmluZE9wdGlvbnMuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tGaW5kT3B0aW9ucy5oCShyZXZpc2lvbiAxNTE1NzAp CisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tGaW5kT3B0aW9ucy5oCSh3b3JraW5n IGNvcHkpCkBAIC00Miw2ICs0Miw4IEBAIGVudW0gewogfTsKIHR5cGVkZWYgdWludDMyX3QgV0tG aW5kT3B0aW9uczsKIAorY29uc3QgaW50IGtXS0ZpbmRSZXN1bHROb01hdGNoQWZ0ZXJVc2VyU2Vs ZWN0aW9uID0gLTE7CisKICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2VuZGlmCkluZGV4OiBUb29s cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNTE2 MDQpCisrKyBUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMCBAQAor MjAxMy0wNi0xNCAgRW5yaWNhIENhc3VjY2kgIDxlbnJpY2FAYXBwbGUuY29tPgorCisgICAgICAg IFdLUGFnZUZpbmRTdHJpbmdNYXRjaGVzIGlnbm9yZXMgdGhlIGtXS0ZpbmRPcHRpb25zQmFja3dh cmRzIG9wdGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExNzY0NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTM4ODEwMjQ+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBUaGUgdGVzdCBu b3cgdXNlcyBjb250ZW50IHdpdGggYSBzZWxlY3Rpb24gYW5kIHRlc3RzIGJvdGgKKyAgICAgICAg Zm9yd2FyZHMgYW5kIGJhY2t3YXJkIGZpbmQgYXMgd2VsbCBhcyB0aGUgY2FzZSBvZiBhIGZpbmQK KyAgICAgICAgdGhhdCBoYXMgbm8gbWF0Y2hlcyBhZnRlciB0aGUgdXNlciBzZWxlY3Rpb24uCisK KyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvajoKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvRmluZE1hdGNo ZXMubW06CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpkaWRGaW5kU3RyaW5nTWF0Y2hlcyk6Cisg ICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyL2ZpbmRSYW5nZXMuaHRtbDogQWRk ZWQuCisKIDIwMTMtMDYtMTQgIFRvciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9AZGln aWEuY29tPgogCiAgICAgICAgIFJlbW92ZSBteXNlbGYgZnJvbSBRdCBidWlsZCBzeXN0ZW0gd2F0 Y2hsaXN0CkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9q L3Byb2plY3QucGJ4cHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RX ZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkocmV2aXNpb24gMTUxNTcwKQorKysg VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHBy b2oJKHdvcmtpbmcgY29weSkKQEAgLTE5NSw2ICsxOTUsNyBAQAogCQlDMkNGOTc1QjE2Q0VDNzFC MDA1NEU5OUQgLyogSlNDb250ZXh0QmFja0ZvcndhcmRDYWNoZTEuaHRtbCBpbiBDb3B5IFJlc291 cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDMkNGOTc1ODE2Q0VDNjlF MDA1NEU5OUQgLyogSlNDb250ZXh0QmFja0ZvcndhcmRDYWNoZTEuaHRtbCAqLzsgfTsKIAkJQzJF QjJERDMxNkNBQzdBQzAwOUI1MkVFIC8qIFdlYlZpZXdEaWRDcmVhdGVKYXZhU2NyaXB0Q29udGV4 dC5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEMyRUIy REQxMTZDQUM3QUMwMDlCNTJFRSAvKiBXZWJWaWV3RGlkQ3JlYXRlSmF2YVNjcmlwdENvbnRleHQu bW0gKi87IH07CiAJCUM1MDdFOEE3MTRDNjU0NUIwMDVENkIzQiAvKiBJbnNwZWN0b3JCYXIubW0g aW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDNTA3RThBNjE0 QzY1NDVCMDA1RDZCM0IgLyogSW5zcGVjdG9yQmFyLm1tICovOyB9OworCQlDNTEwMUM0RjE3NkI4 RDkyMDBFRTlCMTUgLyogZmluZFJhbmdlcy5odG1sIGluIENvcHkgUmVzb3VyY2VzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEM1MTAxQzRFMTc2QjhCQjkwMEVFOUIxNSAvKiBm aW5kUmFuZ2VzLmh0bWwgKi87IH07CiAJCUM1MUFGQjk5MTY5RjQ5RkYwMDlDQ0Y2NiAvKiBGaW5k TWF0Y2hlcy5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IEM1MUFGQjk4MTY5RjQ5RkYwMDlDQ0Y2NiAvKiBGaW5kTWF0Y2hlcy5tbSAqLzsgfTsKIAkJQzU0 MEY3NzYxNTJFNERBMDAwQTQwQzhDIC8qIFNpbXBsaWZ5TWFya3VwLm1tIGluIFNvdXJjZXMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQzU0MEY3NzUxNTJFNERBMDAwQTQwQzhD IC8qIFNpbXBsaWZ5TWFya3VwLm1tICovOyB9OwogCQlDNTQwRjc4NDE1MkU1QTlBMDBBNDBDOEMg LyogdmVyYm9zZU1hcmt1cC5odG1sIGluIENvcHkgUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1 aWxkRmlsZTsgZmlsZVJlZiA9IEM1NDBGNzgzMTUyRTVBNzgwMEE0MEM4QyAvKiB2ZXJib3NlTWFy a3VwLmh0bWwgKi87IH07CkBAIC0yNjUsNiArMjY2LDcgQEAKIAkJCQkzN0RDNjc5MTE0MEQ3RDc2 MDBBQkNDREIgLyogRE9NUmFuZ2VPZlN0cmluZy5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAog CQkJCUM1RTFBRkZFMTZCMjIxRjEwMDZDQzFGMiAvKiBleGVjQ29weS5odG1sIGluIENvcHkgUmVz b3VyY2VzICovLAogCQkJCUJDMkQwMDY0MTJBQTA0Q0UwMEU3MzJBMyAvKiBmaWxlLXdpdGgtYW5j aG9yLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCisJCQkJQzUxMDFDNEYxNzZCOEQ5MjAwRUU5 QjE1IC8qIGZpbmRSYW5nZXMuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJCQkxQTAyQzg3 MDEyNUQ0Q0ZEMDBFM0Y0QkQgLyogZmluZC5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJ CTlCNEY4RkE3MTU5RDUyREQwMDJEOUY5NCAvKiBIVE1MQ29sbGVjdGlvbk5hbWVkSXRlbS5odG1s IGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCTlCMjZGQ0NBMTU5RDE2REUwMENDMzc2NSAvKiBI VE1MRm9ybUNvbGxlY3Rpb25OYW1lZEl0ZW0uaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKQEAg LTUwMiw2ICs1MDQsNyBAQAogCQlDMkNGOTc1OTE2Q0VDNjlFMDA1NEU5OUQgLyogSlNDb250ZXh0 QmFja0ZvcndhcmRDYWNoZTIuaHRtbCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQuaHRtbDsgcGF0aCA9IEpTQ29u dGV4dEJhY2tGb3J3YXJkQ2FjaGUyLmh0bWw7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJ CUMyRUIyREQxMTZDQUM3QUMwMDlCNTJFRSAvKiBXZWJWaWV3RGlkQ3JlYXRlSmF2YVNjcmlwdENv bnRleHQubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBXZWJWaWV3 RGlkQ3JlYXRlSmF2YVNjcmlwdENvbnRleHQubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCUM1MDdFOEE2MTRDNjU0NUIwMDVENkIzQiAvKiBJbnNwZWN0b3JCYXIubW0gKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBJbnNwZWN0b3JCYXIubW07IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CisJCUM1MTAxQzRFMTc2QjhCQjkwMEVFOUIxNSAvKiBmaW5kUmFu Z2VzLmh0bWwgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0Lmh0bWw7IHBhdGggPSBmaW5kUmFuZ2VzLmh0bWw7IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUM1MUFGQjk4MTY5RjQ5RkYwMDlDQ0Y2NiAvKiBG aW5kTWF0Y2hlcy5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IEZp bmRNYXRjaGVzLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlDNTQwRjc3NTE1MkU0 REEwMDBBNDBDOEMgLyogU2ltcGxpZnlNYXJrdXAubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNw cC5vYmpjcHA7IHBhdGggPSBTaW1wbGlmeU1hcmt1cC5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKIAkJQzU0MEY3ODMxNTJFNUE3ODAwQTQwQzhDIC8qIHZlcmJvc2VNYXJrdXAuaHRtbCAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHRleHQuaHRtbDsgcGF0aCA9IHZlcmJvc2VNYXJrdXAuaHRtbDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTc5Nyw2ICs4MDAsNyBAQAogCQkJCUM1RTFBRkZEMTZCMjIx NzkwMDZDQzFGMiAvKiBleGVjQ29weS5odG1sICovLAogCQkJCUJDMkQwMDRBMTJBOUZFQjMwMEU3 MzJBMyAvKiBmaWxlLXdpdGgtYW5jaG9yLmh0bWwgKi8sCiAJCQkJMUEwMkM4NEIxMjVENEE1RTAw RTNGNEJEIC8qIGZpbmQuaHRtbCAqLywKKwkJCQlDNTEwMUM0RTE3NkI4QkI5MDBFRTlCMTUgLyog ZmluZFJhbmdlcy5odG1sICovLAogCQkJCUJDQkQzNzJFMTI1QUJCRTYwMEQyQzI5RiAvKiBpY29u LnBuZyAqLywKIAkJCQkzNzhFNjQ3ODE2MzI2RkRGMDBCNkM2NzYgLyogbGluay13aXRoLXRpdGxl Lmh0bWwgKi8sCiAJCQkJOTM2MTAwMjgxNERDOTU3QjAwNjEzNzlEIC8qIGxvdHMtb2YtaWZyYW1l cy5odG1sICovLApAQCAtMTAwNiw2ICsxMDEwLDggQEAKIC8qIEJlZ2luIFBCWFByb2plY3Qgc2Vj dGlvbiAqLwogCQkwOEZCNzc5M0ZFODQxNTVEQzAyQUFDMDcgLyogUHJvamVjdCBvYmplY3QgKi8g PSB7CiAJCQlpc2EgPSBQQlhQcm9qZWN0OworCQkJYXR0cmlidXRlcyA9IHsKKwkJCX07CiAJCQli dWlsZENvbmZpZ3VyYXRpb25MaXN0ID0gMURFQjkyNzgwODczM0RENDAwMTBFOUNEIC8qIEJ1aWxk IGNvbmZpZ3VyYXRpb24gbGlzdCBmb3IgUEJYUHJvamVjdCAiVGVzdFdlYktpdEFQSSIgKi87CiAJ CQljb21wYXRpYmlsaXR5VmVyc2lvbiA9ICJYY29kZSAzLjEiOwogCQkJZGV2ZWxvcG1lbnRSZWdp b24gPSBFbmdsaXNoOwpJbmRleDogVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyL0Zp bmRNYXRjaGVzLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Mi9GaW5kTWF0Y2hlcy5tbQkocmV2aXNpb24gMTUxNTcwKQorKysgVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXQyL0ZpbmRNYXRjaGVzLm1tCSh3b3JraW5nIGNvcHkpCkBAIC01MSw2 ICs1MSw3IEBAIG5hbWVzcGFjZSBUZXN0V2ViS2l0QVBJIHsKIHN0YXRpYyBib29sIGRpZEZpbmlz aExvYWQgPSBmYWxzZTsKIHN0YXRpYyBib29sIGRpZENhbGxGaW5kU3RyaW5nTWF0Y2hlcyA9IGZh bHNlOwogc3RhdGljIGJvb2wgZGlkQ2FsbEdldEltYWdlID0gZmFsc2U7CitzdGF0aWMgV0tGaW5k T3B0aW9ucyBmaW5kT3B0aW9ucyA9IGtXS0ZpbmRPcHRpb25zQXRXb3JkU3RhcnRzOwogCiBSZXRh aW5QdHI8V2ViVmlldz4gd2Via2l0MVZpZXc7CiAKQEAgLTYxLDIyICs2MiwzMiBAQCBzdGF0aWMg dm9pZCBkaWRGaW5pc2hMb2FkRm9yRnJhbWUoV0tQYWdlCiAKIHN0YXRpYyB2b2lkIGRpZEZpbmRT dHJpbmdNYXRjaGVzKFdLUGFnZVJlZiBwYWdlLCBXS1N0cmluZ1JlZiBzdHJpbmcsIFdLQXJyYXlS ZWYgbWF0Y2hlcywgaW50IGZpcnN0SW5kZXgsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiB7Ci0g ICAgRVhQRUNUX1dLX1NUUkVRKCJIZWxsbyIsIHN0cmluZyk7Ci0gICAgc2l6ZV90IG51bU1hdGNo ZXMgPSBXS0FycmF5R2V0U2l6ZShtYXRjaGVzKTsKLSAgICBFWFBFQ1RfRVEoM3UsIG51bU1hdGNo ZXMpOwotCi0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBudW1NYXRjaGVzOyArK2kpIHsKLSAg ICAgICAgV0tUeXBlUmVmIGl0ZW1zID0gV0tBcnJheUdldEl0ZW1BdEluZGV4KG1hdGNoZXMsIGkp OwotICAgICAgICBXS1R5cGVJRCB0eXBlID0gV0tHZXRUeXBlSUQoaXRlbXMpOwotICAgICAgICBF WFBFQ1RfRVEodHlwZSwgV0tBcnJheUdldFR5cGVJRCgpKTsKLSAgICAgICAgV0tBcnJheVJlZiBy ZWN0cyA9IHJlaW50ZXJwcmV0X2Nhc3Q8V0tBcnJheVJlZj4oaXRlbXMpOwotICAgICAgICBzaXpl X3QgbnVtUmVjdHMgPSBXS0FycmF5R2V0U2l6ZShyZWN0cyk7Ci0gICAgICAgIEVYUEVDVF9FUSgx dSwgbnVtUmVjdHMpOwotICAgICAgICBpdGVtcyA9IFdLQXJyYXlHZXRJdGVtQXRJbmRleChyZWN0 cywgMCk7Ci0gICAgICAgIHR5cGUgPSBXS0dldFR5cGVJRChpdGVtcyk7Ci0gICAgICAgIEVYUEVD VF9FUSh0eXBlLCBXS1JlY3RHZXRUeXBlSUQoKSk7Ci0gICAgICAgIFdLUmVjdCByZWN0ID0gV0tS ZWN0R2V0VmFsdWUocmVpbnRlcnByZXRfY2FzdDxXS1JlY3RSZWY+KGl0ZW1zKSk7Ci0gICAgICAg IHJlY3QgPSByZWN0OworICAgIGlmIChXS1N0cmluZ0lzRXF1YWxUb1VURjhDU3RyaW5nKHN0cmlu ZywgIkhlbGxvIikpIHsKKyAgICAgICAgc2l6ZV90IG51bU1hdGNoZXMgPSBXS0FycmF5R2V0U2l6 ZShtYXRjaGVzKTsKKyAgICAgICAgRVhQRUNUX0VRKDN1LCBudW1NYXRjaGVzKTsKKworICAgICAg ICBpZiAoZmluZE9wdGlvbnMgJiBrV0tGaW5kT3B0aW9uc0JhY2t3YXJkcykKKyAgICAgICAgICAg IEVYUEVDVF9FUSgxLCBmaXJzdEluZGV4KTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgRVhQ RUNUX0VRKDIsIGZpcnN0SW5kZXgpOworCisgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwg bnVtTWF0Y2hlczsgKytpKSB7CisgICAgICAgICAgICBXS1R5cGVSZWYgaXRlbXMgPSBXS0FycmF5 R2V0SXRlbUF0SW5kZXgobWF0Y2hlcywgaSk7CisgICAgICAgICAgICBXS1R5cGVJRCB0eXBlID0g V0tHZXRUeXBlSUQoaXRlbXMpOworICAgICAgICAgICAgRVhQRUNUX0VRKHR5cGUsIFdLQXJyYXlH ZXRUeXBlSUQoKSk7CisgICAgICAgICAgICBXS0FycmF5UmVmIHJlY3RzID0gcmVpbnRlcnByZXRf Y2FzdDxXS0FycmF5UmVmPihpdGVtcyk7CisgICAgICAgICAgICBzaXplX3QgbnVtUmVjdHMgPSBX S0FycmF5R2V0U2l6ZShyZWN0cyk7CisgICAgICAgICAgICBFWFBFQ1RfRVEoMXUsIG51bVJlY3Rz KTsKKyAgICAgICAgICAgIGl0ZW1zID0gV0tBcnJheUdldEl0ZW1BdEluZGV4KHJlY3RzLCAwKTsK KyAgICAgICAgICAgIHR5cGUgPSBXS0dldFR5cGVJRChpdGVtcyk7CisgICAgICAgICAgICBFWFBF Q1RfRVEodHlwZSwgV0tSZWN0R2V0VHlwZUlEKCkpOworICAgICAgICAgICAgV0tSZWN0IHJlY3Qg PSBXS1JlY3RHZXRWYWx1ZShyZWludGVycHJldF9jYXN0PFdLUmVjdFJlZj4oaXRlbXMpKTsKKyAg ICAgICAgICAgIHJlY3QgPSByZWN0OworICAgICAgICB9CisgICAgfSBlbHNlIGlmIChXS1N0cmlu Z0lzRXF1YWxUb1VURjhDU3RyaW5nKHN0cmluZywgImNyYXp5IikpIHsKKyAgICAgICAgc2l6ZV90 IG51bU1hdGNoZXMgPSBXS0FycmF5R2V0U2l6ZShtYXRjaGVzKTsKKyAgICAgICAgRVhQRUNUX0VR KDF1LCBudW1NYXRjaGVzKTsKKyAgICAgICAgRVhQRUNUX0VRKGtXS0ZpbmRSZXN1bHROb01hdGNo QWZ0ZXJVc2VyU2VsZWN0aW9uLCBmaXJzdEluZGV4KTsKICAgICB9CiAgICAgZGlkQ2FsbEZpbmRT dHJpbmdNYXRjaGVzID0gdHJ1ZTsKIH0KQEAgLTExNywxNCArMTI4LDIxIEBAIFRFU1QoV2ViS2l0 MiwgRmluZE1hdGNoZXMpCiAKICAgICBXS1BhZ2VTZXRQYWdlRmluZE1hdGNoZXNDbGllbnQod2Vi Vmlldy5wYWdlKCksICZmaW5kTWF0Y2hlc0NsaWVudCk7CiAKLSAgICBXS1JldGFpblB0cjxXS1VS TFJlZj4gdXJsKEFkb3B0V0ssIFV0aWw6OmNyZWF0ZVVSTEZvclJlc291cmNlKCJmaW5kIiwgImh0 bWwiKSk7CisgICAgLy8gVGhpcyBIVE1MIGZpbGUgY29udGFpbnMgMyBvY2N1cnJlbmNlcyBvZiB0 aGUgd29yZCBIZWxsbyBhbmQgaGFzIHRoZSBzZWNvbmQgb2NjdXJlbmNlIG9mIHRoZSB3b3JkICd3 b3JsZCcgc2VsZWN0ZWQuCisgICAgLy8gSXQgY29udGFpbnMgMSBvY2N1cnJlbmNlIG9mIHRoZSB3 b3JkICdjcmF6eScgdGhhdCBpcyBiZWZvcmUgdGhlIHNlbGVjdGVkIHdvcmQuCisgICAgV0tSZXRh aW5QdHI8V0tVUkxSZWY+IHVybChBZG9wdFdLLCBVdGlsOjpjcmVhdGVVUkxGb3JSZXNvdXJjZSgi ZmluZFJhbmdlcyIsICJodG1sIikpOwogICAgIFdLUGFnZUxvYWRVUkwod2ViVmlldy5wYWdlKCks IHVybC5nZXQoKSk7CiAKICAgICBVdGlsOjpydW4oJmRpZEZpbmlzaExvYWQpOwogCiAgICAgV0tS ZXRhaW5QdHI8V0tTdHJpbmdSZWY+IGZpbmRTdHJpbmcoQWRvcHRXSywgV0tTdHJpbmdDcmVhdGVX aXRoVVRGOENTdHJpbmcoIkhlbGxvIikpOwotIAotICAgIFdLUGFnZUZpbmRTdHJpbmdNYXRjaGVz KHdlYlZpZXcucGFnZSgpLCBmaW5kU3RyaW5nLmdldCgpLCB0cnVlLCAxMDApOworCisgICAgV0tQ YWdlRmluZFN0cmluZ01hdGNoZXMod2ViVmlldy5wYWdlKCksIGZpbmRTdHJpbmcuZ2V0KCksIGZp bmRPcHRpb25zLCAxMDApOworICAgIFV0aWw6OnJ1bigmZGlkQ2FsbEZpbmRTdHJpbmdNYXRjaGVz KTsKKworICAgIGRpZENhbGxGaW5kU3RyaW5nTWF0Y2hlcyA9IGZhbHNlOworICAgIGZpbmRPcHRp b25zIHw9IGtXS0ZpbmRPcHRpb25zQmFja3dhcmRzOworICAgIFdLUGFnZUZpbmRTdHJpbmdNYXRj aGVzKHdlYlZpZXcucGFnZSgpLCBmaW5kU3RyaW5nLmdldCgpLCBmaW5kT3B0aW9ucywgMTAwKTsK ICAgICBVdGlsOjpydW4oJmRpZENhbGxGaW5kU3RyaW5nTWF0Y2hlcyk7CiAKICAgICB3ZWJraXQx VmlldyA9IGFkb3B0TlMoW1tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3Qo MCwgMCwgMTIwLCAyMDApIGZyYW1lTmFtZTpuaWwgZ3JvdXBOYW1lOm5pbF0pOwpAQCAtMTM4LDYg KzE1NiwxMiBAQCBURVNUKFdlYktpdDIsIEZpbmRNYXRjaGVzKQogICAgIFdLUGFnZUdldEltYWdl Rm9yRmluZE1hdGNoKHdlYlZpZXcucGFnZSgpLCAwKTsKICAgICBVdGlsOjpydW4oJmRpZENhbGxH ZXRJbWFnZSk7CiAKKyAgICBkaWRDYWxsRmluZFN0cmluZ01hdGNoZXMgPSBmYWxzZTsKKyAgICBm aW5kT3B0aW9ucyAmPSB+a1dLRmluZE9wdGlvbnNCYWNrd2FyZHM7CisgICAgV0tSZXRhaW5QdHI8 V0tTdHJpbmdSZWY+IGZpbmRPdGhlclN0cmluZyhBZG9wdFdLLCBXS1N0cmluZ0NyZWF0ZVdpdGhV VEY4Q1N0cmluZygiY3JhenkiKSk7CisgICAgV0tQYWdlRmluZFN0cmluZ01hdGNoZXMod2ViVmll dy5wYWdlKCksIGZpbmRPdGhlclN0cmluZy5nZXQoKSwgZmluZE9wdGlvbnMsIDEwMCk7CisgICAg VXRpbDo6cnVuKCZkaWRDYWxsRmluZFN0cmluZ01hdGNoZXMpOworCiAgICAgV0tQYWdlSGlkZUZp bmRVSSh3ZWJWaWV3LnBhZ2UoKSk7CiB9CiAKSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Mi9maW5kUmFuZ2VzLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXQyL2ZpbmRSYW5nZXMuaHRtbAkocmV2aXNpb24gMCkKKysrIFRvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mi9maW5kUmFuZ2VzLmh0bWwJKHdvcmtpbmcgY29w eSkKQEAgLTAsMCArMSwxMSBAQAorPGh0bWw+Cis8Ym9keT5UZXN0IHNlYXJjaC4gSGVsbG8gd29y bGQsIEhlbGxvIGNyYXp5IHdvcmxkLCBIZWxsbyE8L2JvZHk+Cis8c2NyaXB0PgorICAgIHZhciBz ID0gd2luZG93LmdldFNlbGVjdGlvbigpOworICAgIHZhciByID0gZG9jdW1lbnQuY3JlYXRlUmFu Z2UoKTsKKworICAgIHIuc2V0U3RhcnQoZG9jdW1lbnQuYm9keS5maXJzdENoaWxkLCAzOCk7Cisg ICAgci5zZXRFbmQoZG9jdW1lbnQuYm9keS5maXJzdENoaWxkLCA0Myk7CisgICAgcy5hZGRSYW5n ZShyKTsKKzwvc2NyaXB0PgorPC9odG1sPgo=