83935 2012-04-13 12:59:50 -0700 [Chromium] Fix tests being flaky when multiple draws occur in between commits 2012-05-22 13:16:40 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sievers sievers danakj enne eric jamesr nduca webkit.review.bot oldest_to_newest 602337 0 sievers 2012-04-13 12:59:50 -0700 [Chromium] Fix tests being flaky when multiple draws occur in between commits 602339 1 137131 sievers 2012-04-13 13:05:14 -0700 Created attachment 137131 Patch 602344 2 sievers 2012-04-13 13:08:09 -0700 The decrement by one is from drawLayersOnCCThread() being called after drawLayers() where the old code using frameNumber() had the increment happen before in drawLayers(), while the sourceFrameNumber() increment takes place in finishCommitOnImplThread(). 602360 3 137131 enne 2012-04-13 13:35:02 -0700 Comment on attachment 137131 Patch R=me. Nice catch. 602409 4 137150 sievers 2012-04-13 14:27:08 -0700 Created attachment 137150 Patch 629495 5 eric 2012-05-21 14:28:41 -0700 Ping? I think James is probably your man here. 629502 6 jamesr 2012-05-21 14:33:16 -0700 We had a review already (from enne@) on patch set one - I guess it got lost in a rebasing patch? 629503 7 137150 jamesr 2012-05-21 14:33:27 -0700 Comment on attachment 137150 Patch Still looks good. 630579 8 143332 sievers 2012-05-22 11:28:10 -0700 Created attachment 143332 Patch 630656 9 143332 enne 2012-05-22 12:18:56 -0700 Comment on attachment 143332 Patch Still looks good X 3. Daniel: If you get an R+ and just need to rebase a patch, you can change the "Reviewed by NOBODY (OOPS!)." line to "Reviewed by $person." and then just ask for CQ? instead of R? CQ?. 630687 10 143332 webkit.review.bot 2012-05-22 13:16:35 -0700 Comment on attachment 143332 Patch Clearing flags on attachment: 143332 Committed r118034: <http://trac.webkit.org/changeset/118034> 630688 11 webkit.review.bot 2012-05-22 13:16:40 -0700 All reviewed patches have been landed. Closing bug. 137131 2012-04-13 13:05:14 -0700 2012-04-13 14:27:06 -0700 Patch bug-83935-20120413130508.patch text/plain 7252 sievers U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0MTQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDE3NTI2N2MwMzljYTZlMmY4MjM5MmE3NjE5YTg2NTg1ZjRiMjZiODUuLjAwMDJiZmJmNmUzYTBh NmRhMTlkMWJmN2Y1ZDkzMTIyYTVkMWQ0ZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjcgQEAKKzIwMTItMDQtMTMgIERhbmllbCBTaWV2ZXJzICA8c2lldmVyc0BjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBGaXggdGVzdHMgYmVpbmcgZmxha3kgd2hl biBtdWx0aXBsZSBkcmF3cyBvY2N1ciBpbiBiZXR3ZWVuIGNvbW1pdHMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzOTM1CisKKyAgICAgICAgVGVzdHMg dGhhdCBhcmUgdmVyaWZ5aW5nIGV2ZW50cyBpbiBhIGNvbW1pdC9kcmF3IGxvY2stc3RlcCBwYXR0 ZXJuLCBzaG91bGQgdXNlCisgICAgICAgIHNvdXJjZUZyYW1lTnVtYmVyKCkgbm90IGZyYW1lTnVt YmVyKCkgb24gdGhlIGltcGwgc2lkZS4KKyAgICAgICAgT3RoZXJ3aXNlIHRoZXkgd2lsbCBmYWls IGlmIHRoZSBzYW1lIGZyYW1lIGlzIGRyYXduIG1vcmUgdGhhbiBvbmNlIGluCisgICAgICAgIGJl dHdlZW4gY29tbWl0cyAod2hpY2ggaXMgcGVyZmVjdGx5IGxlZ2FsIGFuZCBjb3VsZCBoYXBwZW4g Zm9yIGV4YW1wbGUKKyAgICAgICAgYmVjYXVzZSB3ZSBkcmF3IHdpdGhvdXQgYSBuZXcgY29tbWl0 IGJlY2F1c2Ugd2UgYXJlIHN0aWxsIGluIEJFR0lOX0ZSQU1FCisgICAgICAgIG9yIHVwZGF0aW5n IHJlc291cmNlcykuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiB0ZXN0cy9DQ0xheWVyVHJlZUhvc3RUZXN0LmNwcDoKKyAgICAgICAgKFdURjo6Q0NM YXllclRyZWVIb3N0VGVzdFNjcm9sbFNpbXBsZTo6ZHJhd0xheWVyc09uQ0NUaHJlYWQpOgorICAg ICAgICAoV1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0U2Nyb2xsTXVsdGlwbGVSZWRyYXc6OmRyYXdM YXllcnNPbkNDVGhyZWFkKToKKyAgICAgICAgKFdURjo6Q0NMYXllclRyZWVIb3N0VGVzdFN0YXJ0 UGFnZVNjYWxlQW5pbWF0aW9uOjpjb21taXRDb21wbGV0ZU9uQ0NUaHJlYWQpOgorICAgICAgICAo V1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0QXRvbWljQ29tbWl0Ojpjb21taXRDb21wbGV0ZU9uQ0NU aHJlYWQpOgorICAgICAgICAoV1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0QXRvbWljQ29tbWl0Ojpk cmF3TGF5ZXJzT25DQ1RocmVhZCk6CisgICAgICAgIChXVEY6OkNDTGF5ZXJUcmVlSG9zdFRlc3RB dG9taWNDb21taXRXaXRoUGFydGlhbFVwZGF0ZTo6Y29tbWl0Q29tcGxldGVPbkNDVGhyZWFkKToK KyAgICAgICAgKFdURjo6Q0NMYXllclRyZWVIb3N0VGVzdEF0b21pY0NvbW1pdFdpdGhQYXJ0aWFs VXBkYXRlOjpkcmF3TGF5ZXJzT25DQ1RocmVhZCk6CisgICAgICAgIChXVEY6OkNDTGF5ZXJUcmVl SG9zdFRlc3RGcmFjdGlvbmFsU2Nyb2xsOjpkcmF3TGF5ZXJzT25DQ1RocmVhZCk6CisKIDIwMTIt MDQtMTMgIFJvYiBGbGFjayAgPGZsYWNrckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQ2hyb21p dW06IFNob3VsZCBlbmFibGUgLXdlYmtpdC1pbWFnZS1zZXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0VGVzdC5jcHAgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdFRlc3QuY3BwCmluZGV4IGRkNTNiMDI2 NzcwN2ZjYzczNWFlODQ2YTE4OTk4NjM1YWU5MTZiN2EuLmViZmMxMGI3NzNmMzdlYzJjMmIyMzgy ODU1ZmM3OWNmOGUyZDBhNzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVz dHMvQ0NMYXllclRyZWVIb3N0VGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90 ZXN0cy9DQ0xheWVyVHJlZUhvc3RUZXN0LmNwcApAQCAtMTE1NCwxMSArMTE1NCwxMSBAQCBwdWJs aWM6CiAgICAgICAgIHJvb3QtPnNldE1heFNjcm9sbFBvc2l0aW9uKEludFNpemUoMTAwLCAxMDAp KTsKICAgICAgICAgcm9vdC0+c2Nyb2xsQnkobV9zY3JvbGxBbW91bnQpOwogCi0gICAgICAgIGlm IChpbXBsLT5mcmFtZU51bWJlcigpID09IDEpIHsKKyAgICAgICAgaWYgKCFpbXBsLT5zb3VyY2VG cmFtZU51bWJlcigpKSB7CiAgICAgICAgICAgICBFWFBFQ1RfRVEocm9vdC0+c2Nyb2xsUG9zaXRp b24oKSwgbV9pbml0aWFsU2Nyb2xsKTsKICAgICAgICAgICAgIEVYUEVDVF9FUShyb290LT5zY3Jv bGxEZWx0YSgpLCBtX3Njcm9sbEFtb3VudCk7CiAgICAgICAgICAgICBwb3N0U2V0TmVlZHNDb21t aXRUb01haW5UaHJlYWQoKTsKLSAgICAgICAgfSBlbHNlIGlmIChpbXBsLT5mcmFtZU51bWJlcigp ID09IDIpIHsKKyAgICAgICAgfSBlbHNlIGlmIChpbXBsLT5zb3VyY2VGcmFtZU51bWJlcigpID09 IDEpIHsKICAgICAgICAgICAgIEVYUEVDVF9FUShyb290LT5zY3JvbGxQb3NpdGlvbigpLCBtX3Nl Y29uZFNjcm9sbCk7CiAgICAgICAgICAgICBFWFBFQ1RfRVEocm9vdC0+c2Nyb2xsRGVsdGEoKSwg bV9zY3JvbGxBbW91bnQpOwogICAgICAgICAgICAgZW5kVGVzdCgpOwpAQCAtMTIyMSwyMSArMTIy MSwyMSBAQCBwdWJsaWM6CiAgICAgICAgIHJvb3QtPnNldFNjcm9sbGFibGUodHJ1ZSk7CiAgICAg ICAgIHJvb3QtPnNldE1heFNjcm9sbFBvc2l0aW9uKEludFNpemUoMTAwLCAxMDApKTsKIAotICAg ICAgICBpZiAoaW1wbC0+ZnJhbWVOdW1iZXIoKSA9PSAxKSB7CisgICAgICAgIGlmICghaW1wbC0+ c291cmNlRnJhbWVOdW1iZXIoKSkgewogICAgICAgICAgICAgRVhQRUNUX0VRKHJvb3QtPnNjcm9s bERlbHRhKCksIEludFNpemUoKSk7CiAgICAgICAgICAgICByb290LT5zY3JvbGxCeShtX3Njcm9s bEFtb3VudCk7CiAgICAgICAgICAgICBFWFBFQ1RfRVEocm9vdC0+c2Nyb2xsRGVsdGEoKSwgbV9z Y3JvbGxBbW91bnQpOwogCiAgICAgICAgICAgICBFWFBFQ1RfRVEocm9vdC0+c2Nyb2xsUG9zaXRp b24oKSwgbV9pbml0aWFsU2Nyb2xsKTsKICAgICAgICAgICAgIHBvc3RTZXROZWVkc1JlZHJhd1Rv TWFpblRocmVhZCgpOwotICAgICAgICB9IGVsc2UgaWYgKGltcGwtPmZyYW1lTnVtYmVyKCkgPT0g MikgeworICAgICAgICB9IGVsc2UgaWYgKGltcGwtPnNvdXJjZUZyYW1lTnVtYmVyKCkgPT0gMSkg ewogICAgICAgICAgICAgRVhQRUNUX0VRKHJvb3QtPnNjcm9sbERlbHRhKCksIG1fc2Nyb2xsQW1v dW50KTsKICAgICAgICAgICAgIHJvb3QtPnNjcm9sbEJ5KG1fc2Nyb2xsQW1vdW50KTsKICAgICAg ICAgICAgIEVYUEVDVF9FUShyb290LT5zY3JvbGxEZWx0YSgpLCBtX3Njcm9sbEFtb3VudCArIG1f c2Nyb2xsQW1vdW50KTsKIAogICAgICAgICAgICAgRVhQRUNUX0VRKHJvb3QtPnNjcm9sbFBvc2l0 aW9uKCksIG1faW5pdGlhbFNjcm9sbCk7CiAgICAgICAgICAgICBwb3N0U2V0TmVlZHNDb21taXRU b01haW5UaHJlYWQoKTsKLSAgICAgICAgfSBlbHNlIGlmIChpbXBsLT5mcmFtZU51bWJlcigpID09 IDMpIHsKKyAgICAgICAgfSBlbHNlIGlmIChpbXBsLT5zb3VyY2VGcmFtZU51bWJlcigpID09IDIp IHsKICAgICAgICAgICAgIEVYUEVDVF9FUShyb290LT5zY3JvbGxEZWx0YSgpLCBJbnRTaXplKCkp OwogICAgICAgICAgICAgRVhQRUNUX0VRKHJvb3QtPnNjcm9sbFBvc2l0aW9uKCksIG1faW5pdGlh bFNjcm9sbCArIG1fc2Nyb2xsQW1vdW50ICsgbV9zY3JvbGxBbW91bnQpOwogICAgICAgICAgICAg ZW5kVGVzdCgpOwpAQCAtMTM0Myw5ICsxMzQzLDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9p ZCBjb21taXRDb21wbGV0ZU9uQ0NUaHJlYWQoQ0NMYXllclRyZWVIb3N0SW1wbCogaW1wbCkKICAg ICB7CiAgICAgICAgIGltcGwtPnByb2Nlc3NTY3JvbGxEZWx0YXMoKTsKLSAgICAgICAgLy8gV2Ug Z2V0IG9uZSBjb21taXQgYmVmb3JlIHRoZSBmaXJzdCBkcmF3LCBhbmQgdGhlIGFuaW1hdGlvbiBk b2Vzbid0IGhhcHBlbiB1bnRpbCB0aGUgc2Vjb25kIGRyYXcsCi0gICAgICAgIC8vIHNvIHJlc3Vs dHMgYXZhaWxhYmxlIG9uIHRoZSB0aGlyZCBjb21taXQuCi0gICAgICAgIGlmIChpbXBsLT5mcmFt ZU51bWJlcigpID09IDIpIHsKKyAgICAgICAgLy8gV2UgZ2V0IG9uZSBjb21taXQgYmVmb3JlIHRo ZSBmaXJzdCBkcmF3LCBhbmQgdGhlIGFuaW1hdGlvbiBkb2Vzbid0IGhhcHBlbiB1bnRpbCB0aGUg c2Vjb25kIGRyYXcuCisgICAgICAgIGlmIChpbXBsLT5zb3VyY2VGcmFtZU51bWJlcigpID09IDEp IHsKICAgICAgICAgICAgIEVYUEVDVF9FUSgxLjI1LCBpbXBsLT5wYWdlU2NhbGUoKSk7CiAgICAg ICAgICAgICBlbmRUZXN0KCk7CiAgICAgICAgIH0gZWxzZQpAQCAtMTU3OCw3ICsxNTc3LDcgQEAg cHVibGljOgogICAgIHsKICAgICAgICAgQ29tcG9zaXRvckZha2VXZWJHcmFwaGljc0NvbnRleHQz RFdpdGhUZXh0dXJlVHJhY2tpbmcqIGNvbnRleHQgPSBzdGF0aWNfY2FzdDxDb21wb3NpdG9yRmFr ZVdlYkdyYXBoaWNzQ29udGV4dDNEV2l0aFRleHR1cmVUcmFja2luZyo+KEdyYXBoaWNzQ29udGV4 dDNEUHJpdmF0ZTo6ZXh0cmFjdFdlYkdyYXBoaWNzQ29udGV4dDNEKGltcGwtPmNvbnRleHQoKSkp OwogCi0gICAgICAgIHN3aXRjaCAoaW1wbC0+ZnJhbWVOdW1iZXIoKSkgeworICAgICAgICBzd2l0 Y2ggKGltcGwtPnNvdXJjZUZyYW1lTnVtYmVyKCkpIHsKICAgICAgICAgY2FzZSAwOgogICAgICAg ICAgICAgLy8gTnVtYmVyIG9mIHRleHR1cmVzIHNob3VsZCBiZSBvbmUuCiAgICAgICAgICAgICBF WFBFQ1RfRVEoMSwgY29udGV4dC0+bnVtVGV4dHVyZXMoKSk7CkBAIC0xNjE1LDcgKzE2MTQsNyBA QCBwdWJsaWM6CiAgICAgICAgIC8vIE51bWJlciBvZiB0ZXh0dXJlcyB1c2VkIGZvciBkcmF3IHNo b3VsZCBhbHdheXMgYmUgb25lLgogICAgICAgICBFWFBFQ1RfRVEoMSwgY29udGV4dC0+bnVtVXNl ZFRleHR1cmVzKCkpOwogCi0gICAgICAgIGlmIChpbXBsLT5mcmFtZU51bWJlcigpIDwgMikgewor ICAgICAgICBpZiAoaW1wbC0+c291cmNlRnJhbWVOdW1iZXIoKSA8IDEpIHsKICAgICAgICAgICAg IGNvbnRleHQtPnJlc2V0VXNlZFRleHR1cmVzKCk7CiAgICAgICAgICAgICBwb3N0U2V0TmVlZHNB bmltYXRlQW5kQ29tbWl0VG9NYWluVGhyZWFkKCk7CiAgICAgICAgICAgICBwb3N0U2V0TmVlZHNS ZWRyYXdUb01haW5UaHJlYWQoKTsKQEAgLTE2NjksNyArMTY2OCw3IEBAIHB1YmxpYzoKICAgICB7 CiAgICAgICAgIENvbXBvc2l0b3JGYWtlV2ViR3JhcGhpY3NDb250ZXh0M0RXaXRoVGV4dHVyZVRy YWNraW5nKiBjb250ZXh0ID0gc3RhdGljX2Nhc3Q8Q29tcG9zaXRvckZha2VXZWJHcmFwaGljc0Nv bnRleHQzRFdpdGhUZXh0dXJlVHJhY2tpbmcqPihHcmFwaGljc0NvbnRleHQzRFByaXZhdGU6OmV4 dHJhY3RXZWJHcmFwaGljc0NvbnRleHQzRChpbXBsLT5jb250ZXh0KCkpKTsKIAotICAgICAgICBz d2l0Y2ggKGltcGwtPmZyYW1lTnVtYmVyKCkpIHsKKyAgICAgICAgc3dpdGNoIChpbXBsLT5zb3Vy Y2VGcmFtZU51bWJlcigpKSB7CiAgICAgICAgIGNhc2UgMDoKICAgICAgICAgICAgIC8vIE51bWJl ciBvZiB0ZXh0dXJlcyBzaG91bGQgYmUgdHdvLgogICAgICAgICAgICAgRVhQRUNUX0VRKDIsIGNv bnRleHQtPm51bVRleHR1cmVzKCkpOwpAQCAtMTcyNSw3ICsxNzI0LDcgQEAgcHVibGljOgogICAg ICAgICAvLyBOdW1iZXIgb2YgdGV4dHVyZXMgdXNlZCBmb3IgZHJhd2luZyBzaG91bGQgYWx3YXlz IGJlIHR3by4KICAgICAgICAgRVhQRUNUX0VRKDIsIGNvbnRleHQtPm51bVVzZWRUZXh0dXJlcygp KTsKIAotICAgICAgICBpZiAoaW1wbC0+ZnJhbWVOdW1iZXIoKSA8IDMpIHsKKyAgICAgICAgaWYg KGltcGwtPnNvdXJjZUZyYW1lTnVtYmVyKCkgPCAyKSB7CiAgICAgICAgICAgICBjb250ZXh0LT5y ZXNldFVzZWRUZXh0dXJlcygpOwogICAgICAgICAgICAgcG9zdFNldE5lZWRzQW5pbWF0ZUFuZENv bW1pdFRvTWFpblRocmVhZCgpOwogICAgICAgICAgICAgcG9zdFNldE5lZWRzUmVkcmF3VG9NYWlu VGhyZWFkKCk7CkBAIC0yMjQ2LDE1ICsyMjQ1LDE1IEBAIHB1YmxpYzoKICAgICAgICAgcm9vdC0+ c2V0TWF4U2Nyb2xsUG9zaXRpb24oSW50U2l6ZSgxMDAsIDEwMCkpOwogCiAgICAgICAgIC8vIENo ZWNrIHRoYXQgYSBmcmFjdGlvbmFsIHNjcm9sbCBkZWx0YSBpcyBjb3JyZWN0bHkgYWNjdW11bGF0 ZWQgb3ZlciBtdWx0aXBsZSBjb21taXRzLgotICAgICAgICBpZiAoaW1wbC0+ZnJhbWVOdW1iZXIo KSA9PSAxKSB7CisgICAgICAgIGlmICghaW1wbC0+c291cmNlRnJhbWVOdW1iZXIoKSkgewogICAg ICAgICAgICAgRVhQRUNUX0VRKHJvb3QtPnNjcm9sbFBvc2l0aW9uKCksIEludFBvaW50KDAsIDAp KTsKICAgICAgICAgICAgIEVYUEVDVF9FUShyb290LT5zY3JvbGxEZWx0YSgpLCBGbG9hdFNpemUo MCwgMCkpOwogICAgICAgICAgICAgcG9zdFNldE5lZWRzQ29tbWl0VG9NYWluVGhyZWFkKCk7Ci0g ICAgICAgIH0gZWxzZSBpZiAoaW1wbC0+ZnJhbWVOdW1iZXIoKSA9PSAyKSB7CisgICAgICAgIH0g ZWxzZSBpZiAoaW1wbC0+c291cmNlRnJhbWVOdW1iZXIoKSA9PSAxKSB7CiAgICAgICAgICAgICBF WFBFQ1RfRVEocm9vdC0+c2Nyb2xsUG9zaXRpb24oKSwgZmxvb3JlZEludFBvaW50KG1fc2Nyb2xs QW1vdW50KSk7CiAgICAgICAgICAgICBFWFBFQ1RfRVEocm9vdC0+c2Nyb2xsRGVsdGEoKSwgRmxv YXRTaXplKGZtb2QobV9zY3JvbGxBbW91bnQud2lkdGgoKSwgMSksIDApKTsKICAgICAgICAgICAg IHBvc3RTZXROZWVkc0NvbW1pdFRvTWFpblRocmVhZCgpOwotICAgICAgICB9IGVsc2UgaWYgKGlt cGwtPmZyYW1lTnVtYmVyKCkgPT0gMykgeworICAgICAgICB9IGVsc2UgaWYgKGltcGwtPnNvdXJj ZUZyYW1lTnVtYmVyKCkgPT0gMikgewogICAgICAgICAgICAgRVhQRUNUX0VRKHJvb3QtPnNjcm9s bFBvc2l0aW9uKCksIGZsb29yZWRJbnRQb2ludChtX3Njcm9sbEFtb3VudCArIG1fc2Nyb2xsQW1v dW50KSk7CiAgICAgICAgICAgICBFWFBFQ1RfRVEocm9vdC0+c2Nyb2xsRGVsdGEoKSwgRmxvYXRT aXplKGZtb2QoMiAqIG1fc2Nyb2xsQW1vdW50LndpZHRoKCksIDEpLCAwKSk7CiAgICAgICAgICAg ICBlbmRUZXN0KCk7Cg== 137150 2012-04-13 14:27:08 -0700 2012-05-22 11:28:07 -0700 Patch bug-83935-20120413142707.patch text/plain 7504 sievers U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0MTQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDE3NTI2N2MwMzljYTZlMmY4MjM5MmE3NjE5YTg2NTg1ZjRiMjZiODUuLjAwMDJiZmJmNmUzYTBh NmRhMTlkMWJmN2Y1ZDkzMTIyYTVkMWQ0ZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjcgQEAKKzIwMTItMDQtMTMgIERhbmllbCBTaWV2ZXJzICA8c2lldmVyc0BjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBGaXggdGVzdHMgYmVpbmcgZmxha3kgd2hl biBtdWx0aXBsZSBkcmF3cyBvY2N1ciBpbiBiZXR3ZWVuIGNvbW1pdHMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzOTM1CisKKyAgICAgICAgVGVzdHMg dGhhdCBhcmUgdmVyaWZ5aW5nIGV2ZW50cyBpbiBhIGNvbW1pdC9kcmF3IGxvY2stc3RlcCBwYXR0 ZXJuLCBzaG91bGQgdXNlCisgICAgICAgIHNvdXJjZUZyYW1lTnVtYmVyKCkgbm90IGZyYW1lTnVt YmVyKCkgb24gdGhlIGltcGwgc2lkZS4KKyAgICAgICAgT3RoZXJ3aXNlIHRoZXkgd2lsbCBmYWls IGlmIHRoZSBzYW1lIGZyYW1lIGlzIGRyYXduIG1vcmUgdGhhbiBvbmNlIGluCisgICAgICAgIGJl dHdlZW4gY29tbWl0cyAod2hpY2ggaXMgcGVyZmVjdGx5IGxlZ2FsIGFuZCBjb3VsZCBoYXBwZW4g Zm9yIGV4YW1wbGUKKyAgICAgICAgYmVjYXVzZSB3ZSBkcmF3IHdpdGhvdXQgYSBuZXcgY29tbWl0 IGJlY2F1c2Ugd2UgYXJlIHN0aWxsIGluIEJFR0lOX0ZSQU1FCisgICAgICAgIG9yIHVwZGF0aW5n IHJlc291cmNlcykuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiB0ZXN0cy9DQ0xheWVyVHJlZUhvc3RUZXN0LmNwcDoKKyAgICAgICAgKFdURjo6Q0NM YXllclRyZWVIb3N0VGVzdFNjcm9sbFNpbXBsZTo6ZHJhd0xheWVyc09uQ0NUaHJlYWQpOgorICAg ICAgICAoV1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0U2Nyb2xsTXVsdGlwbGVSZWRyYXc6OmRyYXdM YXllcnNPbkNDVGhyZWFkKToKKyAgICAgICAgKFdURjo6Q0NMYXllclRyZWVIb3N0VGVzdFN0YXJ0 UGFnZVNjYWxlQW5pbWF0aW9uOjpjb21taXRDb21wbGV0ZU9uQ0NUaHJlYWQpOgorICAgICAgICAo V1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0QXRvbWljQ29tbWl0Ojpjb21taXRDb21wbGV0ZU9uQ0NU aHJlYWQpOgorICAgICAgICAoV1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0QXRvbWljQ29tbWl0Ojpk cmF3TGF5ZXJzT25DQ1RocmVhZCk6CisgICAgICAgIChXVEY6OkNDTGF5ZXJUcmVlSG9zdFRlc3RB dG9taWNDb21taXRXaXRoUGFydGlhbFVwZGF0ZTo6Y29tbWl0Q29tcGxldGVPbkNDVGhyZWFkKToK KyAgICAgICAgKFdURjo6Q0NMYXllclRyZWVIb3N0VGVzdEF0b21pY0NvbW1pdFdpdGhQYXJ0aWFs VXBkYXRlOjpkcmF3TGF5ZXJzT25DQ1RocmVhZCk6CisgICAgICAgIChXVEY6OkNDTGF5ZXJUcmVl SG9zdFRlc3RGcmFjdGlvbmFsU2Nyb2xsOjpkcmF3TGF5ZXJzT25DQ1RocmVhZCk6CisKIDIwMTIt MDQtMTMgIFJvYiBGbGFjayAgPGZsYWNrckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQ2hyb21p dW06IFNob3VsZCBlbmFibGUgLXdlYmtpdC1pbWFnZS1zZXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0VGVzdC5jcHAgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdFRlc3QuY3BwCmluZGV4IGRkNTNiMDI2 NzcwN2ZjYzczNWFlODQ2YTE4OTk4NjM1YWU5MTZiN2EuLjZkODE2ZmFhMDU2NjE2NzRkYTAyNmY4 YzljMDIzYTA5NzA3OTBjNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVz dHMvQ0NMYXllclRyZWVIb3N0VGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90 ZXN0cy9DQ0xheWVyVHJlZUhvc3RUZXN0LmNwcApAQCAtMTE1NCwxMSArMTE1NCwxMSBAQCBwdWJs aWM6CiAgICAgICAgIHJvb3QtPnNldE1heFNjcm9sbFBvc2l0aW9uKEludFNpemUoMTAwLCAxMDAp KTsKICAgICAgICAgcm9vdC0+c2Nyb2xsQnkobV9zY3JvbGxBbW91bnQpOwogCi0gICAgICAgIGlm IChpbXBsLT5mcmFtZU51bWJlcigpID09IDEpIHsKKyAgICAgICAgaWYgKCFpbXBsLT5zb3VyY2VG cmFtZU51bWJlcigpKSB7CiAgICAgICAgICAgICBFWFBFQ1RfRVEocm9vdC0+c2Nyb2xsUG9zaXRp b24oKSwgbV9pbml0aWFsU2Nyb2xsKTsKICAgICAgICAgICAgIEVYUEVDVF9FUShyb290LT5zY3Jv bGxEZWx0YSgpLCBtX3Njcm9sbEFtb3VudCk7CiAgICAgICAgICAgICBwb3N0U2V0TmVlZHNDb21t aXRUb01haW5UaHJlYWQoKTsKLSAgICAgICAgfSBlbHNlIGlmIChpbXBsLT5mcmFtZU51bWJlcigp ID09IDIpIHsKKyAgICAgICAgfSBlbHNlIGlmIChpbXBsLT5zb3VyY2VGcmFtZU51bWJlcigpID09 IDEpIHsKICAgICAgICAgICAgIEVYUEVDVF9FUShyb290LT5zY3JvbGxQb3NpdGlvbigpLCBtX3Nl Y29uZFNjcm9sbCk7CiAgICAgICAgICAgICBFWFBFQ1RfRVEocm9vdC0+c2Nyb2xsRGVsdGEoKSwg bV9zY3JvbGxBbW91bnQpOwogICAgICAgICAgICAgZW5kVGVzdCgpOwpAQCAtMTIyMSwyMSArMTIy MSwyNSBAQCBwdWJsaWM6CiAgICAgICAgIHJvb3QtPnNldFNjcm9sbGFibGUodHJ1ZSk7CiAgICAg ICAgIHJvb3QtPnNldE1heFNjcm9sbFBvc2l0aW9uKEludFNpemUoMTAwLCAxMDApKTsKIAotICAg ICAgICBpZiAoaW1wbC0+ZnJhbWVOdW1iZXIoKSA9PSAxKSB7CisgICAgICAgIGlmICghaW1wbC0+ c291cmNlRnJhbWVOdW1iZXIoKSAmJiBpbXBsLT5mcmFtZU51bWJlcigpID09IDEpIHsKKyAgICAg ICAgICAgIC8vIEZpcnN0IGRyYXcgYWZ0ZXIgZmlyc3QgY29tbWl0LgogICAgICAgICAgICAgRVhQ RUNUX0VRKHJvb3QtPnNjcm9sbERlbHRhKCksIEludFNpemUoKSk7CiAgICAgICAgICAgICByb290 LT5zY3JvbGxCeShtX3Njcm9sbEFtb3VudCk7CiAgICAgICAgICAgICBFWFBFQ1RfRVEocm9vdC0+ c2Nyb2xsRGVsdGEoKSwgbV9zY3JvbGxBbW91bnQpOwogCiAgICAgICAgICAgICBFWFBFQ1RfRVEo cm9vdC0+c2Nyb2xsUG9zaXRpb24oKSwgbV9pbml0aWFsU2Nyb2xsKTsKICAgICAgICAgICAgIHBv c3RTZXROZWVkc1JlZHJhd1RvTWFpblRocmVhZCgpOwotICAgICAgICB9IGVsc2UgaWYgKGltcGwt PmZyYW1lTnVtYmVyKCkgPT0gMikgeworICAgICAgICB9IGVsc2UgaWYgKCFpbXBsLT5zb3VyY2VG cmFtZU51bWJlcigpICYmIGltcGwtPmZyYW1lTnVtYmVyKCkgPT0gMikgeworICAgICAgICAgICAg Ly8gU2Vjb25kIGRyYXcgYWZ0ZXIgZmlyc3QgY29tbWl0LgogICAgICAgICAgICAgRVhQRUNUX0VR KHJvb3QtPnNjcm9sbERlbHRhKCksIG1fc2Nyb2xsQW1vdW50KTsKICAgICAgICAgICAgIHJvb3Qt PnNjcm9sbEJ5KG1fc2Nyb2xsQW1vdW50KTsKICAgICAgICAgICAgIEVYUEVDVF9FUShyb290LT5z Y3JvbGxEZWx0YSgpLCBtX3Njcm9sbEFtb3VudCArIG1fc2Nyb2xsQW1vdW50KTsKIAogICAgICAg ICAgICAgRVhQRUNUX0VRKHJvb3QtPnNjcm9sbFBvc2l0aW9uKCksIG1faW5pdGlhbFNjcm9sbCk7 CiAgICAgICAgICAgICBwb3N0U2V0TmVlZHNDb21taXRUb01haW5UaHJlYWQoKTsKLSAgICAgICAg fSBlbHNlIGlmIChpbXBsLT5mcmFtZU51bWJlcigpID09IDMpIHsKKyAgICAgICAgfSBlbHNlIGlm IChpbXBsLT5zb3VyY2VGcmFtZU51bWJlcigpID09IDEpIHsKKyAgICAgICAgICAgIC8vIFRoaXJk IG9yIGxhdGVyIGRyYXcgYWZ0ZXIgc2Vjb25kIGNvbW1pdC4KKyAgICAgICAgICAgIEVYUEVDVF9H RShpbXBsLT5mcmFtZU51bWJlcigpLCAzKTsKICAgICAgICAgICAgIEVYUEVDVF9FUShyb290LT5z Y3JvbGxEZWx0YSgpLCBJbnRTaXplKCkpOwogICAgICAgICAgICAgRVhQRUNUX0VRKHJvb3QtPnNj cm9sbFBvc2l0aW9uKCksIG1faW5pdGlhbFNjcm9sbCArIG1fc2Nyb2xsQW1vdW50ICsgbV9zY3Jv bGxBbW91bnQpOwogICAgICAgICAgICAgZW5kVGVzdCgpOwpAQCAtMTM0Myw5ICsxMzQ3LDggQEAg cHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBjb21taXRDb21wbGV0ZU9uQ0NUaHJlYWQoQ0NMYXll clRyZWVIb3N0SW1wbCogaW1wbCkKICAgICB7CiAgICAgICAgIGltcGwtPnByb2Nlc3NTY3JvbGxE ZWx0YXMoKTsKLSAgICAgICAgLy8gV2UgZ2V0IG9uZSBjb21taXQgYmVmb3JlIHRoZSBmaXJzdCBk cmF3LCBhbmQgdGhlIGFuaW1hdGlvbiBkb2Vzbid0IGhhcHBlbiB1bnRpbCB0aGUgc2Vjb25kIGRy YXcsCi0gICAgICAgIC8vIHNvIHJlc3VsdHMgYXZhaWxhYmxlIG9uIHRoZSB0aGlyZCBjb21taXQu Ci0gICAgICAgIGlmIChpbXBsLT5mcmFtZU51bWJlcigpID09IDIpIHsKKyAgICAgICAgLy8gV2Ug Z2V0IG9uZSBjb21taXQgYmVmb3JlIHRoZSBmaXJzdCBkcmF3LCBhbmQgdGhlIGFuaW1hdGlvbiBk b2Vzbid0IGhhcHBlbiB1bnRpbCB0aGUgc2Vjb25kIGRyYXcuCisgICAgICAgIGlmIChpbXBsLT5z b3VyY2VGcmFtZU51bWJlcigpID09IDEpIHsKICAgICAgICAgICAgIEVYUEVDVF9FUSgxLjI1LCBp bXBsLT5wYWdlU2NhbGUoKSk7CiAgICAgICAgICAgICBlbmRUZXN0KCk7CiAgICAgICAgIH0gZWxz ZQpAQCAtMTU3OCw3ICsxNTgxLDcgQEAgcHVibGljOgogICAgIHsKICAgICAgICAgQ29tcG9zaXRv ckZha2VXZWJHcmFwaGljc0NvbnRleHQzRFdpdGhUZXh0dXJlVHJhY2tpbmcqIGNvbnRleHQgPSBz dGF0aWNfY2FzdDxDb21wb3NpdG9yRmFrZVdlYkdyYXBoaWNzQ29udGV4dDNEV2l0aFRleHR1cmVU cmFja2luZyo+KEdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZTo6ZXh0cmFjdFdlYkdyYXBoaWNzQ29u dGV4dDNEKGltcGwtPmNvbnRleHQoKSkpOwogCi0gICAgICAgIHN3aXRjaCAoaW1wbC0+ZnJhbWVO dW1iZXIoKSkgeworICAgICAgICBzd2l0Y2ggKGltcGwtPnNvdXJjZUZyYW1lTnVtYmVyKCkpIHsK ICAgICAgICAgY2FzZSAwOgogICAgICAgICAgICAgLy8gTnVtYmVyIG9mIHRleHR1cmVzIHNob3Vs ZCBiZSBvbmUuCiAgICAgICAgICAgICBFWFBFQ1RfRVEoMSwgY29udGV4dC0+bnVtVGV4dHVyZXMo KSk7CkBAIC0xNjE1LDcgKzE2MTgsNyBAQCBwdWJsaWM6CiAgICAgICAgIC8vIE51bWJlciBvZiB0 ZXh0dXJlcyB1c2VkIGZvciBkcmF3IHNob3VsZCBhbHdheXMgYmUgb25lLgogICAgICAgICBFWFBF Q1RfRVEoMSwgY29udGV4dC0+bnVtVXNlZFRleHR1cmVzKCkpOwogCi0gICAgICAgIGlmIChpbXBs LT5mcmFtZU51bWJlcigpIDwgMikgeworICAgICAgICBpZiAoaW1wbC0+c291cmNlRnJhbWVOdW1i ZXIoKSA8IDEpIHsKICAgICAgICAgICAgIGNvbnRleHQtPnJlc2V0VXNlZFRleHR1cmVzKCk7CiAg ICAgICAgICAgICBwb3N0U2V0TmVlZHNBbmltYXRlQW5kQ29tbWl0VG9NYWluVGhyZWFkKCk7CiAg ICAgICAgICAgICBwb3N0U2V0TmVlZHNSZWRyYXdUb01haW5UaHJlYWQoKTsKQEAgLTE2NjksNyAr MTY3Miw3IEBAIHB1YmxpYzoKICAgICB7CiAgICAgICAgIENvbXBvc2l0b3JGYWtlV2ViR3JhcGhp Y3NDb250ZXh0M0RXaXRoVGV4dHVyZVRyYWNraW5nKiBjb250ZXh0ID0gc3RhdGljX2Nhc3Q8Q29t cG9zaXRvckZha2VXZWJHcmFwaGljc0NvbnRleHQzRFdpdGhUZXh0dXJlVHJhY2tpbmcqPihHcmFw aGljc0NvbnRleHQzRFByaXZhdGU6OmV4dHJhY3RXZWJHcmFwaGljc0NvbnRleHQzRChpbXBsLT5j b250ZXh0KCkpKTsKIAotICAgICAgICBzd2l0Y2ggKGltcGwtPmZyYW1lTnVtYmVyKCkpIHsKKyAg ICAgICAgc3dpdGNoIChpbXBsLT5zb3VyY2VGcmFtZU51bWJlcigpKSB7CiAgICAgICAgIGNhc2Ug MDoKICAgICAgICAgICAgIC8vIE51bWJlciBvZiB0ZXh0dXJlcyBzaG91bGQgYmUgdHdvLgogICAg ICAgICAgICAgRVhQRUNUX0VRKDIsIGNvbnRleHQtPm51bVRleHR1cmVzKCkpOwpAQCAtMTcyNSw3 ICsxNzI4LDcgQEAgcHVibGljOgogICAgICAgICAvLyBOdW1iZXIgb2YgdGV4dHVyZXMgdXNlZCBm b3IgZHJhd2luZyBzaG91bGQgYWx3YXlzIGJlIHR3by4KICAgICAgICAgRVhQRUNUX0VRKDIsIGNv bnRleHQtPm51bVVzZWRUZXh0dXJlcygpKTsKIAotICAgICAgICBpZiAoaW1wbC0+ZnJhbWVOdW1i ZXIoKSA8IDMpIHsKKyAgICAgICAgaWYgKGltcGwtPnNvdXJjZUZyYW1lTnVtYmVyKCkgPCAyKSB7 CiAgICAgICAgICAgICBjb250ZXh0LT5yZXNldFVzZWRUZXh0dXJlcygpOwogICAgICAgICAgICAg cG9zdFNldE5lZWRzQW5pbWF0ZUFuZENvbW1pdFRvTWFpblRocmVhZCgpOwogICAgICAgICAgICAg cG9zdFNldE5lZWRzUmVkcmF3VG9NYWluVGhyZWFkKCk7CkBAIC0yMjQ2LDE1ICsyMjQ5LDE1IEBA IHB1YmxpYzoKICAgICAgICAgcm9vdC0+c2V0TWF4U2Nyb2xsUG9zaXRpb24oSW50U2l6ZSgxMDAs IDEwMCkpOwogCiAgICAgICAgIC8vIENoZWNrIHRoYXQgYSBmcmFjdGlvbmFsIHNjcm9sbCBkZWx0 YSBpcyBjb3JyZWN0bHkgYWNjdW11bGF0ZWQgb3ZlciBtdWx0aXBsZSBjb21taXRzLgotICAgICAg ICBpZiAoaW1wbC0+ZnJhbWVOdW1iZXIoKSA9PSAxKSB7CisgICAgICAgIGlmICghaW1wbC0+c291 cmNlRnJhbWVOdW1iZXIoKSkgewogICAgICAgICAgICAgRVhQRUNUX0VRKHJvb3QtPnNjcm9sbFBv c2l0aW9uKCksIEludFBvaW50KDAsIDApKTsKICAgICAgICAgICAgIEVYUEVDVF9FUShyb290LT5z Y3JvbGxEZWx0YSgpLCBGbG9hdFNpemUoMCwgMCkpOwogICAgICAgICAgICAgcG9zdFNldE5lZWRz Q29tbWl0VG9NYWluVGhyZWFkKCk7Ci0gICAgICAgIH0gZWxzZSBpZiAoaW1wbC0+ZnJhbWVOdW1i ZXIoKSA9PSAyKSB7CisgICAgICAgIH0gZWxzZSBpZiAoaW1wbC0+c291cmNlRnJhbWVOdW1iZXIo KSA9PSAxKSB7CiAgICAgICAgICAgICBFWFBFQ1RfRVEocm9vdC0+c2Nyb2xsUG9zaXRpb24oKSwg Zmxvb3JlZEludFBvaW50KG1fc2Nyb2xsQW1vdW50KSk7CiAgICAgICAgICAgICBFWFBFQ1RfRVEo cm9vdC0+c2Nyb2xsRGVsdGEoKSwgRmxvYXRTaXplKGZtb2QobV9zY3JvbGxBbW91bnQud2lkdGgo KSwgMSksIDApKTsKICAgICAgICAgICAgIHBvc3RTZXROZWVkc0NvbW1pdFRvTWFpblRocmVhZCgp OwotICAgICAgICB9IGVsc2UgaWYgKGltcGwtPmZyYW1lTnVtYmVyKCkgPT0gMykgeworICAgICAg ICB9IGVsc2UgaWYgKGltcGwtPnNvdXJjZUZyYW1lTnVtYmVyKCkgPT0gMikgewogICAgICAgICAg ICAgRVhQRUNUX0VRKHJvb3QtPnNjcm9sbFBvc2l0aW9uKCksIGZsb29yZWRJbnRQb2ludChtX3Nj cm9sbEFtb3VudCArIG1fc2Nyb2xsQW1vdW50KSk7CiAgICAgICAgICAgICBFWFBFQ1RfRVEocm9v dC0+c2Nyb2xsRGVsdGEoKSwgRmxvYXRTaXplKGZtb2QoMiAqIG1fc2Nyb2xsQW1vdW50LndpZHRo KCksIDEpLCAwKSk7CiAgICAgICAgICAgICBlbmRUZXN0KCk7Cg== 143332 2012-05-22 11:28:10 -0700 2012-05-22 13:16:34 -0700 Patch bug-83935-20120522112810.patch text/plain 5835 sievers U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3ODA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDk0OWI0ZTVlNGM3M2U5ZDc3M2FmMDJmOGQ2NTNmNmI5MTVkYWEwMTMuLjRiMDdlZDE4YTlmM2Ji Njk5OWRkMWViMTYzNDRkMDZkOWE4YTI1NGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjcgQEAKKzIwMTItMDQtMTMgIERhbmllbCBTaWV2ZXJzICA8c2lldmVyc0BjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBGaXggdGVzdHMgYmVpbmcgZmxha3kgd2hl biBtdWx0aXBsZSBkcmF3cyBvY2N1ciBpbiBiZXR3ZWVuIGNvbW1pdHMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzOTM1CisKKyAgICAgICAgVGVzdHMg dGhhdCBhcmUgdmVyaWZ5aW5nIGV2ZW50cyBpbiBhIGNvbW1pdC9kcmF3IGxvY2stc3RlcCBwYXR0 ZXJuLCBzaG91bGQgdXNlCisgICAgICAgIHNvdXJjZUZyYW1lTnVtYmVyKCkgbm90IGZyYW1lTnVt YmVyKCkgb24gdGhlIGltcGwgc2lkZS4KKyAgICAgICAgT3RoZXJ3aXNlIHRoZXkgd2lsbCBmYWls IGlmIHRoZSBzYW1lIGZyYW1lIGlzIGRyYXduIG1vcmUgdGhhbiBvbmNlIGluCisgICAgICAgIGJl dHdlZW4gY29tbWl0cyAod2hpY2ggaXMgcGVyZmVjdGx5IGxlZ2FsIGFuZCBjb3VsZCBoYXBwZW4g Zm9yIGV4YW1wbGUKKyAgICAgICAgYmVjYXVzZSB3ZSBkcmF3IHdpdGhvdXQgYSBuZXcgY29tbWl0 IGJlY2F1c2Ugd2UgYXJlIHN0aWxsIGluIEJFR0lOX0ZSQU1FCisgICAgICAgIG9yIHVwZGF0aW5n IHJlc291cmNlcykuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiB0ZXN0cy9DQ0xheWVyVHJlZUhvc3RUZXN0LmNwcDoKKyAgICAgICAgKFdURjo6Q0NM YXllclRyZWVIb3N0VGVzdFNjcm9sbFNpbXBsZTo6ZHJhd0xheWVyc09uQ0NUaHJlYWQpOgorICAg ICAgICAoV1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0U2Nyb2xsTXVsdGlwbGVSZWRyYXc6OmRyYXdM YXllcnNPbkNDVGhyZWFkKToKKyAgICAgICAgKFdURjo6Q0NMYXllclRyZWVIb3N0VGVzdFN0YXJ0 UGFnZVNjYWxlQW5pbWF0aW9uOjpjb21taXRDb21wbGV0ZU9uQ0NUaHJlYWQpOgorICAgICAgICAo V1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0QXRvbWljQ29tbWl0Ojpjb21taXRDb21wbGV0ZU9uQ0NU aHJlYWQpOgorICAgICAgICAoV1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0QXRvbWljQ29tbWl0Ojpk cmF3TGF5ZXJzT25DQ1RocmVhZCk6CisgICAgICAgIChXVEY6OkNDTGF5ZXJUcmVlSG9zdFRlc3RB dG9taWNDb21taXRXaXRoUGFydGlhbFVwZGF0ZTo6Y29tbWl0Q29tcGxldGVPbkNDVGhyZWFkKToK KyAgICAgICAgKFdURjo6Q0NMYXllclRyZWVIb3N0VGVzdEF0b21pY0NvbW1pdFdpdGhQYXJ0aWFs VXBkYXRlOjpkcmF3TGF5ZXJzT25DQ1RocmVhZCk6CisgICAgICAgIChXVEY6OkNDTGF5ZXJUcmVl SG9zdFRlc3RGcmFjdGlvbmFsU2Nyb2xsOjpkcmF3TGF5ZXJzT25DQ1RocmVhZCk6CisKIDIwMTIt MDUtMTggIE1pY2hhZWwgTm9yZG1hbiAgPG1pY2hhZWxuQGdvb2dsZS5jb20+CiAKICAgICAgICAg W2Nocm9taXVtXSBEb21TdG9yYWdlIGV2ZW50cyBoYW5kbGluZyBuZWVkcyBUTEMgKDIpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdFRlc3Qu Y3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RUZXN0LmNw cAppbmRleCBjYjI3MDNlZGUzYTEwMWFjMjY3NWVhZDMwYjg1ZmUzY2IxMzUxNzEzLi5jYTk0MGQw OWI1ZWU5MjMyNDYwM2QxZDRkYzgwMzZlNGJmNjNlMGRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdFRlc3QuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0VGVzdC5jcHAKQEAgLTEzODMsMTEg KzEzODMsMTEgQEAgcHVibGljOgogICAgICAgICByb290LT5zZXRNYXhTY3JvbGxQb3NpdGlvbihJ bnRTaXplKDEwMCwgMTAwKSk7CiAgICAgICAgIHJvb3QtPnNjcm9sbEJ5KG1fc2Nyb2xsQW1vdW50 KTsKIAotICAgICAgICBpZiAoaW1wbC0+ZnJhbWVOdW1iZXIoKSA9PSAxKSB7CisgICAgICAgIGlm ICghaW1wbC0+c291cmNlRnJhbWVOdW1iZXIoKSkgewogICAgICAgICAgICAgRVhQRUNUX0VRKHJv b3QtPnNjcm9sbFBvc2l0aW9uKCksIG1faW5pdGlhbFNjcm9sbCk7CiAgICAgICAgICAgICBFWFBF Q1RfRVEocm9vdC0+c2Nyb2xsRGVsdGEoKSwgbV9zY3JvbGxBbW91bnQpOwogICAgICAgICAgICAg cG9zdFNldE5lZWRzQ29tbWl0VG9NYWluVGhyZWFkKCk7Ci0gICAgICAgIH0gZWxzZSBpZiAoaW1w bC0+ZnJhbWVOdW1iZXIoKSA9PSAyKSB7CisgICAgICAgIH0gZWxzZSBpZiAoaW1wbC0+c291cmNl RnJhbWVOdW1iZXIoKSA9PSAxKSB7CiAgICAgICAgICAgICBFWFBFQ1RfRVEocm9vdC0+c2Nyb2xs UG9zaXRpb24oKSwgbV9zZWNvbmRTY3JvbGwpOwogICAgICAgICAgICAgRVhQRUNUX0VRKHJvb3Qt PnNjcm9sbERlbHRhKCksIG1fc2Nyb2xsQW1vdW50KTsKICAgICAgICAgICAgIGVuZFRlc3QoKTsK QEAgLTE0NTAsMjEgKzE0NTAsMjUgQEAgcHVibGljOgogICAgICAgICByb290LT5zZXRTY3JvbGxh YmxlKHRydWUpOwogICAgICAgICByb290LT5zZXRNYXhTY3JvbGxQb3NpdGlvbihJbnRTaXplKDEw MCwgMTAwKSk7CiAKLSAgICAgICAgaWYgKGltcGwtPmZyYW1lTnVtYmVyKCkgPT0gMSkgeworICAg ICAgICBpZiAoIWltcGwtPnNvdXJjZUZyYW1lTnVtYmVyKCkgJiYgaW1wbC0+ZnJhbWVOdW1iZXIo KSA9PSAxKSB7CisgICAgICAgICAgICAvLyBGaXJzdCBkcmF3IGFmdGVyIGZpcnN0IGNvbW1pdC4K ICAgICAgICAgICAgIEVYUEVDVF9FUShyb290LT5zY3JvbGxEZWx0YSgpLCBJbnRTaXplKCkpOwog ICAgICAgICAgICAgcm9vdC0+c2Nyb2xsQnkobV9zY3JvbGxBbW91bnQpOwogICAgICAgICAgICAg RVhQRUNUX0VRKHJvb3QtPnNjcm9sbERlbHRhKCksIG1fc2Nyb2xsQW1vdW50KTsKIAogICAgICAg ICAgICAgRVhQRUNUX0VRKHJvb3QtPnNjcm9sbFBvc2l0aW9uKCksIG1faW5pdGlhbFNjcm9sbCk7 CiAgICAgICAgICAgICBwb3N0U2V0TmVlZHNSZWRyYXdUb01haW5UaHJlYWQoKTsKLSAgICAgICAg fSBlbHNlIGlmIChpbXBsLT5mcmFtZU51bWJlcigpID09IDIpIHsKKyAgICAgICAgfSBlbHNlIGlm ICghaW1wbC0+c291cmNlRnJhbWVOdW1iZXIoKSAmJiBpbXBsLT5mcmFtZU51bWJlcigpID09IDIp IHsKKyAgICAgICAgICAgIC8vIFNlY29uZCBkcmF3IGFmdGVyIGZpcnN0IGNvbW1pdC4KICAgICAg ICAgICAgIEVYUEVDVF9FUShyb290LT5zY3JvbGxEZWx0YSgpLCBtX3Njcm9sbEFtb3VudCk7CiAg ICAgICAgICAgICByb290LT5zY3JvbGxCeShtX3Njcm9sbEFtb3VudCk7CiAgICAgICAgICAgICBF WFBFQ1RfRVEocm9vdC0+c2Nyb2xsRGVsdGEoKSwgbV9zY3JvbGxBbW91bnQgKyBtX3Njcm9sbEFt b3VudCk7CiAKICAgICAgICAgICAgIEVYUEVDVF9FUShyb290LT5zY3JvbGxQb3NpdGlvbigpLCBt X2luaXRpYWxTY3JvbGwpOwogICAgICAgICAgICAgcG9zdFNldE5lZWRzQ29tbWl0VG9NYWluVGhy ZWFkKCk7Ci0gICAgICAgIH0gZWxzZSBpZiAoaW1wbC0+ZnJhbWVOdW1iZXIoKSA9PSAzKSB7Cisg ICAgICAgIH0gZWxzZSBpZiAoaW1wbC0+c291cmNlRnJhbWVOdW1iZXIoKSA9PSAxKSB7CisgICAg ICAgICAgICAvLyBUaGlyZCBvciBsYXRlciBkcmF3IGFmdGVyIHNlY29uZCBjb21taXQuCisgICAg ICAgICAgICBFWFBFQ1RfR0UoaW1wbC0+ZnJhbWVOdW1iZXIoKSwgMyk7CiAgICAgICAgICAgICBF WFBFQ1RfRVEocm9vdC0+c2Nyb2xsRGVsdGEoKSwgSW50U2l6ZSgpKTsKICAgICAgICAgICAgIEVY UEVDVF9FUShyb290LT5zY3JvbGxQb3NpdGlvbigpLCBtX2luaXRpYWxTY3JvbGwgKyBtX3Njcm9s bEFtb3VudCArIG1fc2Nyb2xsQW1vdW50KTsKICAgICAgICAgICAgIGVuZFRlc3QoKTsKQEAgLTE1 NzIsOSArMTU3Niw4IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgY29tbWl0Q29tcGxldGVP bkNDVGhyZWFkKENDTGF5ZXJUcmVlSG9zdEltcGwqIGltcGwpCiAgICAgewogICAgICAgICBpbXBs LT5wcm9jZXNzU2Nyb2xsRGVsdGFzKCk7Ci0gICAgICAgIC8vIFdlIGdldCBvbmUgY29tbWl0IGJl Zm9yZSB0aGUgZmlyc3QgZHJhdywgYW5kIHRoZSBhbmltYXRpb24gZG9lc24ndCBoYXBwZW4gdW50 aWwgdGhlIHNlY29uZCBkcmF3LAotICAgICAgICAvLyBzbyByZXN1bHRzIGF2YWlsYWJsZSBvbiB0 aGUgdGhpcmQgY29tbWl0LgotICAgICAgICBpZiAoaW1wbC0+ZnJhbWVOdW1iZXIoKSA9PSAyKSB7 CisgICAgICAgIC8vIFdlIGdldCBvbmUgY29tbWl0IGJlZm9yZSB0aGUgZmlyc3QgZHJhdywgYW5k IHRoZSBhbmltYXRpb24gZG9lc24ndCBoYXBwZW4gdW50aWwgdGhlIHNlY29uZCBkcmF3LgorICAg ICAgICBpZiAoaW1wbC0+c291cmNlRnJhbWVOdW1iZXIoKSA9PSAxKSB7CiAgICAgICAgICAgICBF WFBFQ1RfRVEoMS4yNSwgaW1wbC0+cGFnZVNjYWxlKCkpOwogICAgICAgICAgICAgZW5kVGVzdCgp OwogICAgICAgICB9IGVsc2UKQEAgLTI2MTAsMTUgKzI2MTMsMTUgQEAgcHVibGljOgogICAgICAg ICByb290LT5zZXRNYXhTY3JvbGxQb3NpdGlvbihJbnRTaXplKDEwMCwgMTAwKSk7CiAKICAgICAg ICAgLy8gQ2hlY2sgdGhhdCBhIGZyYWN0aW9uYWwgc2Nyb2xsIGRlbHRhIGlzIGNvcnJlY3RseSBh Y2N1bXVsYXRlZCBvdmVyIG11bHRpcGxlIGNvbW1pdHMuCi0gICAgICAgIGlmIChpbXBsLT5mcmFt ZU51bWJlcigpID09IDEpIHsKKyAgICAgICAgaWYgKCFpbXBsLT5zb3VyY2VGcmFtZU51bWJlcigp KSB7CiAgICAgICAgICAgICBFWFBFQ1RfRVEocm9vdC0+c2Nyb2xsUG9zaXRpb24oKSwgSW50UG9p bnQoMCwgMCkpOwogICAgICAgICAgICAgRVhQRUNUX0VRKHJvb3QtPnNjcm9sbERlbHRhKCksIEZs b2F0U2l6ZSgwLCAwKSk7CiAgICAgICAgICAgICBwb3N0U2V0TmVlZHNDb21taXRUb01haW5UaHJl YWQoKTsKLSAgICAgICAgfSBlbHNlIGlmIChpbXBsLT5mcmFtZU51bWJlcigpID09IDIpIHsKKyAg ICAgICAgfSBlbHNlIGlmIChpbXBsLT5zb3VyY2VGcmFtZU51bWJlcigpID09IDEpIHsKICAgICAg ICAgICAgIEVYUEVDVF9FUShyb290LT5zY3JvbGxQb3NpdGlvbigpLCBmbG9vcmVkSW50UG9pbnQo bV9zY3JvbGxBbW91bnQpKTsKICAgICAgICAgICAgIEVYUEVDVF9FUShyb290LT5zY3JvbGxEZWx0 YSgpLCBGbG9hdFNpemUoZm1vZChtX3Njcm9sbEFtb3VudC53aWR0aCgpLCAxKSwgMCkpOwogICAg ICAgICAgICAgcG9zdFNldE5lZWRzQ29tbWl0VG9NYWluVGhyZWFkKCk7Ci0gICAgICAgIH0gZWxz ZSBpZiAoaW1wbC0+ZnJhbWVOdW1iZXIoKSA9PSAzKSB7CisgICAgICAgIH0gZWxzZSBpZiAoaW1w bC0+c291cmNlRnJhbWVOdW1iZXIoKSA9PSAyKSB7CiAgICAgICAgICAgICBFWFBFQ1RfRVEocm9v dC0+c2Nyb2xsUG9zaXRpb24oKSwgZmxvb3JlZEludFBvaW50KG1fc2Nyb2xsQW1vdW50ICsgbV9z Y3JvbGxBbW91bnQpKTsKICAgICAgICAgICAgIEVYUEVDVF9FUShyb290LT5zY3JvbGxEZWx0YSgp LCBGbG9hdFNpemUoZm1vZCgyICogbV9zY3JvbGxBbW91bnQud2lkdGgoKSwgMSksIDApKTsKICAg ICAgICAgICAgIGVuZFRlc3QoKTsK