36773 2010-03-29 13:01:55 -0700 Spatial Navigation: proper handle negative x or y coordinates 2010-04-20 13:20:53 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC All CLOSED FIXED P2 Normal --- 18662 36168 35784 36463 1 tonikitoo tonikitoo abarth eric hausmann simon.fraser webkit.review.bot oldest_to_newest 205616 0 tonikitoo 2010-03-29 13:01:55 -0700 In Spatial Navigation logic, during rect acquisition of a node candidate to get focus, sometimes it gets negative x() or y() values, and algorithm currently bails out if any of this values is negative. however, when a node is in a scrollable content (content overflow <div>) and this scrollable container scrolled up, element gets offscreen, and gets negative values. In such cases, however, they are still valid to be used in Spatial Navigation logic. following patch addresses that. 205621 1 51955 tonikitoo 2010-03-29 13:10:45 -0700 Created attachment 51955 (committed in r57304) Patch 1 I will request review as soon as bug 36168 (its blocker) lands. 208389 2 51955 tonikitoo 2010-04-04 20:04:53 -0700 Comment on attachment 51955 (committed in r57304) Patch 1 Requesting review, now that the blocker patch for this one has landed (see bug 36168 / r57061). 210476 3 51955 tonikitoo 2010-04-08 16:41:56 -0700 Comment on attachment 51955 (committed in r57304) Patch 1 thank you simon/smfr! 210486 4 webkit.review.bot 2010-04-08 17:12:45 -0700 http://trac.webkit.org/changeset/57304 might have broken Tiger Intel Release The following changes are on the blame list: http://trac.webkit.org/changeset/57304 http://trac.webkit.org/changeset/57301 http://trac.webkit.org/changeset/57302 http://trac.webkit.org/changeset/57303 210492 5 abarth 2010-04-08 17:20:50 -0700 Sorry for the sheriffbot spam. We're fighting through storage/open-database-creation-callback.html. 211518 6 51955 tonikitoo 2010-04-11 20:05:30 -0700 Comment on attachment 51955 (committed in r57304) Patch 1 Clearing flags on attachment: 51955 Committed r57304: <http://trac.webkit.org/changeset/57304> 214908 7 hausmann 2010-04-20 13:20:41 -0700 Revision r57304 cherry-picked into qtwebkit-2.0 with commit 3875bf5b10eecc016f2c324f5b612c62202a504c 51955 2010-03-29 13:10:45 -0700 2010-04-11 20:05:30 -0700 (committed in r57304) Patch 1 0001-Spatial-Navigation-proper-handle-negative-x-or-y-co.patch text/plain 8835 tonikitoo RnJvbSBlNWMyZTNmZTgzNDMxNDIwYmUzM2Y2YWNjZDhmZWI5ZTVhODEwNGY5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4K RGF0ZTogTW9uLCAyOSBNYXIgMjAxMCAxNjowNzo0MyAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIFNw YXRpYWwgTmF2aWdhdGlvbjogcHJvcGVyIGhhbmRsZSBuZWdhdGl2ZSB4IG9yIHkgY29vcmRpbmF0 ZXMKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNjc3MwoKUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuClBhdGNoIGJ5IEFudG9uaW8gR29tZXMgPHRvbmlraXRvb0B3 ZWJraXQub3JnPgoKV2ViQ29yZToKCkluIFNwYXRpYWwgTmF2aWdhdGlvbiBsb2dpYywgZHVyaW5n IHJlY3QgYWNxdWlzaXRpb24gaW4gcmVuZGVyUmVjdFJlbGF0aXZlVG9Sb290RG9jdW1lbnQsCnNv bWV0aW1lcyBuZWdhdGl2ZSB4KCkgb3IgeSgpIHZhbHVlcyBhcmUgZ290LCBhbmQgdGhlIGN1cnJl bnQgYWxnb3JpdGhtIGJhaWxzIG91dCBpbgphbnkgb2Ygc3VjaCBjYXNlcy4KCkhvd2V2ZXIsIHdo ZW4gYSBub2RlIGlzIGluIGEgc2Nyb2xsYWJsZSBjb250ZW50IChjb250ZW50IG92ZXJmbG93IDxk aXY+KSBhbmQKdGhpcyBzY3JvbGxhYmxlIGNvbnRhaW5lciBzY3JvbGxlZCB1cCwgZWxlbWVudCBn ZXRzIG9mZnNjcmVlbiwgYW5kIGdldHMgbmVnYXRpdmUgdmFsdWVzCmZvciB5KCksIGZvciBleGFt cGxlLiBJbiBzdWNoIGNhc2VzLCB0aGV5IGFyZSBzdGlsbCB2YWxpZCB0byBiZSB1c2VkIGluIFNw YXRpYWwgTmF2aWdhdGlvbgpsb2dpYy4KClRlc3Q6IGZhc3QvZXZlbnRzL3NwYXRpYWwtbmF2aWdh dGlvbi9zbmF2LW9mZnNjcmVlbi1jb250ZW50Lmh0bWwKCiogcGFnZS9TcGF0aWFsTmF2aWdhdGlv bi5jcHA6CihXZWJDb3JlOjpkaXN0YW5jZURhdGFGb3JOb2RlKToKKFdlYkNvcmU6OmNoZWNrTmVn YXRpdmVDb29yZHNGb3JOb2RlKToKCkxheW91dFRlc3RzOgoKKiBmYXN0L2V2ZW50cy9zcGF0aWFs LW5hdmlnYXRpb24vc25hdi1vZmZzY3JlZW4tY29udGVudC1leHBlY3RlZC50eHQ6IEFkZGVkLgoq IGZhc3QvZXZlbnRzL3NwYXRpYWwtbmF2aWdhdGlvbi9zbmF2LW9mZnNjcmVlbi1jb250ZW50Lmh0 bWw6IEFkZGVkLgotLS0KIExheW91dFRlc3RzL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHwgICAxMCArKysKIC4uLi9zbmF2LW9mZnNjcmVlbi1jb250ZW50LWV4cGVjdGVk LnR4dCAgICAgICAgICAgIHwgICAgNSArKwogLi4uL3NwYXRpYWwtbmF2aWdhdGlvbi9zbmF2LW9m ZnNjcmVlbi1jb250ZW50Lmh0bWwgfCAgIDc0ICsrKysrKysrKysrKysrKysrKysrCiBXZWJDb3Jl L0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMjIgKysrKysr CiBXZWJDb3JlL3BhZ2UvU3BhdGlhbE5hdmlnYXRpb24uY3BwICAgICAgICAgICAgICAgICB8ICAg MzUgKysrKysrKysrLQogNSBmaWxlcyBjaGFuZ2VkLCAxNDUgaW5zZXJ0aW9ucygrKSwgMSBkZWxl dGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBMYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9zcGF0 aWFsLW5hdmlnYXRpb24vc25hdi1vZmZzY3JlZW4tY29udGVudC1leHBlY3RlZC50eHQKIGNyZWF0 ZSBtb2RlIDEwMDY0NCBMYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9zcGF0aWFsLW5hdmlnYXRpb24v c25hdi1vZmZzY3JlZW4tY29udGVudC5odG1sCgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGYxNDczYzguLmE3YmMwMmEgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMC0wMy0yOSAgQW50b25pbyBHb21lcyAgPHRvbmlraXRv b0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFNwYXRpYWwgTmF2aWdhdGlvbjogcHJvcGVyIGhhbmRsZSBuZWdhdGl2ZSB4IG9yIHkg Y29vcmRpbmF0ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTM2NzczCisKKyAgICAgICAgKiBmYXN0L2V2ZW50cy9zcGF0aWFsLW5hdmlnYXRpb24vc25h di1vZmZzY3JlZW4tY29udGVudC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3Qv ZXZlbnRzL3NwYXRpYWwtbmF2aWdhdGlvbi9zbmF2LW9mZnNjcmVlbi1jb250ZW50Lmh0bWw6IEFk ZGVkLgorCiAyMDEwLTAzLTI4ICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxnbnNAZ25vbWUub3Jn PgogCiAgICAgICAgIFtHVEtdIEltcHJvdmUgcmVwb3J0aW5nIG9mIGZyYW1lIGxvYWRlciBjYWxs YmFja3MgaW4gRFJUCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9zcGF0aWFs LW5hdmlnYXRpb24vc25hdi1vZmZzY3JlZW4tY29udGVudC1leHBlY3RlZC50eHQgYi9MYXlvdXRU ZXN0cy9mYXN0L2V2ZW50cy9zcGF0aWFsLW5hdmlnYXRpb24vc25hdi1vZmZzY3JlZW4tY29udGVu dC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMjA4MTRm OAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3NwYXRpYWwtbmF2 aWdhdGlvbi9zbmF2LW9mZnNjcmVlbi1jb250ZW50LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDUg QEAKK29mZnNjcmVlbiBjb250ZW50UmlnaHQgbGluaworCitEb3duIGxpbmsKK1BBU1MgZG9jdW1l bnQuYWN0aXZlRWxlbWVudC5nZXRBdHRyaWJ1dGUoImlkIikgaXMgIjEiCisKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3NwYXRpYWwtbmF2aWdhdGlvbi9zbmF2LW9mZnNjcmVl bi1jb250ZW50Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9zcGF0aWFsLW5hdmlnYXRp b24vc25hdi1vZmZzY3JlZW4tY29udGVudC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAuLmJmOTc4ZGQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2V2 ZW50cy9zcGF0aWFsLW5hdmlnYXRpb24vc25hdi1vZmZzY3JlZW4tY29udGVudC5odG1sCkBAIC0w LDAgKzEsNzQgQEAKKzxodG1sPgorICA8IS0tCisgICAgVGhpcyB0ZXN0IGVuc3VyZXMgdGhlIGNv bnRlbnQgb3ZlcmZsb3cgdHJhdmVyc2FsIGNvcnJlY3RuZXNzIG9mIFNwYXRpYWwgTmF2aWdhdGlv bgorICAgIGFsZ29yaXRobTogZm9jdXNhYmxlIGVsZW1lbnRzIGluIGFuIHNjcm9sbGFibGUgY29u dGFpbmVycyAoZS5nLiA8ZGl2Pikgc2hvdWxkIGJlCisgICAgYWNjZXNzaWJsZSwgaW5jbHVkaW5n IG9mZnNjcmVlbiBjb250ZW50LgorCisgICAgKiBQcmUtY29uZGl0aW9uczoKKyAgICAxKSBEUlQg c3VwcG9ydCBmb3IgU05hdiBlbmFibGUvZGlzYWJsZS4KKworICAgICogTmF2aWdhdGlvbiBzdGVw czoKKyAgICAxKSBMb2FkcyB0aGlzIHBhZ2UsIGZvY3VzIGdvZXMgdG8gInN0YXJ0IiBhdXRvbWF0 aWNhbGx5LgorICAgIDIpIE1vdmUgZm9jdXMgZG93biB0byB0aGUgdmlzaWJsZSBmb2N1c2FibGUg ZWxlbWVudCBpbgorICAgICAgIHNjcm9sbGFibGUgZGl2LgorICAgIDMpIFRyYXZlcnNlIHRoZSBw YWdlIHRocm91Z2ggb3RoZXIgZm9jdXNhYmxlIGVsZW1lbnRzIGRvd24gdGhlIHBhZ2UuCisgICAg ICAgYW5kIHRoZW4gYmFjayB1cC4KKworICAgICogRXhwZWN0ZWQgcmVzdWx0czogQWxsIGZvY3Vz YWJsZSBlbGVtZW50IGluIHNjcm9sbGFibGUgY29udGVudCwgaW5jbHVkaW5nCisgICAgb2Zmc2Ny ZWVuIG9uZXMsIHNob3VsZCBiZSBhY2Nlc3NpYmxlIHZpYSBTTmF2LiAtLT4KKyAgPGhlYWQ+Cisg ICAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KKyAgICAgIC5vZmZzY3JlZW4geworICAgICAgICBw b3NpdGlvbjogYWJzb2x1dGU7CisgICAgICAgIGxlZnQ6IC0xMDAwZW07CisgICAgICB9CisgICAg PC9zdHlsZT4KKworICAgIDxzY3JpcHQgc3JjPSIuLi8uLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1w cmUuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSJyZXNvdXJjZXMvc3BhdGlhbC1uYXZp Z2F0aW9uLXV0aWxzLmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHR5cGU9ImFwcGxpY2F0aW9u L2phdmFzY3JpcHQiPgorCisgICAgdmFyIHJlc3VsdE1hcCA9IFsKKyAgICAgIFsiTGVmdCIsICIx Il0sCisgICAgICBbIkRPTkUiLCAiRE9ORSJdCisgICAgXTsKKworICAgIGlmICh3aW5kb3cubGF5 b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1Rl eHQoKTsKKyAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLnNldFNwYXRpYWxOYXZpZ2F0aW9uRW5h YmxlZCh0cnVlKTsKKyAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLm92ZXJyaWRlUHJlZmVyZW5j ZSgiV2ViS2l0VGFiVG9MaW5rc1ByZWZlcmVuY2VLZXkiLCAxKTsKKyAgICAgIGxheW91dFRlc3RD b250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBydW5UZXN0 KCkKKyAgICB7CisgICAgICAvLyBzdGFydGluZyB0aGUgdGVzdCBpdHNlbGY6IGdldCB0byBhIGtu b3duIHBsYWNlLgorICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInN0YXJ0IikuZm9jdXMo KTsKKworICAgICAgaW5pdFRlc3QocmVzdWx0TWFwLCB0ZXN0Q29tcGxldGVkKTsKKyAgICB9CisK KyAgICBmdW5jdGlvbiB0ZXN0Q29tcGxldGVkKCkKKyAgICB7CisgICAgICBpZiAod2luZG93Lmxh eW91dFRlc3RDb250cm9sbGVyKQorICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlE b25lKCk7CisgICAgfQorCisgICAgd2luZG93Lm9ubG9hZCA9IHJ1blRlc3Q7CisKKyAgICA8L3Nj cmlwdD4KKyAgICA8c2NyaXB0IHNyYz0iLi4vanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+ PC9zY3JpcHQ+CisgIDwvaGVhZD4KKworCisgIDxib2R5IGlkPSJzb21lLWNvbnRlbnQiIHhtbG5z PSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hodG1sIj4KKworICAgIDxkaXYgc3R5bGU9Im1hcmdp bi1sZWZ0OjEyMHB4Ij4KKyAgICAgIDxhIGlkPSJvZmYiIGNsYXNzPSJvZmZzY3JlZW4iIGhyZWY9 ImEiPm9mZnNjcmVlbiBjb250ZW50PC9hPgorICAgICAgPGEgaWQ9InN0YXJ0IiBocmVmPSJhIj5S aWdodCBsaW5rPC9hPgorICAgIDwvZGl2Pjxicj4KKyAgICA8YSBpZD0iMSIgaHJlZj0iYSI+RG93 biBsaW5rPC9hPjxicj4KKyAgICA8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKyAgPC9ib2R5Pgor PC9odG1sPgorCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdl TG9nCmluZGV4IGJiYjk5NTIuLjlmNDFjZWEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9n CisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDYgKzEsMjggQEAKIDIwMTAtMDMtMjkgIEFu dG9uaW8gR29tZXMgIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTcGF0aWFsIE5hdmlnYXRpb246IHByb3BlciBo YW5kbGUgbmVnYXRpdmUgeCBvciB5IGNvb3JkaW5hdGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNjc3MworCisgICAgICAgIEluIFNwYXRpYWwgTmF2 aWdhdGlvbiBsb2dpYywgZHVyaW5nIHJlY3QgYWNxdWlzaXRpb24gaW4gcmVuZGVyUmVjdFJlbGF0 aXZlVG9Sb290RG9jdW1lbnQsCisgICAgICAgIHNvbWV0aW1lcyBuZWdhdGl2ZSB4KCkgb3IgeSgp IHZhbHVlcyBhcmUgZ290LCBhbmQgdGhlIGN1cnJlbnQgYWxnb3JpdGhtIGJhaWxzIG91dCBpbgor ICAgICAgICBhbnkgb2Ygc3VjaCBjYXNlcy4KKworICAgICAgICBIb3dldmVyLCB3aGVuIGEgbm9k ZSBpcyBpbiBhIHNjcm9sbGFibGUgY29udGVudCAoY29udGVudCBvdmVyZmxvdyA8ZGl2PikgYW5k CisgICAgICAgIHRoaXMgc2Nyb2xsYWJsZSBjb250YWluZXIgc2Nyb2xsZWQgdXAsIGVsZW1lbnQg Z2V0cyBvZmZzY3JlZW4sIGFuZCBnZXRzIG5lZ2F0aXZlIHZhbHVlcworICAgICAgICBmb3IgeSgp LCBmb3IgZXhhbXBsZS4gSW4gc3VjaCBjYXNlcywgdGhleSBhcmUgc3RpbGwgdmFsaWQgdG8gYmUg dXNlZCBpbiBTcGF0aWFsIE5hdmlnYXRpb24KKyAgICAgICAgbG9naWMuCisKKyAgICAgICAgVGVz dDogZmFzdC9ldmVudHMvc3BhdGlhbC1uYXZpZ2F0aW9uL3NuYXYtb2Zmc2NyZWVuLWNvbnRlbnQu aHRtbAorCisgICAgICAgICogcGFnZS9TcGF0aWFsTmF2aWdhdGlvbi5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpkaXN0YW5jZURhdGFGb3JOb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OmNoZWNrTmVn YXRpdmVDb29yZHNGb3JOb2RlKToKKworMjAxMC0wMy0yOSAgQW50b25pbyBHb21lcyAgPHRvbmlr aXRvb0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgog ICAgICAgICBQYXRjaCBieSBBbnRvbmlvIEdvbWVzIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4KIAog ICAgICAgICBTcGF0aWFsIE5hdmlnYXRpb246IEluaXRpYWwgY29kZSBzaW1wbGlmaWNhdGlvbiBp biBGb2N1c0NvbnRyb2xsZXIuY3BwIGFuZCBTcGF0aWFsTmF2aWdhdGlvbi5jcHAKZGlmZiAtLWdp dCBhL1dlYkNvcmUvcGFnZS9TcGF0aWFsTmF2aWdhdGlvbi5jcHAgYi9XZWJDb3JlL3BhZ2UvU3Bh dGlhbE5hdmlnYXRpb24uY3BwCmluZGV4IDI0NjFkZTMuLjVjZmJmYjMgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvcGFnZS9TcGF0aWFsTmF2aWdhdGlvbi5jcHAKKysrIGIvV2ViQ29yZS9wYWdlL1NwYXRp YWxOYXZpZ2F0aW9uLmNwcApAQCAtNDYsNiArNDYsNyBAQCBzdGF0aWMgYm9vbCBhcmVSZWN0c0Z1 bGx5QWxpZ25lZChGb2N1c0RpcmVjdGlvbiwgY29uc3QgSW50UmVjdCYsIGNvbnN0IEludFJlY3Qm KQogc3RhdGljIGJvb2wgYXJlUmVjdHNQYXJ0aWFsbHlBbGlnbmVkKEZvY3VzRGlyZWN0aW9uLCBj b25zdCBJbnRSZWN0JiwgY29uc3QgSW50UmVjdCYpOwogc3RhdGljIGJvb2wgaXNSZWN0SW5EaXJl Y3Rpb24oRm9jdXNEaXJlY3Rpb24sIGNvbnN0IEludFJlY3QmLCBjb25zdCBJbnRSZWN0Jik7CiBz dGF0aWMgdm9pZCBkZWZsYXRlSWZPdmVybGFwcGVkKEludFJlY3QmLCBJbnRSZWN0Jik7CitzdGF0 aWMgYm9vbCBjaGVja05lZ2F0aXZlQ29vcmRzRm9yTm9kZShOb2RlKiwgY29uc3QgSW50UmVjdCYp OwogCiB2b2lkIGRpc3RhbmNlRGF0YUZvck5vZGUoRm9jdXNEaXJlY3Rpb24gZGlyZWN0aW9uLCBO b2RlKiBzdGFydCwgRm9jdXNDYW5kaWRhdGUmIGNhbmRpZGF0ZSkKIHsKQEAgLTY4LDggKzY5LDIw IEBAIHZvaWQgZGlzdGFuY2VEYXRhRm9yTm9kZShGb2N1c0RpcmVjdGlvbiBkaXJlY3Rpb24sIE5v ZGUqIHN0YXJ0LCBGb2N1c0NhbmRpZGF0ZSYKICAgICAvLyBkZWZsYXRlIGJvdGguCiAgICAgZGVm bGF0ZUlmT3ZlcmxhcHBlZChjdXJSZWN0LCB0YXJnZXRSZWN0KTsKIAorICAgIC8vIElmIGVtcHR5 IHJlY3RzIG9yIG5lZ2F0aXZlIHdpZHRoIG9yIGhlaWdodCwgYmFpbCBvdXQuCiAgICAgaWYgKGN1 clJlY3QuaXNFbXB0eSgpIHx8IHRhcmdldFJlY3QuaXNFbXB0eSgpCi0gICAgICAgIHx8IHRhcmdl dFJlY3QueCgpIDwgMCB8fCB0YXJnZXRSZWN0LnkoKSA8IDApIHsKKyAgICAgfHwgdGFyZ2V0UmVj dC53aWR0aCgpIDw9IDAgfHwgdGFyZ2V0UmVjdC5oZWlnaHQoKSA8PSAwKSB7CisgICAgICAgIGNh bmRpZGF0ZS5kaXN0YW5jZSA9IG1heERpc3RhbmNlKCk7CisgICAgICAgIHJldHVybjsKKyAgICB9 CisKKyAgICAvLyBOZWdhdGl2ZSBjb29yZGluYXRlcyBjYW4gYmUgdXNlZCBpZiBub2RlIGlzIHNj cm9sbGVkIHVwIG9mZnNjcmVlbi4KKyAgICBpZiAoIWNoZWNrTmVnYXRpdmVDb29yZHNGb3JOb2Rl KHN0YXJ0LCBjdXJSZWN0KSkgeworICAgICAgICBjYW5kaWRhdGUuZGlzdGFuY2UgPSBtYXhEaXN0 YW5jZSgpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKCFjaGVja05lZ2F0aXZl Q29vcmRzRm9yTm9kZShjYW5kaWRhdGUubm9kZSwgdGFyZ2V0UmVjdCkpIHsKICAgICAgICAgY2Fu ZGlkYXRlLmRpc3RhbmNlID0gbWF4RGlzdGFuY2UoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0K QEAgLTQ4Niw0ICs0OTksMjQgQEAgc3RhdGljIHZvaWQgZGVmbGF0ZUlmT3ZlcmxhcHBlZChJbnRS ZWN0JiBhLCBJbnRSZWN0JiBiKQogICAgICAgICBiLmluZmxhdGUoZnVkZ2VGYWN0b3IoKSk7CiB9 CiAKK3N0YXRpYyBib29sIGNoZWNrTmVnYXRpdmVDb29yZHNGb3JOb2RlKE5vZGUqIG5vZGUsIGNv bnN0IEludFJlY3QmIGN1clJlY3QpCit7CisgICAgQVNTRVJUKG5vZGUgfHwgbm9kZS0+cmVuZGVy ZXIoKSk7CisKKyAgICBpZiAoY3VyUmVjdC54KCkgPiAwICYmIGN1clJlY3QueSgpID4gMCkKKyAg ICAgICAgcmV0dXJuIHRydWU7CisKKyAgICBib29sIGNhbkJlU2Nyb2xsZWQgPSBmYWxzZTsKKwor ICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXIgPSBub2RlLT5yZW5kZXJlcigpOworICAgIGZvciAo OyByZW5kZXJlcjsgcmVuZGVyZXIgPSByZW5kZXJlci0+cGFyZW50KCkpIHsKKyAgICAgICAgaWYg KHJlbmRlcmVyLT5pc0JveCgpICYmIHRvUmVuZGVyQm94KHJlbmRlcmVyKS0+Y2FuQmVTY3JvbGxl ZEFuZEhhc1Njcm9sbGFibGVBcmVhKCkpIHsKKyAgICAgICAgICAgIGNhbkJlU2Nyb2xsZWQgPSB0 cnVlOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICB9CisKKyAgICByZXR1cm4g Y2FuQmVTY3JvbGxlZDsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQotLSAKMS42LjAuNAoK