60080 2011-05-03 16:20:13 -0700 Split createLineBoxesFromBidiRuns out from layoutRunsAndFloats 2011-05-04 04:51:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 36921 1 eric eric commit-queue leviw rniwa oldest_to_newest 397504 0 eric 2011-05-03 16:20:13 -0700 Split createLineBoxesFromBidiRuns out from layoutRunsAndFloats 397512 1 92161 eric 2011-05-03 16:24:08 -0700 Created attachment 92161 Patch 397518 2 92163 eric 2011-05-03 16:29:00 -0700 Created attachment 92163 Patch 397546 3 92163 rniwa 2011-05-03 16:58:58 -0700 Comment on attachment 92163 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=92163&action=review > Source/WebCore/rendering/RenderBlockLineLayout.cpp:930 > + if (bidiRuns.runCount() && hyphenated) > + bidiRuns.logicallyLastRun()->m_hasHyphen = true; > + > BidiRun* trailingSpaceRun = !lineInfo.previousLineBrokeCleanly() ? handleTrailingSpaces(bidiRuns, resolver.context()) : 0; Are you certain that handleTrailingSpaces won't be affected by assigning the value to m_hasHyphen earlier? 397548 4 92172 eric 2011-05-03 17:01:40 -0700 Created attachment 92172 Patch for landing 397814 5 commit-queue 2011-05-04 04:49:53 -0700 The commit-queue encountered the following flaky tests while processing attachment 92172: http/tests/inspector/console-websocket-error.html bug 57392 (authors: pfeldman@chromium.org and yutak@chromium.org) The commit-queue is continuing to process your patch. 397816 6 92172 commit-queue 2011-05-04 04:51:19 -0700 Comment on attachment 92172 Patch for landing Clearing flags on attachment: 92172 Committed r85732: <http://trac.webkit.org/changeset/85732> 397817 7 commit-queue 2011-05-04 04:51:25 -0700 All reviewed patches have been landed. Closing bug. 92161 2011-05-03 16:24:08 -0700 2011-05-03 16:28:57 -0700 Patch bug-60080-20110503162407.patch text/plain 8191 eric U3VidmVyc2lvbiBSZXZpc2lvbjogODU2NjgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0MjRlNWNjNzFmYjlkY2Ex MmMzYmQxNDYzMTRhZjRlYTE0MjEzNWI1Li5hYzliZDZjMjkxNDlmNjc4NWEzNjM1MDYxZGJkNzQ0 NjFlNmVhMzA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTkgQEAKIDIwMTEtMDUtMDMgIEVyaWMg U2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFNwbGl0IGNyZWF0ZUxpbmVCb3hlc0Zyb21CaWRpUnVucyBvdXQg ZnJvbSBsYXlvdXRSdW5zQW5kRmxvYXRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02MDA4MAorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gKE9PUFMhKQor CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmg6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckJsb2NrTGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9j azo6Y3JlYXRlTGluZUJveGVzRnJvbUJpZGlSdW5zKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckJsb2NrOjpsYXlvdXRSdW5zQW5kRmxvYXRzKToKKworMjAxMS0wNS0wMyAgRXJpYyBTZWlkZWwg IDxlcmljQHdlYmtpdC5vcmc+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgUnlvc3VrZSBOaXdhLgog CiAgICAgICAgIFNwbGl0IG91dCBsYXlvdXRSdW5zQW5kRmxvYXRzIGZyb20gbGF5b3V0SW5saW5l Q2hpbGRyZW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j ay5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKaW5kZXggY2QzN2Qw ZTRlNDFlMWRmYWJlNDA0MTMwODAwN2Q3OWU1NDZmOTJiZS4uOGM3ZWJlYzVkZDNjZDI2Y2M4YjA0 ZTA5NTg1MjhmMjg0MWUyNzBhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJsb2NrLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2Nr LmgKQEAgLTcwMiw2ICs3MDIsNyBAQCBwcml2YXRlOgogICAgIC8vIEVuZCBoZWxwZXIgZnVuY3Rp b25zIGFuZCBzdHJ1Y3RzIHVzZWQgYnkgbGF5b3V0QmxvY2tDaGlsZHJlbi4KIAogICAgIC8vIEhl bHBlciBmdW5jdGlvbiBmb3IgbGF5b3V0SW5saW5lQ2hpbGRyZW4oKQorICAgIFJvb3RJbmxpbmVC b3gqIGNyZWF0ZUxpbmVCb3hlc0Zyb21CaWRpUnVucyhCaWRpUnVuTGlzdDxCaWRpUnVuPiYsIGNv bnN0IElubGluZUl0ZXJhdG9yJiBlbmQsIExpbmVJbmZvJiwgVmVydGljYWxQb3NpdGlvbkNhY2hl JiwgQmlkaVJ1biogdHJhaWxpbmdTcGFjZVJ1bik7CiAgICAgdm9pZCBsYXlvdXRSdW5zQW5kRmxv YXRzKGJvb2wgZnVsbExheW91dCwgYm9vbCBoYXNJbmxpbmVDaGlsZCwgVmVjdG9yPEZsb2F0V2l0 aFJlY3Q+JiwgaW50JiByZXBhaW50TG9naWNhbFRvcCwgaW50JiByZXBhaW50TG9naWNhbEJvdHRv bSk7CiAKICAgICAvLyBQYWdpbmF0aW9uIHJvdXRpbmVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAppbmRleCAzNGYyMWIwMGRiNGQw MjUxMWNiOThiYzdlMWVkMmUwMTljYTNiZjM3Li4xZDdhZDUzNjY4Y2QwMGI1ZTJkZTg4ZWQ5OTQw ODQ0YWRiZDU5Y2MwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2tMaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2tMaW5lTGF5b3V0LmNwcApAQCAtNzUxLDYgKzc1MSw1OSBAQCB2b2lkIFJlbmRlckJsb2Nr OjphcHBlbmRGbG9hdGluZ09iamVjdFRvTGFzdExpbmUoRmxvYXRpbmdPYmplY3QqIGZsb2F0aW5n T2JqZWN0KQogICAgIGxhc3RSb290Qm94KCktPmFwcGVuZEZsb2F0KGZsb2F0aW5nT2JqZWN0LT5y ZW5kZXJlcigpKTsKIH0KIAorLy8gVGhpcyBmdW5jdGlvbiBjb25zdHJ1Y3RzIGxpbmUgYm94ZXMg Zm9yIGFsbCBvZiB0aGUgdGV4dCBydW5zIGluIHRoZSByZXNvbHZlciBhbmQgY29tcHV0ZXMgdGhl aXIgcG9zaXRpb24uCitSb290SW5saW5lQm94KiBSZW5kZXJCbG9jazo6Y3JlYXRlTGluZUJveGVz RnJvbUJpZGlSdW5zKEJpZGlSdW5MaXN0PEJpZGlSdW4+JiBiaWRpUnVucywgY29uc3QgSW5saW5l SXRlcmF0b3ImIGVuZCwgTGluZUluZm8mIGxpbmVJbmZvLCBWZXJ0aWNhbFBvc2l0aW9uQ2FjaGUm IHZlcnRpY2FsUG9zaXRpb25DYWNoZSwgQmlkaVJ1biogdHJhaWxpbmdTcGFjZVJ1bikKK3sKKyAg ICBpZiAoIWJpZGlSdW5zLnJ1bkNvdW50KCkpCisgICAgICAgIHJldHVybiAwOworCisgICAgLy8g RklYTUU6IFdoeSBpcyB0aGlzIG9ubHkgZG9uZSB3aGVuIHdlIGhhZCBydW5zPworICAgIGxpbmVJ bmZvLnNldExhc3RMaW5lKCFlbmQubV9vYmopOworCisgICAgUm9vdElubGluZUJveCogbGluZUJv eCA9IGNvbnN0cnVjdExpbmUoYmlkaVJ1bnMsIGxpbmVJbmZvKTsKKyAgICBpZiAoIWxpbmVCb3gp CisgICAgICAgIHJldHVybiAwOworCisgICAgbGluZUJveC0+c2V0RW5kc1dpdGhCcmVhayhsaW5l SW5mby5wcmV2aW91c0xpbmVCcm9rZUNsZWFubHkoKSk7CisgICAgCisjaWYgRU5BQkxFKFNWRykK KyAgICBib29sIGlzU1ZHUm9vdElubGluZUJveCA9IGxpbmVCb3gtPmlzU1ZHUm9vdElubGluZUJv eCgpOworI2Vsc2UKKyAgICBib29sIGlzU1ZHUm9vdElubGluZUJveCA9IGZhbHNlOworI2VuZGlm CisgICAgCisgICAgR2x5cGhPdmVyZmxvd0FuZEZhbGxiYWNrRm9udHNNYXAgdGV4dEJveERhdGFN YXA7CisgICAgCisgICAgLy8gTm93IHdlIHBvc2l0aW9uIGFsbCBvZiBvdXIgdGV4dCBydW5zIGhv cml6b250YWxseS4KKyAgICBpZiAoIWlzU1ZHUm9vdElubGluZUJveCkKKyAgICAgICAgY29tcHV0 ZUlubGluZURpcmVjdGlvblBvc2l0aW9uc0ZvckxpbmUobGluZUJveCwgbGluZUluZm8sIGJpZGlS dW5zLmZpcnN0UnVuKCksIHRyYWlsaW5nU3BhY2VSdW4sIGVuZC5hdEVuZCgpLCB0ZXh0Qm94RGF0 YU1hcCwgdmVydGljYWxQb3NpdGlvbkNhY2hlKTsKKyAgICAKKyAgICAvLyBOb3cgcG9zaXRpb24g b3VyIHRleHQgcnVucyB2ZXJ0aWNhbGx5LgorICAgIGNvbXB1dGVCbG9ja0RpcmVjdGlvblBvc2l0 aW9uc0ZvckxpbmUobGluZUJveCwgYmlkaVJ1bnMuZmlyc3RSdW4oKSwgdGV4dEJveERhdGFNYXAs IHZlcnRpY2FsUG9zaXRpb25DYWNoZSk7CisgICAgCisjaWYgRU5BQkxFKFNWRykKKyAgICAvLyBT VkcgdGV4dCBsYXlvdXQgY29kZSBjb21wdXRlcyB2ZXJ0aWNhbCAmIGhvcml6b250YWwgcG9zaXRp b25zIG9uIGl0cyBvd24uCisgICAgLy8gTm90ZSB0aGF0IHdlIHN0aWxsIG5lZWQgdG8gZXhlY3V0 ZSBjb21wdXRlVmVydGljYWxQb3NpdGlvbnNGb3JMaW5lKCkgYXMKKyAgICAvLyBpdCBjYWxscyBJ bmxpbmVUZXh0Qm94Ojpwb3NpdGlvbkxpbmVCb3goKSwgd2hpY2ggdHJhY2tzIHdoZXRoZXIgdGhl IGJveAorICAgIC8vIGNvbnRhaW5zIHJldmVyc2VkIHRleHQgb3Igbm90LiBJZiB3ZSB3b3VsZG4n dCBkbyB0aGF0IGVkaXRpbmcgYW5kIHRodXMKKyAgICAvLyB0ZXh0IHNlbGVjdGlvbiBpbiBSVEwg Ym94ZXMgd291bGQgbm90IHdvcmsgYXMgZXhwZWN0ZWQuCisgICAgaWYgKGlzU1ZHUm9vdElubGlu ZUJveCkgeworICAgICAgICBBU1NFUlQoaXNTVkdUZXh0KCkpOworICAgICAgICBzdGF0aWNfY2Fz dDxTVkdSb290SW5saW5lQm94Kj4obGluZUJveCktPmNvbXB1dGVQZXJDaGFyYWN0ZXJMYXlvdXRJ bmZvcm1hdGlvbigpOworICAgIH0KKyNlbmRpZgorICAgIAorICAgIC8vIENvbXB1dGUgb3VyIG92 ZXJmbG93IG5vdy4KKyAgICBsaW5lQm94LT5jb21wdXRlT3ZlcmZsb3cobGluZUJveC0+bGluZVRv cCgpLCBsaW5lQm94LT5saW5lQm90dG9tKCksIHRleHRCb3hEYXRhTWFwKTsKKyAgICAKKyNpZiBQ TEFURk9STShNQUMpCisgICAgLy8gSGlnaGxpZ2h0IGFjdHMgYXMgYW4gb3ZlcmZsb3cgaW5mbGF0 aW9uLgorICAgIGlmIChzdHlsZSgpLT5oaWdobGlnaHQoKSAhPSBudWxsQXRvbSkKKyAgICAgICAg bGluZUJveC0+YWRkSGlnaGxpZ2h0T3ZlcmZsb3coKTsKKyNlbmRpZgorICAgIHJldHVybiBsaW5l Qm94OworfQorCiB2b2lkIFJlbmRlckJsb2NrOjpsYXlvdXRSdW5zQW5kRmxvYXRzKGJvb2wgZnVs bExheW91dCwgYm9vbCBoYXNJbmxpbmVDaGlsZCwgVmVjdG9yPEZsb2F0V2l0aFJlY3Q+JiBmbG9h dHMsIGludCYgcmVwYWludExvZ2ljYWxUb3AsIGludCYgcmVwYWludExvZ2ljYWxCb3R0b20pCiB7 CiAgICAgLy8gV2Ugd2FudCB0byBza2lwIGFoZWFkIHRvIHRoZSBmaXJzdCBkaXJ0eSBsaW5lCkBA IC04NjAsNiArOTEzLDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6bGF5b3V0UnVuc0FuZEZsb2F0cyhi b29sIGZ1bGxMYXlvdXQsIGJvb2wgaGFzSW5saW5lQ2hpbGQsIFZlY3QKICAgICAgICAgfQogICAg ICAgICBBU1NFUlQoZW5kICE9IHJlc29sdmVyLnBvc2l0aW9uKCkpOwogCisgICAgICAgIC8vIFRo aXMgaXMgYSBzaG9ydC1jdXQgZm9yIGVtcHR5IGxpbmVzLgogICAgICAgICBpZiAobGluZUluZm8u aXNFbXB0eSgpKSB7CiAgICAgICAgICAgICBpZiAobGFzdFJvb3RCb3goKSkKICAgICAgICAgICAg ICAgICBsYXN0Um9vdEJveCgpLT5zZXRMaW5lQnJlYWtJbmZvKGVuZC5tX29iaiwgZW5kLm1fcG9z LCByZXNvbHZlci5zdGF0dXMoKSk7CkBAIC04NzAsNTkgKzkyNCwxNyBAQCB2b2lkIFJlbmRlckJs b2NrOjpsYXlvdXRSdW5zQW5kRmxvYXRzKGJvb2wgZnVsbExheW91dCwgYm9vbCBoYXNJbmxpbmVD aGlsZCwgVmVjdAogICAgICAgICAgICAgcmVzb2x2ZXIuY3JlYXRlQmlkaVJ1bnNGb3JMaW5lKGVu ZCwgb3ZlcnJpZGUsIGxpbmVJbmZvLnByZXZpb3VzTGluZUJyb2tlQ2xlYW5seSgpKTsKICAgICAg ICAgICAgIEFTU0VSVChyZXNvbHZlci5wb3NpdGlvbigpID09IGVuZCk7CiAKKyAgICAgICAgICAg IGlmIChiaWRpUnVucy5ydW5Db3VudCgpICYmIGh5cGhlbmF0ZWQpCisgICAgICAgICAgICAgICAg YmlkaVJ1bnMubG9naWNhbGx5TGFzdFJ1bigpLT5tX2hhc0h5cGhlbiA9IHRydWU7CisKICAgICAg ICAgICAgIEJpZGlSdW4qIHRyYWlsaW5nU3BhY2VSdW4gPSAhbGluZUluZm8ucHJldmlvdXNMaW5l QnJva2VDbGVhbmx5KCkgPyBoYW5kbGVUcmFpbGluZ1NwYWNlcyhiaWRpUnVucywgcmVzb2x2ZXIu Y29udGV4dCgpKSA6IDA7CiAKICAgICAgICAgICAgIC8vIE5vdyB0aGF0IHRoZSBydW5zIGhhdmUg YmVlbiBvcmRlcmVkLCB3ZSBjcmVhdGUgdGhlIGxpbmUgYm94ZXMuCiAgICAgICAgICAgICAvLyBB dCB0aGUgc2FtZSB0aW1lIHdlIGZpZ3VyZSBvdXQgd2hlcmUgYm9yZGVyL3BhZGRpbmcvbWFyZ2lu IHNob3VsZCBiZSBhcHBsaWVkIGZvcgogICAgICAgICAgICAgLy8gaW5saW5lIGZsb3cgYm94ZXMu CiAKLSAgICAgICAgICAgIFJvb3RJbmxpbmVCb3gqIGxpbmVCb3ggPSAwOwogICAgICAgICAgICAg aW50IG9sZExvZ2ljYWxIZWlnaHQgPSBsb2dpY2FsSGVpZ2h0KCk7Ci0gICAgICAgICAgICBpZiAo YmlkaVJ1bnMucnVuQ291bnQoKSkgewotICAgICAgICAgICAgICAgIGlmIChoeXBoZW5hdGVkKQot ICAgICAgICAgICAgICAgICAgICBiaWRpUnVucy5sb2dpY2FsbHlMYXN0UnVuKCktPm1faGFzSHlw aGVuID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICBsaW5lSW5mby5zZXRMYXN0TGluZSghZW5kLm1f b2JqKTsKLSAgICAgICAgICAgICAgICBsaW5lQm94ID0gY29uc3RydWN0TGluZShiaWRpUnVucywg bGluZUluZm8pOwotICAgICAgICAgICAgICAgIGlmIChsaW5lQm94KSB7Ci0gICAgICAgICAgICAg ICAgICAgIGxpbmVCb3gtPnNldEVuZHNXaXRoQnJlYWsobGluZUluZm8ucHJldmlvdXNMaW5lQnJv a2VDbGVhbmx5KCkpOwotCi0jaWYgRU5BQkxFKFNWRykKLSAgICAgICAgICAgICAgICAgICAgYm9v bCBpc1NWR1Jvb3RJbmxpbmVCb3ggPSBsaW5lQm94LT5pc1NWR1Jvb3RJbmxpbmVCb3goKTsKLSNl bHNlCi0gICAgICAgICAgICAgICAgICAgIGJvb2wgaXNTVkdSb290SW5saW5lQm94ID0gZmFsc2U7 Ci0jZW5kaWYKLQotICAgICAgICAgICAgICAgICAgICBHbHlwaE92ZXJmbG93QW5kRmFsbGJhY2tG b250c01hcCB0ZXh0Qm94RGF0YU1hcDsKLQotICAgICAgICAgICAgICAgICAgICAvLyBOb3cgd2Ug cG9zaXRpb24gYWxsIG9mIG91ciB0ZXh0IHJ1bnMgaG9yaXpvbnRhbGx5LgotICAgICAgICAgICAg ICAgICAgICBpZiAoIWlzU1ZHUm9vdElubGluZUJveCkKLSAgICAgICAgICAgICAgICAgICAgICAg IGNvbXB1dGVJbmxpbmVEaXJlY3Rpb25Qb3NpdGlvbnNGb3JMaW5lKGxpbmVCb3gsIGxpbmVJbmZv LCBiaWRpUnVucy5maXJzdFJ1bigpLCB0cmFpbGluZ1NwYWNlUnVuLCBlbmQuYXRFbmQoKSwgdGV4 dEJveERhdGFNYXAsIHZlcnRpY2FsUG9zaXRpb25DYWNoZSk7Ci0KLSAgICAgICAgICAgICAgICAg ICAgLy8gTm93IHBvc2l0aW9uIG91ciB0ZXh0IHJ1bnMgdmVydGljYWxseS4KLSAgICAgICAgICAg ICAgICAgICAgY29tcHV0ZUJsb2NrRGlyZWN0aW9uUG9zaXRpb25zRm9yTGluZShsaW5lQm94LCBi aWRpUnVucy5maXJzdFJ1bigpLCB0ZXh0Qm94RGF0YU1hcCwgdmVydGljYWxQb3NpdGlvbkNhY2hl KTsKLQotI2lmIEVOQUJMRShTVkcpCi0gICAgICAgICAgICAgICAgICAgIC8vIFNWRyB0ZXh0IGxh eW91dCBjb2RlIGNvbXB1dGVzIHZlcnRpY2FsICYgaG9yaXpvbnRhbCBwb3NpdGlvbnMgb24gaXRz IG93bi4KLSAgICAgICAgICAgICAgICAgICAgLy8gTm90ZSB0aGF0IHdlIHN0aWxsIG5lZWQgdG8g ZXhlY3V0ZSBjb21wdXRlVmVydGljYWxQb3NpdGlvbnNGb3JMaW5lKCkgYXMKLSAgICAgICAgICAg ICAgICAgICAgLy8gaXQgY2FsbHMgSW5saW5lVGV4dEJveDo6cG9zaXRpb25MaW5lQm94KCksIHdo aWNoIHRyYWNrcyB3aGV0aGVyIHRoZSBib3gKLSAgICAgICAgICAgICAgICAgICAgLy8gY29udGFp bnMgcmV2ZXJzZWQgdGV4dCBvciBub3QuIElmIHdlIHdvdWxkbid0IGRvIHRoYXQgZWRpdGluZyBh bmQgdGh1cwotICAgICAgICAgICAgICAgICAgICAvLyB0ZXh0IHNlbGVjdGlvbiBpbiBSVEwgYm94 ZXMgd291bGQgbm90IHdvcmsgYXMgZXhwZWN0ZWQuCi0gICAgICAgICAgICAgICAgICAgIGlmIChp c1NWR1Jvb3RJbmxpbmVCb3gpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIEFTU0VSVChpc1NW R1RleHQoKSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxTVkdSb290SW5s aW5lQm94Kj4obGluZUJveCktPmNvbXB1dGVQZXJDaGFyYWN0ZXJMYXlvdXRJbmZvcm1hdGlvbigp OwotICAgICAgICAgICAgICAgICAgICB9Ci0jZW5kaWYKLQotICAgICAgICAgICAgICAgICAgICAv LyBDb21wdXRlIG91ciBvdmVyZmxvdyBub3cuCi0gICAgICAgICAgICAgICAgICAgIGxpbmVCb3gt PmNvbXB1dGVPdmVyZmxvdyhsaW5lQm94LT5saW5lVG9wKCksIGxpbmVCb3gtPmxpbmVCb3R0b20o KSwgdGV4dEJveERhdGFNYXApOwotCi0jaWYgUExBVEZPUk0oTUFDKQotICAgICAgICAgICAgICAg ICAgICAvLyBIaWdobGlnaHQgYWN0cyBhcyBhbiBvdmVyZmxvdyBpbmZsYXRpb24uCi0gICAgICAg ICAgICAgICAgICAgIGlmIChzdHlsZSgpLT5oaWdobGlnaHQoKSAhPSBudWxsQXRvbSkKLSAgICAg ICAgICAgICAgICAgICAgICAgIGxpbmVCb3gtPmFkZEhpZ2hsaWdodE92ZXJmbG93KCk7Ci0jZW5k aWYKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICBSb290SW5s aW5lQm94KiBsaW5lQm94ID0gY3JlYXRlTGluZUJveGVzRnJvbUJpZGlSdW5zKGJpZGlSdW5zLCBl bmQsIGxpbmVJbmZvLCB2ZXJ0aWNhbFBvc2l0aW9uQ2FjaGUsIHRyYWlsaW5nU3BhY2VSdW4pOwog CiAgICAgICAgICAgICBiaWRpUnVucy5kZWxldGVSdW5zKCk7CiAgICAgICAgICAgICByZXNvbHZl ci5tYXJrQ3VycmVudFJ1bkVtcHR5KCk7IC8vIEZJWE1FOiBUaGlzIGNhbiBwcm9iYWJseSBiZSBy ZXBsYWNlZCBieSBhbiBBU1NFUlQgKG9yIGp1c3QgcmVtb3ZlZCkuCg== 92163 2011-05-03 16:29:00 -0700 2011-05-03 17:01:36 -0700 Patch bug-60080-20110503162859.patch text/plain 8209 eric U3VidmVyc2lvbiBSZXZpc2lvbjogODU2NjgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0MjRlNWNjNzFmYjlkY2Ex MmMzYmQxNDYzMTRhZjRlYTE0MjEzNWI1Li45NzZjNzNmZmFmNjNjZTE0YzBhZTFkYWVhOGU5OWYz MDE0YjFmYzI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTkgQEAKIDIwMTEtMDUtMDMgIEVyaWMg U2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFNwbGl0IGNyZWF0ZUxpbmVCb3hlc0Zyb21CaWRpUnVucyBvdXQg ZnJvbSBsYXlvdXRSdW5zQW5kRmxvYXRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02MDA4MAorCisgICAgICAgIE5vIGZ1bmN0aW9uYWwgY2hhbmdlLCBq dXN0IG1vdmluZyBjb2RlLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmg6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJCbG9jazo6Y3JlYXRlTGluZUJveGVzRnJvbUJpZGlSdW5zKToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpsYXlvdXRSdW5zQW5kRmxvYXRzKToKKworMjAxMS0w NS0wMyAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKICAgICAgICAgUmV2aWV3ZWQg YnkgUnlvc3VrZSBOaXdhLgogCiAgICAgICAgIFNwbGl0IG91dCBsYXlvdXRSdW5zQW5kRmxvYXRz IGZyb20gbGF5b3V0SW5saW5lQ2hpbGRyZW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9jay5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrLmgKaW5kZXggY2QzN2QwZTRlNDFlMWRmYWJlNDA0MTMwODAwN2Q3OWU1NDZmOTJiZS4uOGM3 ZWJlYzVkZDNjZDI2Y2M4YjA0ZTA5NTg1MjhmMjg0MWUyNzBhZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmgKQEAgLTcwMiw2ICs3MDIsNyBAQCBwcml2YXRlOgogICAgIC8v IEVuZCBoZWxwZXIgZnVuY3Rpb25zIGFuZCBzdHJ1Y3RzIHVzZWQgYnkgbGF5b3V0QmxvY2tDaGls ZHJlbi4KIAogICAgIC8vIEhlbHBlciBmdW5jdGlvbiBmb3IgbGF5b3V0SW5saW5lQ2hpbGRyZW4o KQorICAgIFJvb3RJbmxpbmVCb3gqIGNyZWF0ZUxpbmVCb3hlc0Zyb21CaWRpUnVucyhCaWRpUnVu TGlzdDxCaWRpUnVuPiYsIGNvbnN0IElubGluZUl0ZXJhdG9yJiBlbmQsIExpbmVJbmZvJiwgVmVy dGljYWxQb3NpdGlvbkNhY2hlJiwgQmlkaVJ1biogdHJhaWxpbmdTcGFjZVJ1bik7CiAgICAgdm9p ZCBsYXlvdXRSdW5zQW5kRmxvYXRzKGJvb2wgZnVsbExheW91dCwgYm9vbCBoYXNJbmxpbmVDaGls ZCwgVmVjdG9yPEZsb2F0V2l0aFJlY3Q+JiwgaW50JiByZXBhaW50TG9naWNhbFRvcCwgaW50JiBy ZXBhaW50TG9naWNhbEJvdHRvbSk7CiAKICAgICAvLyBQYWdpbmF0aW9uIHJvdXRpbmVzLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcApp bmRleCAzNGYyMWIwMGRiNGQwMjUxMWNiOThiYzdlMWVkMmUwMTljYTNiZjM3Li4xZDdhZDUzNjY4 Y2QwMGI1ZTJkZTg4ZWQ5OTQwODQ0YWRiZDU5Y2MwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcApAQCAtNzUxLDYgKzc1MSw1OSBA QCB2b2lkIFJlbmRlckJsb2NrOjphcHBlbmRGbG9hdGluZ09iamVjdFRvTGFzdExpbmUoRmxvYXRp bmdPYmplY3QqIGZsb2F0aW5nT2JqZWN0KQogICAgIGxhc3RSb290Qm94KCktPmFwcGVuZEZsb2F0 KGZsb2F0aW5nT2JqZWN0LT5yZW5kZXJlcigpKTsKIH0KIAorLy8gVGhpcyBmdW5jdGlvbiBjb25z dHJ1Y3RzIGxpbmUgYm94ZXMgZm9yIGFsbCBvZiB0aGUgdGV4dCBydW5zIGluIHRoZSByZXNvbHZl ciBhbmQgY29tcHV0ZXMgdGhlaXIgcG9zaXRpb24uCitSb290SW5saW5lQm94KiBSZW5kZXJCbG9j azo6Y3JlYXRlTGluZUJveGVzRnJvbUJpZGlSdW5zKEJpZGlSdW5MaXN0PEJpZGlSdW4+JiBiaWRp UnVucywgY29uc3QgSW5saW5lSXRlcmF0b3ImIGVuZCwgTGluZUluZm8mIGxpbmVJbmZvLCBWZXJ0 aWNhbFBvc2l0aW9uQ2FjaGUmIHZlcnRpY2FsUG9zaXRpb25DYWNoZSwgQmlkaVJ1biogdHJhaWxp bmdTcGFjZVJ1bikKK3sKKyAgICBpZiAoIWJpZGlSdW5zLnJ1bkNvdW50KCkpCisgICAgICAgIHJl dHVybiAwOworCisgICAgLy8gRklYTUU6IFdoeSBpcyB0aGlzIG9ubHkgZG9uZSB3aGVuIHdlIGhh ZCBydW5zPworICAgIGxpbmVJbmZvLnNldExhc3RMaW5lKCFlbmQubV9vYmopOworCisgICAgUm9v dElubGluZUJveCogbGluZUJveCA9IGNvbnN0cnVjdExpbmUoYmlkaVJ1bnMsIGxpbmVJbmZvKTsK KyAgICBpZiAoIWxpbmVCb3gpCisgICAgICAgIHJldHVybiAwOworCisgICAgbGluZUJveC0+c2V0 RW5kc1dpdGhCcmVhayhsaW5lSW5mby5wcmV2aW91c0xpbmVCcm9rZUNsZWFubHkoKSk7CisgICAg CisjaWYgRU5BQkxFKFNWRykKKyAgICBib29sIGlzU1ZHUm9vdElubGluZUJveCA9IGxpbmVCb3gt PmlzU1ZHUm9vdElubGluZUJveCgpOworI2Vsc2UKKyAgICBib29sIGlzU1ZHUm9vdElubGluZUJv eCA9IGZhbHNlOworI2VuZGlmCisgICAgCisgICAgR2x5cGhPdmVyZmxvd0FuZEZhbGxiYWNrRm9u dHNNYXAgdGV4dEJveERhdGFNYXA7CisgICAgCisgICAgLy8gTm93IHdlIHBvc2l0aW9uIGFsbCBv ZiBvdXIgdGV4dCBydW5zIGhvcml6b250YWxseS4KKyAgICBpZiAoIWlzU1ZHUm9vdElubGluZUJv eCkKKyAgICAgICAgY29tcHV0ZUlubGluZURpcmVjdGlvblBvc2l0aW9uc0ZvckxpbmUobGluZUJv eCwgbGluZUluZm8sIGJpZGlSdW5zLmZpcnN0UnVuKCksIHRyYWlsaW5nU3BhY2VSdW4sIGVuZC5h dEVuZCgpLCB0ZXh0Qm94RGF0YU1hcCwgdmVydGljYWxQb3NpdGlvbkNhY2hlKTsKKyAgICAKKyAg ICAvLyBOb3cgcG9zaXRpb24gb3VyIHRleHQgcnVucyB2ZXJ0aWNhbGx5LgorICAgIGNvbXB1dGVC bG9ja0RpcmVjdGlvblBvc2l0aW9uc0ZvckxpbmUobGluZUJveCwgYmlkaVJ1bnMuZmlyc3RSdW4o KSwgdGV4dEJveERhdGFNYXAsIHZlcnRpY2FsUG9zaXRpb25DYWNoZSk7CisgICAgCisjaWYgRU5B QkxFKFNWRykKKyAgICAvLyBTVkcgdGV4dCBsYXlvdXQgY29kZSBjb21wdXRlcyB2ZXJ0aWNhbCAm IGhvcml6b250YWwgcG9zaXRpb25zIG9uIGl0cyBvd24uCisgICAgLy8gTm90ZSB0aGF0IHdlIHN0 aWxsIG5lZWQgdG8gZXhlY3V0ZSBjb21wdXRlVmVydGljYWxQb3NpdGlvbnNGb3JMaW5lKCkgYXMK KyAgICAvLyBpdCBjYWxscyBJbmxpbmVUZXh0Qm94Ojpwb3NpdGlvbkxpbmVCb3goKSwgd2hpY2gg dHJhY2tzIHdoZXRoZXIgdGhlIGJveAorICAgIC8vIGNvbnRhaW5zIHJldmVyc2VkIHRleHQgb3Ig bm90LiBJZiB3ZSB3b3VsZG4ndCBkbyB0aGF0IGVkaXRpbmcgYW5kIHRodXMKKyAgICAvLyB0ZXh0 IHNlbGVjdGlvbiBpbiBSVEwgYm94ZXMgd291bGQgbm90IHdvcmsgYXMgZXhwZWN0ZWQuCisgICAg aWYgKGlzU1ZHUm9vdElubGluZUJveCkgeworICAgICAgICBBU1NFUlQoaXNTVkdUZXh0KCkpOwor ICAgICAgICBzdGF0aWNfY2FzdDxTVkdSb290SW5saW5lQm94Kj4obGluZUJveCktPmNvbXB1dGVQ ZXJDaGFyYWN0ZXJMYXlvdXRJbmZvcm1hdGlvbigpOworICAgIH0KKyNlbmRpZgorICAgIAorICAg IC8vIENvbXB1dGUgb3VyIG92ZXJmbG93IG5vdy4KKyAgICBsaW5lQm94LT5jb21wdXRlT3ZlcmZs b3cobGluZUJveC0+bGluZVRvcCgpLCBsaW5lQm94LT5saW5lQm90dG9tKCksIHRleHRCb3hEYXRh TWFwKTsKKyAgICAKKyNpZiBQTEFURk9STShNQUMpCisgICAgLy8gSGlnaGxpZ2h0IGFjdHMgYXMg YW4gb3ZlcmZsb3cgaW5mbGF0aW9uLgorICAgIGlmIChzdHlsZSgpLT5oaWdobGlnaHQoKSAhPSBu dWxsQXRvbSkKKyAgICAgICAgbGluZUJveC0+YWRkSGlnaGxpZ2h0T3ZlcmZsb3coKTsKKyNlbmRp ZgorICAgIHJldHVybiBsaW5lQm94OworfQorCiB2b2lkIFJlbmRlckJsb2NrOjpsYXlvdXRSdW5z QW5kRmxvYXRzKGJvb2wgZnVsbExheW91dCwgYm9vbCBoYXNJbmxpbmVDaGlsZCwgVmVjdG9yPEZs b2F0V2l0aFJlY3Q+JiBmbG9hdHMsIGludCYgcmVwYWludExvZ2ljYWxUb3AsIGludCYgcmVwYWlu dExvZ2ljYWxCb3R0b20pCiB7CiAgICAgLy8gV2Ugd2FudCB0byBza2lwIGFoZWFkIHRvIHRoZSBm aXJzdCBkaXJ0eSBsaW5lCkBAIC04NjAsNiArOTEzLDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6bGF5 b3V0UnVuc0FuZEZsb2F0cyhib29sIGZ1bGxMYXlvdXQsIGJvb2wgaGFzSW5saW5lQ2hpbGQsIFZl Y3QKICAgICAgICAgfQogICAgICAgICBBU1NFUlQoZW5kICE9IHJlc29sdmVyLnBvc2l0aW9uKCkp OwogCisgICAgICAgIC8vIFRoaXMgaXMgYSBzaG9ydC1jdXQgZm9yIGVtcHR5IGxpbmVzLgogICAg ICAgICBpZiAobGluZUluZm8uaXNFbXB0eSgpKSB7CiAgICAgICAgICAgICBpZiAobGFzdFJvb3RC b3goKSkKICAgICAgICAgICAgICAgICBsYXN0Um9vdEJveCgpLT5zZXRMaW5lQnJlYWtJbmZvKGVu ZC5tX29iaiwgZW5kLm1fcG9zLCByZXNvbHZlci5zdGF0dXMoKSk7CkBAIC04NzAsNTkgKzkyNCwx NyBAQCB2b2lkIFJlbmRlckJsb2NrOjpsYXlvdXRSdW5zQW5kRmxvYXRzKGJvb2wgZnVsbExheW91 dCwgYm9vbCBoYXNJbmxpbmVDaGlsZCwgVmVjdAogICAgICAgICAgICAgcmVzb2x2ZXIuY3JlYXRl QmlkaVJ1bnNGb3JMaW5lKGVuZCwgb3ZlcnJpZGUsIGxpbmVJbmZvLnByZXZpb3VzTGluZUJyb2tl Q2xlYW5seSgpKTsKICAgICAgICAgICAgIEFTU0VSVChyZXNvbHZlci5wb3NpdGlvbigpID09IGVu ZCk7CiAKKyAgICAgICAgICAgIGlmIChiaWRpUnVucy5ydW5Db3VudCgpICYmIGh5cGhlbmF0ZWQp CisgICAgICAgICAgICAgICAgYmlkaVJ1bnMubG9naWNhbGx5TGFzdFJ1bigpLT5tX2hhc0h5cGhl biA9IHRydWU7CisKICAgICAgICAgICAgIEJpZGlSdW4qIHRyYWlsaW5nU3BhY2VSdW4gPSAhbGlu ZUluZm8ucHJldmlvdXNMaW5lQnJva2VDbGVhbmx5KCkgPyBoYW5kbGVUcmFpbGluZ1NwYWNlcyhi aWRpUnVucywgcmVzb2x2ZXIuY29udGV4dCgpKSA6IDA7CiAKICAgICAgICAgICAgIC8vIE5vdyB0 aGF0IHRoZSBydW5zIGhhdmUgYmVlbiBvcmRlcmVkLCB3ZSBjcmVhdGUgdGhlIGxpbmUgYm94ZXMu CiAgICAgICAgICAgICAvLyBBdCB0aGUgc2FtZSB0aW1lIHdlIGZpZ3VyZSBvdXQgd2hlcmUgYm9y ZGVyL3BhZGRpbmcvbWFyZ2luIHNob3VsZCBiZSBhcHBsaWVkIGZvcgogICAgICAgICAgICAgLy8g aW5saW5lIGZsb3cgYm94ZXMuCiAKLSAgICAgICAgICAgIFJvb3RJbmxpbmVCb3gqIGxpbmVCb3gg PSAwOwogICAgICAgICAgICAgaW50IG9sZExvZ2ljYWxIZWlnaHQgPSBsb2dpY2FsSGVpZ2h0KCk7 Ci0gICAgICAgICAgICBpZiAoYmlkaVJ1bnMucnVuQ291bnQoKSkgewotICAgICAgICAgICAgICAg IGlmIChoeXBoZW5hdGVkKQotICAgICAgICAgICAgICAgICAgICBiaWRpUnVucy5sb2dpY2FsbHlM YXN0UnVuKCktPm1faGFzSHlwaGVuID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICBsaW5lSW5mby5z ZXRMYXN0TGluZSghZW5kLm1fb2JqKTsKLSAgICAgICAgICAgICAgICBsaW5lQm94ID0gY29uc3Ry dWN0TGluZShiaWRpUnVucywgbGluZUluZm8pOwotICAgICAgICAgICAgICAgIGlmIChsaW5lQm94 KSB7Ci0gICAgICAgICAgICAgICAgICAgIGxpbmVCb3gtPnNldEVuZHNXaXRoQnJlYWsobGluZUlu Zm8ucHJldmlvdXNMaW5lQnJva2VDbGVhbmx5KCkpOwotCi0jaWYgRU5BQkxFKFNWRykKLSAgICAg ICAgICAgICAgICAgICAgYm9vbCBpc1NWR1Jvb3RJbmxpbmVCb3ggPSBsaW5lQm94LT5pc1NWR1Jv b3RJbmxpbmVCb3goKTsKLSNlbHNlCi0gICAgICAgICAgICAgICAgICAgIGJvb2wgaXNTVkdSb290 SW5saW5lQm94ID0gZmFsc2U7Ci0jZW5kaWYKLQotICAgICAgICAgICAgICAgICAgICBHbHlwaE92 ZXJmbG93QW5kRmFsbGJhY2tGb250c01hcCB0ZXh0Qm94RGF0YU1hcDsKLQotICAgICAgICAgICAg ICAgICAgICAvLyBOb3cgd2UgcG9zaXRpb24gYWxsIG9mIG91ciB0ZXh0IHJ1bnMgaG9yaXpvbnRh bGx5LgotICAgICAgICAgICAgICAgICAgICBpZiAoIWlzU1ZHUm9vdElubGluZUJveCkKLSAgICAg ICAgICAgICAgICAgICAgICAgIGNvbXB1dGVJbmxpbmVEaXJlY3Rpb25Qb3NpdGlvbnNGb3JMaW5l KGxpbmVCb3gsIGxpbmVJbmZvLCBiaWRpUnVucy5maXJzdFJ1bigpLCB0cmFpbGluZ1NwYWNlUnVu LCBlbmQuYXRFbmQoKSwgdGV4dEJveERhdGFNYXAsIHZlcnRpY2FsUG9zaXRpb25DYWNoZSk7Ci0K LSAgICAgICAgICAgICAgICAgICAgLy8gTm93IHBvc2l0aW9uIG91ciB0ZXh0IHJ1bnMgdmVydGlj YWxseS4KLSAgICAgICAgICAgICAgICAgICAgY29tcHV0ZUJsb2NrRGlyZWN0aW9uUG9zaXRpb25z Rm9yTGluZShsaW5lQm94LCBiaWRpUnVucy5maXJzdFJ1bigpLCB0ZXh0Qm94RGF0YU1hcCwgdmVy dGljYWxQb3NpdGlvbkNhY2hlKTsKLQotI2lmIEVOQUJMRShTVkcpCi0gICAgICAgICAgICAgICAg ICAgIC8vIFNWRyB0ZXh0IGxheW91dCBjb2RlIGNvbXB1dGVzIHZlcnRpY2FsICYgaG9yaXpvbnRh bCBwb3NpdGlvbnMgb24gaXRzIG93bi4KLSAgICAgICAgICAgICAgICAgICAgLy8gTm90ZSB0aGF0 IHdlIHN0aWxsIG5lZWQgdG8gZXhlY3V0ZSBjb21wdXRlVmVydGljYWxQb3NpdGlvbnNGb3JMaW5l KCkgYXMKLSAgICAgICAgICAgICAgICAgICAgLy8gaXQgY2FsbHMgSW5saW5lVGV4dEJveDo6cG9z aXRpb25MaW5lQm94KCksIHdoaWNoIHRyYWNrcyB3aGV0aGVyIHRoZSBib3gKLSAgICAgICAgICAg ICAgICAgICAgLy8gY29udGFpbnMgcmV2ZXJzZWQgdGV4dCBvciBub3QuIElmIHdlIHdvdWxkbid0 IGRvIHRoYXQgZWRpdGluZyBhbmQgdGh1cwotICAgICAgICAgICAgICAgICAgICAvLyB0ZXh0IHNl bGVjdGlvbiBpbiBSVEwgYm94ZXMgd291bGQgbm90IHdvcmsgYXMgZXhwZWN0ZWQuCi0gICAgICAg ICAgICAgICAgICAgIGlmIChpc1NWR1Jvb3RJbmxpbmVCb3gpIHsKLSAgICAgICAgICAgICAgICAg ICAgICAgIEFTU0VSVChpc1NWR1RleHQoKSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBzdGF0 aWNfY2FzdDxTVkdSb290SW5saW5lQm94Kj4obGluZUJveCktPmNvbXB1dGVQZXJDaGFyYWN0ZXJM YXlvdXRJbmZvcm1hdGlvbigpOwotICAgICAgICAgICAgICAgICAgICB9Ci0jZW5kaWYKLQotICAg ICAgICAgICAgICAgICAgICAvLyBDb21wdXRlIG91ciBvdmVyZmxvdyBub3cuCi0gICAgICAgICAg ICAgICAgICAgIGxpbmVCb3gtPmNvbXB1dGVPdmVyZmxvdyhsaW5lQm94LT5saW5lVG9wKCksIGxp bmVCb3gtPmxpbmVCb3R0b20oKSwgdGV4dEJveERhdGFNYXApOwotCi0jaWYgUExBVEZPUk0oTUFD KQotICAgICAgICAgICAgICAgICAgICAvLyBIaWdobGlnaHQgYWN0cyBhcyBhbiBvdmVyZmxvdyBp bmZsYXRpb24uCi0gICAgICAgICAgICAgICAgICAgIGlmIChzdHlsZSgpLT5oaWdobGlnaHQoKSAh PSBudWxsQXRvbSkKLSAgICAgICAgICAgICAgICAgICAgICAgIGxpbmVCb3gtPmFkZEhpZ2hsaWdo dE92ZXJmbG93KCk7Ci0jZW5kaWYKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9Cisg ICAgICAgICAgICBSb290SW5saW5lQm94KiBsaW5lQm94ID0gY3JlYXRlTGluZUJveGVzRnJvbUJp ZGlSdW5zKGJpZGlSdW5zLCBlbmQsIGxpbmVJbmZvLCB2ZXJ0aWNhbFBvc2l0aW9uQ2FjaGUsIHRy YWlsaW5nU3BhY2VSdW4pOwogCiAgICAgICAgICAgICBiaWRpUnVucy5kZWxldGVSdW5zKCk7CiAg ICAgICAgICAgICByZXNvbHZlci5tYXJrQ3VycmVudFJ1bkVtcHR5KCk7IC8vIEZJWE1FOiBUaGlz IGNhbiBwcm9iYWJseSBiZSByZXBsYWNlZCBieSBhbiBBU1NFUlQgKG9yIGp1c3QgcmVtb3ZlZCku Cg== 92172 2011-05-03 17:01:40 -0700 2011-05-04 04:51:19 -0700 Patch for landing bug-60080-20110503170138.patch text/plain 8063 eric U3VidmVyc2lvbiBSZXZpc2lvbjogODU2NjgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0MjRlNWNjNzFmYjlkY2Ex MmMzYmQxNDYzMTRhZjRlYTE0MjEzNWI1Li45NzZjNzNmZmFmNjNjZTE0YzBhZTFkYWVhOGU5OWYz MDE0YjFmYzI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTkgQEAKIDIwMTEtMDUtMDMgIEVyaWMg U2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFNwbGl0IGNyZWF0ZUxpbmVCb3hlc0Zyb21CaWRpUnVucyBvdXQg ZnJvbSBsYXlvdXRSdW5zQW5kRmxvYXRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02MDA4MAorCisgICAgICAgIE5vIGZ1bmN0aW9uYWwgY2hhbmdlLCBq dXN0IG1vdmluZyBjb2RlLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmg6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJCbG9jazo6Y3JlYXRlTGluZUJveGVzRnJvbUJpZGlSdW5zKToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpsYXlvdXRSdW5zQW5kRmxvYXRzKToKKworMjAxMS0w NS0wMyAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKICAgICAgICAgUmV2aWV3ZWQg YnkgUnlvc3VrZSBOaXdhLgogCiAgICAgICAgIFNwbGl0IG91dCBsYXlvdXRSdW5zQW5kRmxvYXRz IGZyb20gbGF5b3V0SW5saW5lQ2hpbGRyZW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9jay5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrLmgKaW5kZXggY2QzN2QwZTRlNDFlMWRmYWJlNDA0MTMwODAwN2Q3OWU1NDZmOTJiZS4uOGM3 ZWJlYzVkZDNjZDI2Y2M4YjA0ZTA5NTg1MjhmMjg0MWUyNzBhZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmgKQEAgLTcwMiw2ICs3MDIsNyBAQCBwcml2YXRlOgogICAgIC8v IEVuZCBoZWxwZXIgZnVuY3Rpb25zIGFuZCBzdHJ1Y3RzIHVzZWQgYnkgbGF5b3V0QmxvY2tDaGls ZHJlbi4KIAogICAgIC8vIEhlbHBlciBmdW5jdGlvbiBmb3IgbGF5b3V0SW5saW5lQ2hpbGRyZW4o KQorICAgIFJvb3RJbmxpbmVCb3gqIGNyZWF0ZUxpbmVCb3hlc0Zyb21CaWRpUnVucyhCaWRpUnVu TGlzdDxCaWRpUnVuPiYsIGNvbnN0IElubGluZUl0ZXJhdG9yJiBlbmQsIExpbmVJbmZvJiwgVmVy dGljYWxQb3NpdGlvbkNhY2hlJiwgQmlkaVJ1biogdHJhaWxpbmdTcGFjZVJ1bik7CiAgICAgdm9p ZCBsYXlvdXRSdW5zQW5kRmxvYXRzKGJvb2wgZnVsbExheW91dCwgYm9vbCBoYXNJbmxpbmVDaGls ZCwgVmVjdG9yPEZsb2F0V2l0aFJlY3Q+JiwgaW50JiByZXBhaW50TG9naWNhbFRvcCwgaW50JiBy ZXBhaW50TG9naWNhbEJvdHRvbSk7CiAKICAgICAvLyBQYWdpbmF0aW9uIHJvdXRpbmVzLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcApp bmRleCAzNGYyMWIwMGRiNGQwMjUxMWNiOThiYzdlMWVkMmUwMTljYTNiZjM3Li4yZmVkYzE5NjBj NWRlMjMxYjk1OGQwMmJjZGM3NjQwNTY5MTczMDg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcApAQCAtNzUxLDYgKzc1MSw1OSBA QCB2b2lkIFJlbmRlckJsb2NrOjphcHBlbmRGbG9hdGluZ09iamVjdFRvTGFzdExpbmUoRmxvYXRp bmdPYmplY3QqIGZsb2F0aW5nT2JqZWN0KQogICAgIGxhc3RSb290Qm94KCktPmFwcGVuZEZsb2F0 KGZsb2F0aW5nT2JqZWN0LT5yZW5kZXJlcigpKTsKIH0KIAorLy8gVGhpcyBmdW5jdGlvbiBjb25z dHJ1Y3RzIGxpbmUgYm94ZXMgZm9yIGFsbCBvZiB0aGUgdGV4dCBydW5zIGluIHRoZSByZXNvbHZl ciBhbmQgY29tcHV0ZXMgdGhlaXIgcG9zaXRpb24uCitSb290SW5saW5lQm94KiBSZW5kZXJCbG9j azo6Y3JlYXRlTGluZUJveGVzRnJvbUJpZGlSdW5zKEJpZGlSdW5MaXN0PEJpZGlSdW4+JiBiaWRp UnVucywgY29uc3QgSW5saW5lSXRlcmF0b3ImIGVuZCwgTGluZUluZm8mIGxpbmVJbmZvLCBWZXJ0 aWNhbFBvc2l0aW9uQ2FjaGUmIHZlcnRpY2FsUG9zaXRpb25DYWNoZSwgQmlkaVJ1biogdHJhaWxp bmdTcGFjZVJ1bikKK3sKKyAgICBpZiAoIWJpZGlSdW5zLnJ1bkNvdW50KCkpCisgICAgICAgIHJl dHVybiAwOworCisgICAgLy8gRklYTUU6IFdoeSBpcyB0aGlzIG9ubHkgZG9uZSB3aGVuIHdlIGhh ZCBydW5zPworICAgIGxpbmVJbmZvLnNldExhc3RMaW5lKCFlbmQubV9vYmopOworCisgICAgUm9v dElubGluZUJveCogbGluZUJveCA9IGNvbnN0cnVjdExpbmUoYmlkaVJ1bnMsIGxpbmVJbmZvKTsK KyAgICBpZiAoIWxpbmVCb3gpCisgICAgICAgIHJldHVybiAwOworCisgICAgbGluZUJveC0+c2V0 RW5kc1dpdGhCcmVhayhsaW5lSW5mby5wcmV2aW91c0xpbmVCcm9rZUNsZWFubHkoKSk7CisgICAg CisjaWYgRU5BQkxFKFNWRykKKyAgICBib29sIGlzU1ZHUm9vdElubGluZUJveCA9IGxpbmVCb3gt PmlzU1ZHUm9vdElubGluZUJveCgpOworI2Vsc2UKKyAgICBib29sIGlzU1ZHUm9vdElubGluZUJv eCA9IGZhbHNlOworI2VuZGlmCisgICAgCisgICAgR2x5cGhPdmVyZmxvd0FuZEZhbGxiYWNrRm9u dHNNYXAgdGV4dEJveERhdGFNYXA7CisgICAgCisgICAgLy8gTm93IHdlIHBvc2l0aW9uIGFsbCBv ZiBvdXIgdGV4dCBydW5zIGhvcml6b250YWxseS4KKyAgICBpZiAoIWlzU1ZHUm9vdElubGluZUJv eCkKKyAgICAgICAgY29tcHV0ZUlubGluZURpcmVjdGlvblBvc2l0aW9uc0ZvckxpbmUobGluZUJv eCwgbGluZUluZm8sIGJpZGlSdW5zLmZpcnN0UnVuKCksIHRyYWlsaW5nU3BhY2VSdW4sIGVuZC5h dEVuZCgpLCB0ZXh0Qm94RGF0YU1hcCwgdmVydGljYWxQb3NpdGlvbkNhY2hlKTsKKyAgICAKKyAg ICAvLyBOb3cgcG9zaXRpb24gb3VyIHRleHQgcnVucyB2ZXJ0aWNhbGx5LgorICAgIGNvbXB1dGVC bG9ja0RpcmVjdGlvblBvc2l0aW9uc0ZvckxpbmUobGluZUJveCwgYmlkaVJ1bnMuZmlyc3RSdW4o KSwgdGV4dEJveERhdGFNYXAsIHZlcnRpY2FsUG9zaXRpb25DYWNoZSk7CisgICAgCisjaWYgRU5B QkxFKFNWRykKKyAgICAvLyBTVkcgdGV4dCBsYXlvdXQgY29kZSBjb21wdXRlcyB2ZXJ0aWNhbCAm IGhvcml6b250YWwgcG9zaXRpb25zIG9uIGl0cyBvd24uCisgICAgLy8gTm90ZSB0aGF0IHdlIHN0 aWxsIG5lZWQgdG8gZXhlY3V0ZSBjb21wdXRlVmVydGljYWxQb3NpdGlvbnNGb3JMaW5lKCkgYXMK KyAgICAvLyBpdCBjYWxscyBJbmxpbmVUZXh0Qm94Ojpwb3NpdGlvbkxpbmVCb3goKSwgd2hpY2gg dHJhY2tzIHdoZXRoZXIgdGhlIGJveAorICAgIC8vIGNvbnRhaW5zIHJldmVyc2VkIHRleHQgb3Ig bm90LiBJZiB3ZSB3b3VsZG4ndCBkbyB0aGF0IGVkaXRpbmcgYW5kIHRodXMKKyAgICAvLyB0ZXh0 IHNlbGVjdGlvbiBpbiBSVEwgYm94ZXMgd291bGQgbm90IHdvcmsgYXMgZXhwZWN0ZWQuCisgICAg aWYgKGlzU1ZHUm9vdElubGluZUJveCkgeworICAgICAgICBBU1NFUlQoaXNTVkdUZXh0KCkpOwor ICAgICAgICBzdGF0aWNfY2FzdDxTVkdSb290SW5saW5lQm94Kj4obGluZUJveCktPmNvbXB1dGVQ ZXJDaGFyYWN0ZXJMYXlvdXRJbmZvcm1hdGlvbigpOworICAgIH0KKyNlbmRpZgorICAgIAorICAg IC8vIENvbXB1dGUgb3VyIG92ZXJmbG93IG5vdy4KKyAgICBsaW5lQm94LT5jb21wdXRlT3ZlcmZs b3cobGluZUJveC0+bGluZVRvcCgpLCBsaW5lQm94LT5saW5lQm90dG9tKCksIHRleHRCb3hEYXRh TWFwKTsKKyAgICAKKyNpZiBQTEFURk9STShNQUMpCisgICAgLy8gSGlnaGxpZ2h0IGFjdHMgYXMg YW4gb3ZlcmZsb3cgaW5mbGF0aW9uLgorICAgIGlmIChzdHlsZSgpLT5oaWdobGlnaHQoKSAhPSBu dWxsQXRvbSkKKyAgICAgICAgbGluZUJveC0+YWRkSGlnaGxpZ2h0T3ZlcmZsb3coKTsKKyNlbmRp ZgorICAgIHJldHVybiBsaW5lQm94OworfQorCiB2b2lkIFJlbmRlckJsb2NrOjpsYXlvdXRSdW5z QW5kRmxvYXRzKGJvb2wgZnVsbExheW91dCwgYm9vbCBoYXNJbmxpbmVDaGlsZCwgVmVjdG9yPEZs b2F0V2l0aFJlY3Q+JiBmbG9hdHMsIGludCYgcmVwYWludExvZ2ljYWxUb3AsIGludCYgcmVwYWlu dExvZ2ljYWxCb3R0b20pCiB7CiAgICAgLy8gV2Ugd2FudCB0byBza2lwIGFoZWFkIHRvIHRoZSBm aXJzdCBkaXJ0eSBsaW5lCkBAIC04NjAsNiArOTEzLDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6bGF5 b3V0UnVuc0FuZEZsb2F0cyhib29sIGZ1bGxMYXlvdXQsIGJvb2wgaGFzSW5saW5lQ2hpbGQsIFZl Y3QKICAgICAgICAgfQogICAgICAgICBBU1NFUlQoZW5kICE9IHJlc29sdmVyLnBvc2l0aW9uKCkp OwogCisgICAgICAgIC8vIFRoaXMgaXMgYSBzaG9ydC1jdXQgZm9yIGVtcHR5IGxpbmVzLgogICAg ICAgICBpZiAobGluZUluZm8uaXNFbXB0eSgpKSB7CiAgICAgICAgICAgICBpZiAobGFzdFJvb3RC b3goKSkKICAgICAgICAgICAgICAgICBsYXN0Um9vdEJveCgpLT5zZXRMaW5lQnJlYWtJbmZvKGVu ZC5tX29iaiwgZW5kLm1fcG9zLCByZXNvbHZlci5zdGF0dXMoKSk7CkBAIC04NzIsNTcgKzkyNiwx NSBAQCB2b2lkIFJlbmRlckJsb2NrOjpsYXlvdXRSdW5zQW5kRmxvYXRzKGJvb2wgZnVsbExheW91 dCwgYm9vbCBoYXNJbmxpbmVDaGlsZCwgVmVjdAogCiAgICAgICAgICAgICBCaWRpUnVuKiB0cmFp bGluZ1NwYWNlUnVuID0gIWxpbmVJbmZvLnByZXZpb3VzTGluZUJyb2tlQ2xlYW5seSgpID8gaGFu ZGxlVHJhaWxpbmdTcGFjZXMoYmlkaVJ1bnMsIHJlc29sdmVyLmNvbnRleHQoKSkgOiAwOwogCisg ICAgICAgICAgICBpZiAoYmlkaVJ1bnMucnVuQ291bnQoKSAmJiBoeXBoZW5hdGVkKQorICAgICAg ICAgICAgICAgIGJpZGlSdW5zLmxvZ2ljYWxseUxhc3RSdW4oKS0+bV9oYXNIeXBoZW4gPSB0cnVl OworCiAgICAgICAgICAgICAvLyBOb3cgdGhhdCB0aGUgcnVucyBoYXZlIGJlZW4gb3JkZXJlZCwg d2UgY3JlYXRlIHRoZSBsaW5lIGJveGVzLgogICAgICAgICAgICAgLy8gQXQgdGhlIHNhbWUgdGlt ZSB3ZSBmaWd1cmUgb3V0IHdoZXJlIGJvcmRlci9wYWRkaW5nL21hcmdpbiBzaG91bGQgYmUgYXBw bGllZCBmb3IKICAgICAgICAgICAgIC8vIGlubGluZSBmbG93IGJveGVzLgogCi0gICAgICAgICAg ICBSb290SW5saW5lQm94KiBsaW5lQm94ID0gMDsKICAgICAgICAgICAgIGludCBvbGRMb2dpY2Fs SGVpZ2h0ID0gbG9naWNhbEhlaWdodCgpOwotICAgICAgICAgICAgaWYgKGJpZGlSdW5zLnJ1bkNv dW50KCkpIHsKLSAgICAgICAgICAgICAgICBpZiAoaHlwaGVuYXRlZCkKLSAgICAgICAgICAgICAg ICAgICAgYmlkaVJ1bnMubG9naWNhbGx5TGFzdFJ1bigpLT5tX2hhc0h5cGhlbiA9IHRydWU7Ci0g ICAgICAgICAgICAgICAgbGluZUluZm8uc2V0TGFzdExpbmUoIWVuZC5tX29iaik7Ci0gICAgICAg ICAgICAgICAgbGluZUJveCA9IGNvbnN0cnVjdExpbmUoYmlkaVJ1bnMsIGxpbmVJbmZvKTsKLSAg ICAgICAgICAgICAgICBpZiAobGluZUJveCkgewotICAgICAgICAgICAgICAgICAgICBsaW5lQm94 LT5zZXRFbmRzV2l0aEJyZWFrKGxpbmVJbmZvLnByZXZpb3VzTGluZUJyb2tlQ2xlYW5seSgpKTsK LQotI2lmIEVOQUJMRShTVkcpCi0gICAgICAgICAgICAgICAgICAgIGJvb2wgaXNTVkdSb290SW5s aW5lQm94ID0gbGluZUJveC0+aXNTVkdSb290SW5saW5lQm94KCk7Ci0jZWxzZQotICAgICAgICAg ICAgICAgICAgICBib29sIGlzU1ZHUm9vdElubGluZUJveCA9IGZhbHNlOwotI2VuZGlmCi0KLSAg ICAgICAgICAgICAgICAgICAgR2x5cGhPdmVyZmxvd0FuZEZhbGxiYWNrRm9udHNNYXAgdGV4dEJv eERhdGFNYXA7Ci0KLSAgICAgICAgICAgICAgICAgICAgLy8gTm93IHdlIHBvc2l0aW9uIGFsbCBv ZiBvdXIgdGV4dCBydW5zIGhvcml6b250YWxseS4KLSAgICAgICAgICAgICAgICAgICAgaWYgKCFp c1NWR1Jvb3RJbmxpbmVCb3gpCi0gICAgICAgICAgICAgICAgICAgICAgICBjb21wdXRlSW5saW5l RGlyZWN0aW9uUG9zaXRpb25zRm9yTGluZShsaW5lQm94LCBsaW5lSW5mbywgYmlkaVJ1bnMuZmly c3RSdW4oKSwgdHJhaWxpbmdTcGFjZVJ1biwgZW5kLmF0RW5kKCksIHRleHRCb3hEYXRhTWFwLCB2 ZXJ0aWNhbFBvc2l0aW9uQ2FjaGUpOwotCi0gICAgICAgICAgICAgICAgICAgIC8vIE5vdyBwb3Np dGlvbiBvdXIgdGV4dCBydW5zIHZlcnRpY2FsbHkuCi0gICAgICAgICAgICAgICAgICAgIGNvbXB1 dGVCbG9ja0RpcmVjdGlvblBvc2l0aW9uc0ZvckxpbmUobGluZUJveCwgYmlkaVJ1bnMuZmlyc3RS dW4oKSwgdGV4dEJveERhdGFNYXAsIHZlcnRpY2FsUG9zaXRpb25DYWNoZSk7Ci0KLSNpZiBFTkFC TEUoU1ZHKQotICAgICAgICAgICAgICAgICAgICAvLyBTVkcgdGV4dCBsYXlvdXQgY29kZSBjb21w dXRlcyB2ZXJ0aWNhbCAmIGhvcml6b250YWwgcG9zaXRpb25zIG9uIGl0cyBvd24uCi0gICAgICAg ICAgICAgICAgICAgIC8vIE5vdGUgdGhhdCB3ZSBzdGlsbCBuZWVkIHRvIGV4ZWN1dGUgY29tcHV0 ZVZlcnRpY2FsUG9zaXRpb25zRm9yTGluZSgpIGFzCi0gICAgICAgICAgICAgICAgICAgIC8vIGl0 IGNhbGxzIElubGluZVRleHRCb3g6OnBvc2l0aW9uTGluZUJveCgpLCB3aGljaCB0cmFja3Mgd2hl dGhlciB0aGUgYm94Ci0gICAgICAgICAgICAgICAgICAgIC8vIGNvbnRhaW5zIHJldmVyc2VkIHRl eHQgb3Igbm90LiBJZiB3ZSB3b3VsZG4ndCBkbyB0aGF0IGVkaXRpbmcgYW5kIHRodXMKLSAgICAg ICAgICAgICAgICAgICAgLy8gdGV4dCBzZWxlY3Rpb24gaW4gUlRMIGJveGVzIHdvdWxkIG5vdCB3 b3JrIGFzIGV4cGVjdGVkLgotICAgICAgICAgICAgICAgICAgICBpZiAoaXNTVkdSb290SW5saW5l Qm94KSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBBU1NFUlQoaXNTVkdUZXh0KCkpOwotICAg ICAgICAgICAgICAgICAgICAgICAgc3RhdGljX2Nhc3Q8U1ZHUm9vdElubGluZUJveCo+KGxpbmVC b3gpLT5jb21wdXRlUGVyQ2hhcmFjdGVyTGF5b3V0SW5mb3JtYXRpb24oKTsKLSAgICAgICAgICAg ICAgICAgICAgfQotI2VuZGlmCi0KLSAgICAgICAgICAgICAgICAgICAgLy8gQ29tcHV0ZSBvdXIg b3ZlcmZsb3cgbm93LgotICAgICAgICAgICAgICAgICAgICBsaW5lQm94LT5jb21wdXRlT3ZlcmZs b3cobGluZUJveC0+bGluZVRvcCgpLCBsaW5lQm94LT5saW5lQm90dG9tKCksIHRleHRCb3hEYXRh TWFwKTsKLQotI2lmIFBMQVRGT1JNKE1BQykKLSAgICAgICAgICAgICAgICAgICAgLy8gSGlnaGxp Z2h0IGFjdHMgYXMgYW4gb3ZlcmZsb3cgaW5mbGF0aW9uLgotICAgICAgICAgICAgICAgICAgICBp ZiAoc3R5bGUoKS0+aGlnaGxpZ2h0KCkgIT0gbnVsbEF0b20pCi0gICAgICAgICAgICAgICAgICAg ICAgICBsaW5lQm94LT5hZGRIaWdobGlnaHRPdmVyZmxvdygpOwotI2VuZGlmCi0gICAgICAgICAg ICAgICAgfQotICAgICAgICAgICAgfQorICAgICAgICAgICAgUm9vdElubGluZUJveCogbGluZUJv eCA9IGNyZWF0ZUxpbmVCb3hlc0Zyb21CaWRpUnVucyhiaWRpUnVucywgZW5kLCBsaW5lSW5mbywg dmVydGljYWxQb3NpdGlvbkNhY2hlLCB0cmFpbGluZ1NwYWNlUnVuKTsKIAogICAgICAgICAgICAg YmlkaVJ1bnMuZGVsZXRlUnVucygpOwogICAgICAgICAgICAgcmVzb2x2ZXIubWFya0N1cnJlbnRS dW5FbXB0eSgpOyAvLyBGSVhNRTogVGhpcyBjYW4gcHJvYmFibHkgYmUgcmVwbGFjZWQgYnkgYW4g QVNTRVJUIChvciBqdXN0IHJlbW92ZWQpLgo=