85390 2012-05-02 10:54:43 -0700 [chromium] Ensure synchronization in threaded unit tests by checking the sourceFrameNumber() to count commits 2012-05-07 15:59:37 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 danakj danakj backer enne jamesr piman reveman webkit.review.bot oldest_to_newest 614435 0 danakj 2012-05-02 10:54:43 -0700 [chromium] Ensure synchronization in threaded unit tests by checking the sourceFrameNumber() to count commits 614471 1 139844 danakj 2012-05-02 11:26:37 -0700 Created attachment 139844 Patch 614504 2 139852 danakj 2012-05-02 12:03:34 -0700 Created attachment 139852 Patch Use sourceFrameNumber everywhere in the atomic commit tests, and put back removed resetUsedTextures() calls 617956 3 139852 enne 2012-05-07 14:37:20 -0700 Comment on attachment 139852 Patch Ack, yes. R=me. 617960 4 139852 webkit.review.bot 2012-05-07 14:42:31 -0700 Comment on attachment 139852 Patch Rejecting attachment 139852 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: 748 (offset -2 lines). Hunk #5 succeeded at 1815 (offset -2 lines). Hunk #6 succeeded at 1830 (offset -2 lines). Hunk #7 succeeded at 1846 (offset -2 lines). Hunk #8 succeeded at 1886 (offset -2 lines). Hunk #9 FAILED at 2482. 1 out of 9 hunks FAILED -- saving rejects to file Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force', u'--reviewer', u'Adrienne W..." exit_code: 1 cwd: /mnt/git/webkit-commit-queue/ Full output: http://queues.webkit.org/results/12649175 618002 5 140604 danakj 2012-05-07 15:24:48 -0700 Created attachment 140604 Patch for landing 618047 6 140604 webkit.review.bot 2012-05-07 15:59:32 -0700 Comment on attachment 140604 Patch for landing Clearing flags on attachment: 140604 Committed r116362: <http://trac.webkit.org/changeset/116362> 618048 7 webkit.review.bot 2012-05-07 15:59:37 -0700 All reviewed patches have been landed. Closing bug. 139844 2012-05-02 11:26:37 -0700 2012-05-02 12:03:30 -0700 Patch bug-85390-20120502142635.patch text/plain 7147 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1NzQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDYyNTNhMmNkZWIyMzliYTY5ZDkxYTM2NzE1YmNiMmQ1ZmFlNDg3ODAuLjM3M2Y5M2U0YzI2ZmQw MzVlYzYxNzIzYjQ5Zjc2OTZkMWY3YWZjMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTItMDUtMDIgIERhbmEgSmFuc2VucyAgPGRhbmFrakBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBFbnN1cmUgc3luY2hyb25pemF0aW9uIGluIHRo cmVhZGVkIHVuaXQgdGVzdHMgYnkgY2hlY2tpbmcgdGhlIHNvdXJjZUZyYW1lTnVtYmVyKCkgdG8g Y291bnQgY29tbWl0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODUzOTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIHRlc3RzL0NDTGF5ZXJUcmVlSG9zdFRlc3QuY3BwOgorICAgICAgICAoV1RGOjpDQ0xh eWVyVHJlZUhvc3RUZXN0U2Nyb2xsTXVsdGlwbGVSZWRyYXc6OmJlZ2luQ29tbWl0T25DQ1RocmVh ZCk6CisgICAgICAgIChXVEY6OkNDTGF5ZXJUcmVlSG9zdFRlc3RBdG9taWNDb21taXQ6OmNvbW1p dENvbXBsZXRlT25DQ1RocmVhZCk6CisgICAgICAgIChXVEY6OkNDTGF5ZXJUcmVlSG9zdFRlc3RB dG9taWNDb21taXRXaXRoUGFydGlhbFVwZGF0ZTo6Y29tbWl0Q29tcGxldGVPbkNDVGhyZWFkKToK KyAgICAgICAgKFdURjo6Q0NMYXllclRyZWVIb3N0VGVzdFNjcm9sbENoaWxkTGF5ZXI6OmJlZ2lu Q29tbWl0T25DQ1RocmVhZCk6CisKIDIwMTItMDUtMDEgIEp1bGllbiBDaGFmZnJhaXggIDxqY2hh ZmZyYWl4QHdlYmtpdC5vcmc+CiAKICAgICAgICAgV2ViS2l0IHRlc3QgUmVuZGVyVGFibGVDZWxs RGVhdGhUZXN0LkNhblNldFJvdyBpcyBmYWlsaW5nIGFzIG9mIHIxMTU3MDUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0VGVzdC5jcHAgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdFRlc3QuY3BwCmluZGV4 IDIxNmExNDAwZDkyNmE1ZjNhNjRkMWI3NzEzN2FmZjE4Y2VmZDVmODkuLjQ4NzY2NTYyYmM5ZjBj ZTJjODljNWMwYzhhYmZjYTY1ZDIyYTA0ODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0VGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RUZXN0LmNwcApAQCAtMTM0MCwxMSArMTM0MCwx MSBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGJlZ2luQ29tbWl0T25DQ1RocmVhZChDQ0xh eWVyVHJlZUhvc3RJbXBsKiBpbXBsKQogICAgIHsKICAgICAgICAgTGF5ZXJDaHJvbWl1bSogcm9v dCA9IG1fbGF5ZXJUcmVlSG9zdC0+cm9vdExheWVyKCk7Ci0gICAgICAgIGlmICghbV9sYXllclRy ZWVIb3N0LT5mcmFtZU51bWJlcigpKQorICAgICAgICBpZiAoIWltcGwtPnNvdXJjZUZyYW1lTnVt YmVyKCkpCiAgICAgICAgICAgICBFWFBFQ1RfRVEocm9vdC0+c2Nyb2xsUG9zaXRpb24oKSwgbV9p bml0aWFsU2Nyb2xsKTsKLSAgICAgICAgZWxzZSBpZiAobV9sYXllclRyZWVIb3N0LT5mcmFtZU51 bWJlcigpID09IDEpCisgICAgICAgIGVsc2UgaWYgKGltcGwtPnNvdXJjZUZyYW1lTnVtYmVyKCkg PT0gMSkKICAgICAgICAgICAgIEVYUEVDVF9FUShyb290LT5zY3JvbGxQb3NpdGlvbigpLCBtX2lu aXRpYWxTY3JvbGwgKyBtX3Njcm9sbEFtb3VudCArIG1fc2Nyb2xsQW1vdW50KTsKLSAgICAgICAg ZWxzZSBpZiAobV9sYXllclRyZWVIb3N0LT5mcmFtZU51bWJlcigpID09IDIpCisgICAgICAgIGVs c2UgaWYgKGltcGwtPnNvdXJjZUZyYW1lTnVtYmVyKCkgPT0gMikKICAgICAgICAgICAgIEVYUEVD VF9FUShyb290LT5zY3JvbGxQb3NpdGlvbigpLCBtX2luaXRpYWxTY3JvbGwgKyBtX3Njcm9sbEFt b3VudCArIG1fc2Nyb2xsQW1vdW50KTsKICAgICB9CiAKQEAgLTE3MTMsMjkgKzE3MTMsMjUgQEAg cHVibGljOgogICAgIHsKICAgICAgICAgQ29tcG9zaXRvckZha2VXZWJHcmFwaGljc0NvbnRleHQz RFdpdGhUZXh0dXJlVHJhY2tpbmcqIGNvbnRleHQgPSBzdGF0aWNfY2FzdDxDb21wb3NpdG9yRmFr ZVdlYkdyYXBoaWNzQ29udGV4dDNEV2l0aFRleHR1cmVUcmFja2luZyo+KEdyYXBoaWNzQ29udGV4 dDNEUHJpdmF0ZTo6ZXh0cmFjdFdlYkdyYXBoaWNzQ29udGV4dDNEKGltcGwtPmNvbnRleHQoKSkp OwogCi0gICAgICAgIHN3aXRjaCAoaW1wbC0+ZnJhbWVOdW1iZXIoKSkgeworICAgICAgICBzd2l0 Y2ggKGltcGwtPnNvdXJjZUZyYW1lTnVtYmVyKCkpIHsKICAgICAgICAgY2FzZSAwOgogICAgICAg ICAgICAgLy8gTnVtYmVyIG9mIHRleHR1cmVzIHNob3VsZCBiZSBvbmUuCi0gICAgICAgICAgICBF WFBFQ1RfRVEoMSwgY29udGV4dC0+bnVtVGV4dHVyZXMoKSk7CisgICAgICAgICAgICBBU1NFUlRf RVEoMSwgY29udGV4dC0+bnVtVGV4dHVyZXMoKSk7CiAgICAgICAgICAgICAvLyBOdW1iZXIgb2Yg dGV4dHVyZXMgdXNlZCBmb3IgY29tbWl0IHNob3VsZCBiZSBvbmUuCiAgICAgICAgICAgICBFWFBF Q1RfRVEoMSwgY29udGV4dC0+bnVtVXNlZFRleHR1cmVzKCkpOwogICAgICAgICAgICAgLy8gVmVy aWZ5IHRoYXQgdXNlZCB0ZXh0dXJlIGlzIGNvcnJlY3QuCiAgICAgICAgICAgICBFWFBFQ1RfVFJV RShjb250ZXh0LT51c2VkVGV4dHVyZShjb250ZXh0LT50ZXh0dXJlKDApKSk7Ci0KLSAgICAgICAg ICAgIGNvbnRleHQtPnJlc2V0VXNlZFRleHR1cmVzKCk7CiAgICAgICAgICAgICBicmVhazsKICAg ICAgICAgY2FzZSAxOgogICAgICAgICAgICAgLy8gTnVtYmVyIG9mIHRleHR1cmVzIHNob3VsZCBi ZSB0d28gYXMgdGhlIGZpcnN0IHRleHR1cmUKICAgICAgICAgICAgIC8vIGlzIHVzZWQgYnkgaW1w bCB0aHJlYWQgYW5kIGNhbm5vdCBieSB1c2VkIGZvciB1cGRhdGUuCi0gICAgICAgICAgICBFWFBF Q1RfRVEoMiwgY29udGV4dC0+bnVtVGV4dHVyZXMoKSk7CisgICAgICAgICAgICBBU1NFUlRfRVEo MiwgY29udGV4dC0+bnVtVGV4dHVyZXMoKSk7CiAgICAgICAgICAgICAvLyBOdW1iZXIgb2YgdGV4 dHVyZXMgdXNlZCBmb3IgY29tbWl0IHNob3VsZCBzdGlsbCBiZSBvbmUuCiAgICAgICAgICAgICBF WFBFQ1RfRVEoMSwgY29udGV4dC0+bnVtVXNlZFRleHR1cmVzKCkpOwogICAgICAgICAgICAgLy8g Rmlyc3QgdGV4dHVyZSBzaG91bGQgbm90IGhhdmUgYmVlbiB1c2VkLgogICAgICAgICAgICAgRVhQ RUNUX0ZBTFNFKGNvbnRleHQtPnVzZWRUZXh0dXJlKGNvbnRleHQtPnRleHR1cmUoMCkpKTsKICAg ICAgICAgICAgIC8vIE5ldyB0ZXh0dXJlIHNob3VsZCBoYXZlIGJlZW4gdXNlZC4KICAgICAgICAg ICAgIEVYUEVDVF9UUlVFKGNvbnRleHQtPnVzZWRUZXh0dXJlKGNvbnRleHQtPnRleHR1cmUoMSkp KTsKLQotICAgICAgICAgICAgY29udGV4dC0+cmVzZXRVc2VkVGV4dHVyZXMoKTsKICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7CkBAIC0xODE3LDIyICsxODEzLDIwIEBAIHB1YmxpYzoKICAgICB7CiAgICAgICAgIENv bXBvc2l0b3JGYWtlV2ViR3JhcGhpY3NDb250ZXh0M0RXaXRoVGV4dHVyZVRyYWNraW5nKiBjb250 ZXh0ID0gc3RhdGljX2Nhc3Q8Q29tcG9zaXRvckZha2VXZWJHcmFwaGljc0NvbnRleHQzRFdpdGhU ZXh0dXJlVHJhY2tpbmcqPihHcmFwaGljc0NvbnRleHQzRFByaXZhdGU6OmV4dHJhY3RXZWJHcmFw aGljc0NvbnRleHQzRChpbXBsLT5jb250ZXh0KCkpKTsKIAotICAgICAgICBzd2l0Y2ggKGltcGwt PmZyYW1lTnVtYmVyKCkpIHsKKyAgICAgICAgc3dpdGNoIChpbXBsLT5zb3VyY2VGcmFtZU51bWJl cigpKSB7CiAgICAgICAgIGNhc2UgMDoKICAgICAgICAgICAgIC8vIE51bWJlciBvZiB0ZXh0dXJl cyBzaG91bGQgYmUgdHdvLgotICAgICAgICAgICAgRVhQRUNUX0VRKDIsIGNvbnRleHQtPm51bVRl eHR1cmVzKCkpOworICAgICAgICAgICAgQVNTRVJUX0VRKDIsIGNvbnRleHQtPm51bVRleHR1cmVz KCkpOwogICAgICAgICAgICAgLy8gTnVtYmVyIG9mIHRleHR1cmVzIHVzZWQgZm9yIGNvbW1pdCBz aG91bGQgYmUgdHdvLgogICAgICAgICAgICAgRVhQRUNUX0VRKDIsIGNvbnRleHQtPm51bVVzZWRU ZXh0dXJlcygpKTsKICAgICAgICAgICAgIC8vIFZlcmlmeSB0aGF0IHVzZWQgdGV4dHVyZXMgYXJl IGNvcnJlY3QuCiAgICAgICAgICAgICBFWFBFQ1RfVFJVRShjb250ZXh0LT51c2VkVGV4dHVyZShj b250ZXh0LT50ZXh0dXJlKDApKSk7CiAgICAgICAgICAgICBFWFBFQ1RfVFJVRShjb250ZXh0LT51 c2VkVGV4dHVyZShjb250ZXh0LT50ZXh0dXJlKDEpKSk7Ci0KLSAgICAgICAgICAgIGNvbnRleHQt PnJlc2V0VXNlZFRleHR1cmVzKCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSAx OgogICAgICAgICAgICAgLy8gTnVtYmVyIG9mIHRleHR1cmVzIHNob3VsZCBiZSBmb3VyIGFzIHRo ZSBmaXJzdCB0d28KICAgICAgICAgICAgIC8vIHRleHR1cmVzIGFyZSB1c2VkIGJ5IHRoZSBpbXBs IHRocmVhZC4KLSAgICAgICAgICAgIEVYUEVDVF9FUSg0LCBjb250ZXh0LT5udW1UZXh0dXJlcygp KTsKKyAgICAgICAgICAgIEFTU0VSVF9FUSg0LCBjb250ZXh0LT5udW1UZXh0dXJlcygpKTsKICAg ICAgICAgICAgIC8vIE51bWJlciBvZiB0ZXh0dXJlcyB1c2VkIGZvciBjb21taXQgc2hvdWxkIHN0 aWxsIGJlIHR3by4KICAgICAgICAgICAgIEVYUEVDVF9FUSgyLCBjb250ZXh0LT5udW1Vc2VkVGV4 dHVyZXMoKSk7CiAgICAgICAgICAgICAvLyBGaXJzdCB0d28gdGV4dHVyZXMgc2hvdWxkIG5vdCBo YXZlIGJlZW4gdXNlZC4KQEAgLTE4NDEsMTQgKzE4MzUsMTIgQEAgcHVibGljOgogICAgICAgICAg ICAgLy8gTmV3IHRleHR1cmVzIHNob3VsZCBoYXZlIGJlZW4gdXNlZC4KICAgICAgICAgICAgIEVY UEVDVF9UUlVFKGNvbnRleHQtPnVzZWRUZXh0dXJlKGNvbnRleHQtPnRleHR1cmUoMikpKTsKICAg ICAgICAgICAgIEVYUEVDVF9UUlVFKGNvbnRleHQtPnVzZWRUZXh0dXJlKGNvbnRleHQtPnRleHR1 cmUoMykpKTsKLQotICAgICAgICAgICAgY29udGV4dC0+cmVzZXRVc2VkVGV4dHVyZXMoKTsKICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIDI6CiAgICAgICAgICAgICAvLyBOdW1iZXIg b2YgdGV4dHVyZXMgc2hvdWxkIGJlIHRocmVlIGFzIHdlIGFsbG93IG9uZQogICAgICAgICAgICAg Ly8gcGFydGlhbCB1cGRhdGUgYW5kIHRoZSBmaXJzdCB0d28gdGV4dHVyZXMgYXJlIHVzZWQgYnkK ICAgICAgICAgICAgIC8vIHRoZSBpbXBsIHRocmVhZC4KLSAgICAgICAgICAgIEVYUEVDVF9FUSgz LCBjb250ZXh0LT5udW1UZXh0dXJlcygpKTsKKyAgICAgICAgICAgIEFTU0VSVF9FUSgzLCBjb250 ZXh0LT5udW1UZXh0dXJlcygpKTsKICAgICAgICAgICAgIC8vIE51bWJlciBvZiB0ZXh0dXJlcyB1 c2VkIGZvciBjb21taXQgc2hvdWxkIHN0aWxsIGJlIHR3by4KICAgICAgICAgICAgIEVYUEVDVF9F USgyLCBjb250ZXh0LT5udW1Vc2VkVGV4dHVyZXMoKSk7CiAgICAgICAgICAgICAvLyBGaXJzdCB0 ZXh0dXJlIHNob3VsZCBoYXZlIGJlZW4gdXNlZC4KQEAgLTE4NTcsMjQgKzE4NDksMTggQEAgcHVi bGljOgogICAgICAgICAgICAgRVhQRUNUX0ZBTFNFKGNvbnRleHQtPnVzZWRUZXh0dXJlKGNvbnRl eHQtPnRleHR1cmUoMSkpKTsKICAgICAgICAgICAgIC8vIFRoaXJkIHRleHR1cmUgc2hvdWxkIGhh dmUgYmVlbiB1c2VkLgogICAgICAgICAgICAgRVhQRUNUX1RSVUUoY29udGV4dC0+dXNlZFRleHR1 cmUoY29udGV4dC0+dGV4dHVyZSgyKSkpOwotCi0gICAgICAgICAgICBjb250ZXh0LT5yZXNldFVz ZWRUZXh0dXJlcygpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgMzoKICAgICAg ICAgICAgIC8vIE51bWJlciBvZiB0ZXh0dXJlcyBzaG91bGQgYmUgdHdvLgogICAgICAgICAgICAg RVhQRUNUX0VRKDIsIGNvbnRleHQtPm51bVRleHR1cmVzKCkpOwogICAgICAgICAgICAgLy8gTm8g dGV4dHVyZXMgc2hvdWxkIGJlIHVzZWQgZm9yIGNvbW1pdC4KICAgICAgICAgICAgIEVYUEVDVF9F USgwLCBjb250ZXh0LT5udW1Vc2VkVGV4dHVyZXMoKSk7Ci0KLSAgICAgICAgICAgIGNvbnRleHQt PnJlc2V0VXNlZFRleHR1cmVzKCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSA0 OgogICAgICAgICAgICAgLy8gTnVtYmVyIG9mIHRleHR1cmVzIHNob3VsZCBiZSB0d28uCiAgICAg ICAgICAgICBFWFBFQ1RfRVEoMiwgY29udGV4dC0+bnVtVGV4dHVyZXMoKSk7CiAgICAgICAgICAg ICAvLyBOdW1iZXIgb2YgdGV4dHVyZXMgdXNlZCBmb3IgY29tbWl0IHNob3VsZCBiZSBvbmUuCiAg ICAgICAgICAgICBFWFBFQ1RfRVEoMSwgY29udGV4dC0+bnVtVXNlZFRleHR1cmVzKCkpOwotCi0g ICAgICAgICAgICBjb250ZXh0LT5yZXNldFVzZWRUZXh0dXJlcygpOwogICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsK QEAgLTI0ODIsNyArMjQ2OCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgYmVnaW5Db21t aXRPbkNDVGhyZWFkKENDTGF5ZXJUcmVlSG9zdEltcGwqIGltcGwpCiAgICAgewogICAgICAgICBF WFBFQ1RfRVEobV9yb290U2Nyb2xsTGF5ZXItPnNjcm9sbFBvc2l0aW9uKCksIEludFBvaW50KCkp OwotICAgICAgICBpZiAoIW1fbGF5ZXJUcmVlSG9zdC0+ZnJhbWVOdW1iZXIoKSkKKyAgICAgICAg aWYgKCFpbXBsLT5mcmFtZU51bWJlcigpKQogICAgICAgICAgICAgRVhQRUNUX0VRKG1fY2hpbGRM YXllci0+c2Nyb2xsUG9zaXRpb24oKSwgSW50UG9pbnQoKSk7CiAgICAgICAgIGVsc2UKICAgICAg ICAgICAgIEVYUEVDVF9FUShtX2NoaWxkTGF5ZXItPnNjcm9sbFBvc2l0aW9uKCksIEludFBvaW50 KCkgKyBtX3Njcm9sbEFtb3VudCk7Cg== 139852 2012-05-02 12:03:34 -0700 2012-05-07 15:24:43 -0700 Patch bug-85390-20120502150333.patch text/plain 6343 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1NzQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDYyNTNhMmNkZWIyMzliYTY5ZDkxYTM2NzE1YmNiMmQ1ZmFlNDg3ODAuLjM3M2Y5M2U0YzI2ZmQw MzVlYzYxNzIzYjQ5Zjc2OTZkMWY3YWZjMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTItMDUtMDIgIERhbmEgSmFuc2VucyAgPGRhbmFrakBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBFbnN1cmUgc3luY2hyb25pemF0aW9uIGluIHRo cmVhZGVkIHVuaXQgdGVzdHMgYnkgY2hlY2tpbmcgdGhlIHNvdXJjZUZyYW1lTnVtYmVyKCkgdG8g Y291bnQgY29tbWl0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODUzOTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIHRlc3RzL0NDTGF5ZXJUcmVlSG9zdFRlc3QuY3BwOgorICAgICAgICAoV1RGOjpDQ0xh eWVyVHJlZUhvc3RUZXN0U2Nyb2xsTXVsdGlwbGVSZWRyYXc6OmJlZ2luQ29tbWl0T25DQ1RocmVh ZCk6CisgICAgICAgIChXVEY6OkNDTGF5ZXJUcmVlSG9zdFRlc3RBdG9taWNDb21taXQ6OmNvbW1p dENvbXBsZXRlT25DQ1RocmVhZCk6CisgICAgICAgIChXVEY6OkNDTGF5ZXJUcmVlSG9zdFRlc3RB dG9taWNDb21taXRXaXRoUGFydGlhbFVwZGF0ZTo6Y29tbWl0Q29tcGxldGVPbkNDVGhyZWFkKToK KyAgICAgICAgKFdURjo6Q0NMYXllclRyZWVIb3N0VGVzdFNjcm9sbENoaWxkTGF5ZXI6OmJlZ2lu Q29tbWl0T25DQ1RocmVhZCk6CisKIDIwMTItMDUtMDEgIEp1bGllbiBDaGFmZnJhaXggIDxqY2hh ZmZyYWl4QHdlYmtpdC5vcmc+CiAKICAgICAgICAgV2ViS2l0IHRlc3QgUmVuZGVyVGFibGVDZWxs RGVhdGhUZXN0LkNhblNldFJvdyBpcyBmYWlsaW5nIGFzIG9mIHIxMTU3MDUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0VGVzdC5jcHAgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdFRlc3QuY3BwCmluZGV4 IDIxNmExNDAwZDkyNmE1ZjNhNjRkMWI3NzEzN2FmZjE4Y2VmZDVmODkuLmY2MzFiY2ZiZjJiNjJj OWE4YWRhOTNiYWI4Nzg0OWI4ZTAxMmQ1ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0VGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RUZXN0LmNwcApAQCAtMTM0MCwxMSArMTM0MCwx MSBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGJlZ2luQ29tbWl0T25DQ1RocmVhZChDQ0xh eWVyVHJlZUhvc3RJbXBsKiBpbXBsKQogICAgIHsKICAgICAgICAgTGF5ZXJDaHJvbWl1bSogcm9v dCA9IG1fbGF5ZXJUcmVlSG9zdC0+cm9vdExheWVyKCk7Ci0gICAgICAgIGlmICghbV9sYXllclRy ZWVIb3N0LT5mcmFtZU51bWJlcigpKQorICAgICAgICBpZiAoIWltcGwtPnNvdXJjZUZyYW1lTnVt YmVyKCkpCiAgICAgICAgICAgICBFWFBFQ1RfRVEocm9vdC0+c2Nyb2xsUG9zaXRpb24oKSwgbV9p bml0aWFsU2Nyb2xsKTsKLSAgICAgICAgZWxzZSBpZiAobV9sYXllclRyZWVIb3N0LT5mcmFtZU51 bWJlcigpID09IDEpCisgICAgICAgIGVsc2UgaWYgKGltcGwtPnNvdXJjZUZyYW1lTnVtYmVyKCkg PT0gMSkKICAgICAgICAgICAgIEVYUEVDVF9FUShyb290LT5zY3JvbGxQb3NpdGlvbigpLCBtX2lu aXRpYWxTY3JvbGwgKyBtX3Njcm9sbEFtb3VudCArIG1fc2Nyb2xsQW1vdW50KTsKLSAgICAgICAg ZWxzZSBpZiAobV9sYXllclRyZWVIb3N0LT5mcmFtZU51bWJlcigpID09IDIpCisgICAgICAgIGVs c2UgaWYgKGltcGwtPnNvdXJjZUZyYW1lTnVtYmVyKCkgPT0gMikKICAgICAgICAgICAgIEVYUEVD VF9FUShyb290LT5zY3JvbGxQb3NpdGlvbigpLCBtX2luaXRpYWxTY3JvbGwgKyBtX3Njcm9sbEFt b3VudCArIG1fc2Nyb2xsQW1vdW50KTsKICAgICB9CiAKQEAgLTE3MTMsMTAgKzE3MTMsMTAgQEAg cHVibGljOgogICAgIHsKICAgICAgICAgQ29tcG9zaXRvckZha2VXZWJHcmFwaGljc0NvbnRleHQz RFdpdGhUZXh0dXJlVHJhY2tpbmcqIGNvbnRleHQgPSBzdGF0aWNfY2FzdDxDb21wb3NpdG9yRmFr ZVdlYkdyYXBoaWNzQ29udGV4dDNEV2l0aFRleHR1cmVUcmFja2luZyo+KEdyYXBoaWNzQ29udGV4 dDNEUHJpdmF0ZTo6ZXh0cmFjdFdlYkdyYXBoaWNzQ29udGV4dDNEKGltcGwtPmNvbnRleHQoKSkp OwogCi0gICAgICAgIHN3aXRjaCAoaW1wbC0+ZnJhbWVOdW1iZXIoKSkgeworICAgICAgICBzd2l0 Y2ggKGltcGwtPnNvdXJjZUZyYW1lTnVtYmVyKCkpIHsKICAgICAgICAgY2FzZSAwOgogICAgICAg ICAgICAgLy8gTnVtYmVyIG9mIHRleHR1cmVzIHNob3VsZCBiZSBvbmUuCi0gICAgICAgICAgICBF WFBFQ1RfRVEoMSwgY29udGV4dC0+bnVtVGV4dHVyZXMoKSk7CisgICAgICAgICAgICBBU1NFUlRf RVEoMSwgY29udGV4dC0+bnVtVGV4dHVyZXMoKSk7CiAgICAgICAgICAgICAvLyBOdW1iZXIgb2Yg dGV4dHVyZXMgdXNlZCBmb3IgY29tbWl0IHNob3VsZCBiZSBvbmUuCiAgICAgICAgICAgICBFWFBF Q1RfRVEoMSwgY29udGV4dC0+bnVtVXNlZFRleHR1cmVzKCkpOwogICAgICAgICAgICAgLy8gVmVy aWZ5IHRoYXQgdXNlZCB0ZXh0dXJlIGlzIGNvcnJlY3QuCkBAIC0xNzI3LDcgKzE3MjcsNyBAQCBw dWJsaWM6CiAgICAgICAgIGNhc2UgMToKICAgICAgICAgICAgIC8vIE51bWJlciBvZiB0ZXh0dXJl cyBzaG91bGQgYmUgdHdvIGFzIHRoZSBmaXJzdCB0ZXh0dXJlCiAgICAgICAgICAgICAvLyBpcyB1 c2VkIGJ5IGltcGwgdGhyZWFkIGFuZCBjYW5ub3QgYnkgdXNlZCBmb3IgdXBkYXRlLgotICAgICAg ICAgICAgRVhQRUNUX0VRKDIsIGNvbnRleHQtPm51bVRleHR1cmVzKCkpOworICAgICAgICAgICAg QVNTRVJUX0VRKDIsIGNvbnRleHQtPm51bVRleHR1cmVzKCkpOwogICAgICAgICAgICAgLy8gTnVt YmVyIG9mIHRleHR1cmVzIHVzZWQgZm9yIGNvbW1pdCBzaG91bGQgc3RpbGwgYmUgb25lLgogICAg ICAgICAgICAgRVhQRUNUX0VRKDEsIGNvbnRleHQtPm51bVVzZWRUZXh0dXJlcygpKTsKICAgICAg ICAgICAgIC8vIEZpcnN0IHRleHR1cmUgc2hvdWxkIG5vdCBoYXZlIGJlZW4gdXNlZC4KQEAgLTE3 NTAsNyArMTc1MCw3IEBAIHB1YmxpYzoKICAgICAgICAgLy8gTnVtYmVyIG9mIHRleHR1cmVzIHVz ZWQgZm9yIGRyYXcgc2hvdWxkIGFsd2F5cyBiZSBvbmUuCiAgICAgICAgIEVYUEVDVF9FUSgxLCBj b250ZXh0LT5udW1Vc2VkVGV4dHVyZXMoKSk7CiAKLSAgICAgICAgaWYgKGltcGwtPmZyYW1lTnVt YmVyKCkgPCAyKSB7CisgICAgICAgIGlmIChpbXBsLT5zb3VyY2VGcmFtZU51bWJlcigpIDwgMSkg ewogICAgICAgICAgICAgY29udGV4dC0+cmVzZXRVc2VkVGV4dHVyZXMoKTsKICAgICAgICAgICAg IHBvc3RTZXROZWVkc0FuaW1hdGVBbmRDb21taXRUb01haW5UaHJlYWQoKTsKICAgICAgICAgICAg IHBvc3RTZXROZWVkc1JlZHJhd1RvTWFpblRocmVhZCgpOwpAQCAtMTgxNywxMCArMTgxNywxMCBA QCBwdWJsaWM6CiAgICAgewogICAgICAgICBDb21wb3NpdG9yRmFrZVdlYkdyYXBoaWNzQ29udGV4 dDNEV2l0aFRleHR1cmVUcmFja2luZyogY29udGV4dCA9IHN0YXRpY19jYXN0PENvbXBvc2l0b3JG YWtlV2ViR3JhcGhpY3NDb250ZXh0M0RXaXRoVGV4dHVyZVRyYWNraW5nKj4oR3JhcGhpY3NDb250 ZXh0M0RQcml2YXRlOjpleHRyYWN0V2ViR3JhcGhpY3NDb250ZXh0M0QoaW1wbC0+Y29udGV4dCgp KSk7CiAKLSAgICAgICAgc3dpdGNoIChpbXBsLT5mcmFtZU51bWJlcigpKSB7CisgICAgICAgIHN3 aXRjaCAoaW1wbC0+c291cmNlRnJhbWVOdW1iZXIoKSkgewogICAgICAgICBjYXNlIDA6CiAgICAg ICAgICAgICAvLyBOdW1iZXIgb2YgdGV4dHVyZXMgc2hvdWxkIGJlIHR3by4KLSAgICAgICAgICAg IEVYUEVDVF9FUSgyLCBjb250ZXh0LT5udW1UZXh0dXJlcygpKTsKKyAgICAgICAgICAgIEFTU0VS VF9FUSgyLCBjb250ZXh0LT5udW1UZXh0dXJlcygpKTsKICAgICAgICAgICAgIC8vIE51bWJlciBv ZiB0ZXh0dXJlcyB1c2VkIGZvciBjb21taXQgc2hvdWxkIGJlIHR3by4KICAgICAgICAgICAgIEVY UEVDVF9FUSgyLCBjb250ZXh0LT5udW1Vc2VkVGV4dHVyZXMoKSk7CiAgICAgICAgICAgICAvLyBW ZXJpZnkgdGhhdCB1c2VkIHRleHR1cmVzIGFyZSBjb3JyZWN0LgpAQCAtMTgzMiw3ICsxODMyLDcg QEAgcHVibGljOgogICAgICAgICBjYXNlIDE6CiAgICAgICAgICAgICAvLyBOdW1iZXIgb2YgdGV4 dHVyZXMgc2hvdWxkIGJlIGZvdXIgYXMgdGhlIGZpcnN0IHR3bwogICAgICAgICAgICAgLy8gdGV4 dHVyZXMgYXJlIHVzZWQgYnkgdGhlIGltcGwgdGhyZWFkLgotICAgICAgICAgICAgRVhQRUNUX0VR KDQsIGNvbnRleHQtPm51bVRleHR1cmVzKCkpOworICAgICAgICAgICAgQVNTRVJUX0VRKDQsIGNv bnRleHQtPm51bVRleHR1cmVzKCkpOwogICAgICAgICAgICAgLy8gTnVtYmVyIG9mIHRleHR1cmVz IHVzZWQgZm9yIGNvbW1pdCBzaG91bGQgc3RpbGwgYmUgdHdvLgogICAgICAgICAgICAgRVhQRUNU X0VRKDIsIGNvbnRleHQtPm51bVVzZWRUZXh0dXJlcygpKTsKICAgICAgICAgICAgIC8vIEZpcnN0 IHR3byB0ZXh0dXJlcyBzaG91bGQgbm90IGhhdmUgYmVlbiB1c2VkLgpAQCAtMTg0OCw3ICsxODQ4 LDcgQEAgcHVibGljOgogICAgICAgICAgICAgLy8gTnVtYmVyIG9mIHRleHR1cmVzIHNob3VsZCBi ZSB0aHJlZSBhcyB3ZSBhbGxvdyBvbmUKICAgICAgICAgICAgIC8vIHBhcnRpYWwgdXBkYXRlIGFu ZCB0aGUgZmlyc3QgdHdvIHRleHR1cmVzIGFyZSB1c2VkIGJ5CiAgICAgICAgICAgICAvLyB0aGUg aW1wbCB0aHJlYWQuCi0gICAgICAgICAgICBFWFBFQ1RfRVEoMywgY29udGV4dC0+bnVtVGV4dHVy ZXMoKSk7CisgICAgICAgICAgICBBU1NFUlRfRVEoMywgY29udGV4dC0+bnVtVGV4dHVyZXMoKSk7 CiAgICAgICAgICAgICAvLyBOdW1iZXIgb2YgdGV4dHVyZXMgdXNlZCBmb3IgY29tbWl0IHNob3Vs ZCBzdGlsbCBiZSB0d28uCiAgICAgICAgICAgICBFWFBFQ1RfRVEoMiwgY29udGV4dC0+bnVtVXNl ZFRleHR1cmVzKCkpOwogICAgICAgICAgICAgLy8gRmlyc3QgdGV4dHVyZSBzaG91bGQgaGF2ZSBi ZWVuIHVzZWQuCkBAIC0xODg4LDEyICsxODg4LDEyIEBAIHB1YmxpYzoKIAogICAgICAgICAvLyBO dW1iZXIgb2YgdGV4dHVyZXMgdXNlZCBmb3IgZHJhd2luZyBzaG91bGQgdHdvIGV4Y2VwdCBmb3Ig ZnJhbWUgNAogICAgICAgICAvLyB3aGVyZSB0aGUgdmlld3BvcnQgb25seSBjb250YWlucyBvbmUg bGF5ZXIuCi0gICAgICAgIGlmIChpbXBsLT5mcmFtZU51bWJlcigpID09IDQpCisgICAgICAgIGlm IChpbXBsLT5zb3VyY2VGcmFtZU51bWJlcigpID09IDMpCiAgICAgICAgICAgICBFWFBFQ1RfRVEo MSwgY29udGV4dC0+bnVtVXNlZFRleHR1cmVzKCkpOwogICAgICAgICBlbHNlCiAgICAgICAgICAg ICBFWFBFQ1RfRVEoMiwgY29udGV4dC0+bnVtVXNlZFRleHR1cmVzKCkpOwogCi0gICAgICAgIGlm IChpbXBsLT5mcmFtZU51bWJlcigpIDwgNSkgeworICAgICAgICBpZiAoaW1wbC0+c291cmNlRnJh bWVOdW1iZXIoKSA8IDQpIHsKICAgICAgICAgICAgIGNvbnRleHQtPnJlc2V0VXNlZFRleHR1cmVz KCk7CiAgICAgICAgICAgICBwb3N0U2V0TmVlZHNBbmltYXRlQW5kQ29tbWl0VG9NYWluVGhyZWFk KCk7CiAgICAgICAgICAgICBwb3N0U2V0TmVlZHNSZWRyYXdUb01haW5UaHJlYWQoKTsKQEAgLTI0 ODIsNyArMjQ4Miw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgYmVnaW5Db21taXRPbkND VGhyZWFkKENDTGF5ZXJUcmVlSG9zdEltcGwqIGltcGwpCiAgICAgewogICAgICAgICBFWFBFQ1Rf RVEobV9yb290U2Nyb2xsTGF5ZXItPnNjcm9sbFBvc2l0aW9uKCksIEludFBvaW50KCkpOwotICAg ICAgICBpZiAoIW1fbGF5ZXJUcmVlSG9zdC0+ZnJhbWVOdW1iZXIoKSkKKyAgICAgICAgaWYgKCFp bXBsLT5mcmFtZU51bWJlcigpKQogICAgICAgICAgICAgRVhQRUNUX0VRKG1fY2hpbGRMYXllci0+ c2Nyb2xsUG9zaXRpb24oKSwgSW50UG9pbnQoKSk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAg IEVYUEVDVF9FUShtX2NoaWxkTGF5ZXItPnNjcm9sbFBvc2l0aW9uKCksIEludFBvaW50KCkgKyBt X3Njcm9sbEFtb3VudCk7Cg== 140604 2012-05-07 15:24:48 -0700 2012-05-07 15:59:32 -0700 Patch for landing bug-85390-20120507182446.patch text/plain 5957 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2MzEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDc3MzE2NWYzNDI4YTk4MzgxMGFjOWU3OWZiMDI0ZjMxMjViY2ZlY2EuLjVmMDRmYzEyZGFjZmE5 MWM2NTViNmYzM2FkNzA5YWFmNmEzNDU1NmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTItMDUtMDIgIERhbmEgSmFuc2VucyAgPGRhbmFrakBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBFbnN1cmUgc3luY2hyb25pemF0aW9uIGluIHRo cmVhZGVkIHVuaXQgdGVzdHMgYnkgY2hlY2tpbmcgdGhlIHNvdXJjZUZyYW1lTnVtYmVyKCkgdG8g Y291bnQgY29tbWl0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODUzOTAKKworICAgICAgICBSZXZpZXdlZCBieSBBZHJpZW5uZSBXYWxrZXIuCisKKyAg ICAgICAgKiB0ZXN0cy9DQ0xheWVyVHJlZUhvc3RUZXN0LmNwcDoKKyAgICAgICAgKFdURjo6Q0NM YXllclRyZWVIb3N0VGVzdFNjcm9sbE11bHRpcGxlUmVkcmF3OjpiZWdpbkNvbW1pdE9uQ0NUaHJl YWQpOgorICAgICAgICAoV1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0QXRvbWljQ29tbWl0Ojpjb21t aXRDb21wbGV0ZU9uQ0NUaHJlYWQpOgorICAgICAgICAoV1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0 QXRvbWljQ29tbWl0V2l0aFBhcnRpYWxVcGRhdGU6OmNvbW1pdENvbXBsZXRlT25DQ1RocmVhZCk6 CisgICAgICAgIChXVEY6OkNDTGF5ZXJUcmVlSG9zdFRlc3RTY3JvbGxDaGlsZExheWVyOjpiZWdp bkNvbW1pdE9uQ0NUaHJlYWQpOgorCiAyMDEyLTA1LTA3ICBLaW51a28gWWFzdWRhICA8a2ludWtv QGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkOiB0aGUgc2FtZSBmaXggaW4gYW5v dGhlciBmaWxlIGZvciBjaHJvbWl1bSB3aW4gYnVpbGQuICBBZGRpbmcgV2ViQ29yZSBuYW1lc3Bh Y2UgdG8gRmlsZVN5c3RlbVR5cGVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RUZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v dGVzdHMvQ0NMYXllclRyZWVIb3N0VGVzdC5jcHAKaW5kZXggZjIzODJiMzU5MDdhZDNkNGVlM2Nh M2UyYmMzYjIyYmI2ZTdlNTczYy4uMDNhOThhNjM4OWE4NTRmMjFkNzUxMjUxMjRkMjQ3NDYzM2Rm YzBkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJl ZUhvc3RUZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJU cmVlSG9zdFRlc3QuY3BwCkBAIC0xMzQwLDExICsxMzQwLDExIEBAIHB1YmxpYzoKICAgICB2aXJ0 dWFsIHZvaWQgYmVnaW5Db21taXRPbkNDVGhyZWFkKENDTGF5ZXJUcmVlSG9zdEltcGwqIGltcGwp CiAgICAgewogICAgICAgICBMYXllckNocm9taXVtKiByb290ID0gbV9sYXllclRyZWVIb3N0LT5y b290TGF5ZXIoKTsKLSAgICAgICAgaWYgKCFtX2xheWVyVHJlZUhvc3QtPmZyYW1lTnVtYmVyKCkp CisgICAgICAgIGlmICghaW1wbC0+c291cmNlRnJhbWVOdW1iZXIoKSkKICAgICAgICAgICAgIEVY UEVDVF9FUShyb290LT5zY3JvbGxQb3NpdGlvbigpLCBtX2luaXRpYWxTY3JvbGwpOwotICAgICAg ICBlbHNlIGlmIChtX2xheWVyVHJlZUhvc3QtPmZyYW1lTnVtYmVyKCkgPT0gMSkKKyAgICAgICAg ZWxzZSBpZiAoaW1wbC0+c291cmNlRnJhbWVOdW1iZXIoKSA9PSAxKQogICAgICAgICAgICAgRVhQ RUNUX0VRKHJvb3QtPnNjcm9sbFBvc2l0aW9uKCksIG1faW5pdGlhbFNjcm9sbCArIG1fc2Nyb2xs QW1vdW50ICsgbV9zY3JvbGxBbW91bnQpOwotICAgICAgICBlbHNlIGlmIChtX2xheWVyVHJlZUhv c3QtPmZyYW1lTnVtYmVyKCkgPT0gMikKKyAgICAgICAgZWxzZSBpZiAoaW1wbC0+c291cmNlRnJh bWVOdW1iZXIoKSA9PSAyKQogICAgICAgICAgICAgRVhQRUNUX0VRKHJvb3QtPnNjcm9sbFBvc2l0 aW9uKCksIG1faW5pdGlhbFNjcm9sbCArIG1fc2Nyb2xsQW1vdW50ICsgbV9zY3JvbGxBbW91bnQp OwogICAgIH0KIApAQCAtMTcxMSwxMCArMTcxMSwxMCBAQCBwdWJsaWM6CiAgICAgewogICAgICAg ICBDb21wb3NpdG9yRmFrZVdlYkdyYXBoaWNzQ29udGV4dDNEV2l0aFRleHR1cmVUcmFja2luZyog Y29udGV4dCA9IHN0YXRpY19jYXN0PENvbXBvc2l0b3JGYWtlV2ViR3JhcGhpY3NDb250ZXh0M0RX aXRoVGV4dHVyZVRyYWNraW5nKj4oR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlOjpleHRyYWN0V2Vi R3JhcGhpY3NDb250ZXh0M0QoaW1wbC0+Y29udGV4dCgpKSk7CiAKLSAgICAgICAgc3dpdGNoIChp bXBsLT5mcmFtZU51bWJlcigpKSB7CisgICAgICAgIHN3aXRjaCAoaW1wbC0+c291cmNlRnJhbWVO dW1iZXIoKSkgewogICAgICAgICBjYXNlIDA6CiAgICAgICAgICAgICAvLyBOdW1iZXIgb2YgdGV4 dHVyZXMgc2hvdWxkIGJlIG9uZS4KLSAgICAgICAgICAgIEVYUEVDVF9FUSgxLCBjb250ZXh0LT5u dW1UZXh0dXJlcygpKTsKKyAgICAgICAgICAgIEFTU0VSVF9FUSgxLCBjb250ZXh0LT5udW1UZXh0 dXJlcygpKTsKICAgICAgICAgICAgIC8vIE51bWJlciBvZiB0ZXh0dXJlcyB1c2VkIGZvciBjb21t aXQgc2hvdWxkIGJlIG9uZS4KICAgICAgICAgICAgIEVYUEVDVF9FUSgxLCBjb250ZXh0LT5udW1V c2VkVGV4dHVyZXMoKSk7CiAgICAgICAgICAgICAvLyBWZXJpZnkgdGhhdCB1c2VkIHRleHR1cmUg aXMgY29ycmVjdC4KQEAgLTE3MjUsNyArMTcyNSw3IEBAIHB1YmxpYzoKICAgICAgICAgY2FzZSAx OgogICAgICAgICAgICAgLy8gTnVtYmVyIG9mIHRleHR1cmVzIHNob3VsZCBiZSB0d28gYXMgdGhl IGZpcnN0IHRleHR1cmUKICAgICAgICAgICAgIC8vIGlzIHVzZWQgYnkgaW1wbCB0aHJlYWQgYW5k IGNhbm5vdCBieSB1c2VkIGZvciB1cGRhdGUuCi0gICAgICAgICAgICBFWFBFQ1RfRVEoMiwgY29u dGV4dC0+bnVtVGV4dHVyZXMoKSk7CisgICAgICAgICAgICBBU1NFUlRfRVEoMiwgY29udGV4dC0+ bnVtVGV4dHVyZXMoKSk7CiAgICAgICAgICAgICAvLyBOdW1iZXIgb2YgdGV4dHVyZXMgdXNlZCBm b3IgY29tbWl0IHNob3VsZCBzdGlsbCBiZSBvbmUuCiAgICAgICAgICAgICBFWFBFQ1RfRVEoMSwg Y29udGV4dC0+bnVtVXNlZFRleHR1cmVzKCkpOwogICAgICAgICAgICAgLy8gRmlyc3QgdGV4dHVy ZSBzaG91bGQgbm90IGhhdmUgYmVlbiB1c2VkLgpAQCAtMTc0OCw3ICsxNzQ4LDcgQEAgcHVibGlj OgogICAgICAgICAvLyBOdW1iZXIgb2YgdGV4dHVyZXMgdXNlZCBmb3IgZHJhdyBzaG91bGQgYWx3 YXlzIGJlIG9uZS4KICAgICAgICAgRVhQRUNUX0VRKDEsIGNvbnRleHQtPm51bVVzZWRUZXh0dXJl cygpKTsKIAotICAgICAgICBpZiAoaW1wbC0+ZnJhbWVOdW1iZXIoKSA8IDIpIHsKKyAgICAgICAg aWYgKGltcGwtPnNvdXJjZUZyYW1lTnVtYmVyKCkgPCAxKSB7CiAgICAgICAgICAgICBjb250ZXh0 LT5yZXNldFVzZWRUZXh0dXJlcygpOwogICAgICAgICAgICAgcG9zdFNldE5lZWRzQW5pbWF0ZUFu ZENvbW1pdFRvTWFpblRocmVhZCgpOwogICAgICAgICAgICAgcG9zdFNldE5lZWRzUmVkcmF3VG9N YWluVGhyZWFkKCk7CkBAIC0xODE1LDEwICsxODE1LDEwIEBAIHB1YmxpYzoKICAgICB7CiAgICAg ICAgIENvbXBvc2l0b3JGYWtlV2ViR3JhcGhpY3NDb250ZXh0M0RXaXRoVGV4dHVyZVRyYWNraW5n KiBjb250ZXh0ID0gc3RhdGljX2Nhc3Q8Q29tcG9zaXRvckZha2VXZWJHcmFwaGljc0NvbnRleHQz RFdpdGhUZXh0dXJlVHJhY2tpbmcqPihHcmFwaGljc0NvbnRleHQzRFByaXZhdGU6OmV4dHJhY3RX ZWJHcmFwaGljc0NvbnRleHQzRChpbXBsLT5jb250ZXh0KCkpKTsKIAotICAgICAgICBzd2l0Y2gg KGltcGwtPmZyYW1lTnVtYmVyKCkpIHsKKyAgICAgICAgc3dpdGNoIChpbXBsLT5zb3VyY2VGcmFt ZU51bWJlcigpKSB7CiAgICAgICAgIGNhc2UgMDoKICAgICAgICAgICAgIC8vIE51bWJlciBvZiB0 ZXh0dXJlcyBzaG91bGQgYmUgdHdvLgotICAgICAgICAgICAgRVhQRUNUX0VRKDIsIGNvbnRleHQt Pm51bVRleHR1cmVzKCkpOworICAgICAgICAgICAgQVNTRVJUX0VRKDIsIGNvbnRleHQtPm51bVRl eHR1cmVzKCkpOwogICAgICAgICAgICAgLy8gTnVtYmVyIG9mIHRleHR1cmVzIHVzZWQgZm9yIGNv bW1pdCBzaG91bGQgYmUgdHdvLgogICAgICAgICAgICAgRVhQRUNUX0VRKDIsIGNvbnRleHQtPm51 bVVzZWRUZXh0dXJlcygpKTsKICAgICAgICAgICAgIC8vIFZlcmlmeSB0aGF0IHVzZWQgdGV4dHVy ZXMgYXJlIGNvcnJlY3QuCkBAIC0xODMwLDcgKzE4MzAsNyBAQCBwdWJsaWM6CiAgICAgICAgIGNh c2UgMToKICAgICAgICAgICAgIC8vIE51bWJlciBvZiB0ZXh0dXJlcyBzaG91bGQgYmUgZm91ciBh cyB0aGUgZmlyc3QgdHdvCiAgICAgICAgICAgICAvLyB0ZXh0dXJlcyBhcmUgdXNlZCBieSB0aGUg aW1wbCB0aHJlYWQuCi0gICAgICAgICAgICBFWFBFQ1RfRVEoNCwgY29udGV4dC0+bnVtVGV4dHVy ZXMoKSk7CisgICAgICAgICAgICBBU1NFUlRfRVEoNCwgY29udGV4dC0+bnVtVGV4dHVyZXMoKSk7 CiAgICAgICAgICAgICAvLyBOdW1iZXIgb2YgdGV4dHVyZXMgdXNlZCBmb3IgY29tbWl0IHNob3Vs ZCBzdGlsbCBiZSB0d28uCiAgICAgICAgICAgICBFWFBFQ1RfRVEoMiwgY29udGV4dC0+bnVtVXNl ZFRleHR1cmVzKCkpOwogICAgICAgICAgICAgLy8gRmlyc3QgdHdvIHRleHR1cmVzIHNob3VsZCBu b3QgaGF2ZSBiZWVuIHVzZWQuCkBAIC0xODQ2LDcgKzE4NDYsNyBAQCBwdWJsaWM6CiAgICAgICAg ICAgICAvLyBOdW1iZXIgb2YgdGV4dHVyZXMgc2hvdWxkIGJlIHRocmVlIGFzIHdlIGFsbG93IG9u ZQogICAgICAgICAgICAgLy8gcGFydGlhbCB1cGRhdGUgYW5kIHRoZSBmaXJzdCB0d28gdGV4dHVy ZXMgYXJlIHVzZWQgYnkKICAgICAgICAgICAgIC8vIHRoZSBpbXBsIHRocmVhZC4KLSAgICAgICAg ICAgIEVYUEVDVF9FUSgzLCBjb250ZXh0LT5udW1UZXh0dXJlcygpKTsKKyAgICAgICAgICAgIEFT U0VSVF9FUSgzLCBjb250ZXh0LT5udW1UZXh0dXJlcygpKTsKICAgICAgICAgICAgIC8vIE51bWJl ciBvZiB0ZXh0dXJlcyB1c2VkIGZvciBjb21taXQgc2hvdWxkIHN0aWxsIGJlIHR3by4KICAgICAg ICAgICAgIEVYUEVDVF9FUSgyLCBjb250ZXh0LT5udW1Vc2VkVGV4dHVyZXMoKSk7CiAgICAgICAg ICAgICAvLyBGaXJzdCB0ZXh0dXJlIHNob3VsZCBoYXZlIGJlZW4gdXNlZC4KQEAgLTE4ODYsMTIg KzE4ODYsMTIgQEAgcHVibGljOgogCiAgICAgICAgIC8vIE51bWJlciBvZiB0ZXh0dXJlcyB1c2Vk IGZvciBkcmF3aW5nIHNob3VsZCB0d28gZXhjZXB0IGZvciBmcmFtZSA0CiAgICAgICAgIC8vIHdo ZXJlIHRoZSB2aWV3cG9ydCBvbmx5IGNvbnRhaW5zIG9uZSBsYXllci4KLSAgICAgICAgaWYgKGlt cGwtPmZyYW1lTnVtYmVyKCkgPT0gNCkKKyAgICAgICAgaWYgKGltcGwtPnNvdXJjZUZyYW1lTnVt YmVyKCkgPT0gMykKICAgICAgICAgICAgIEVYUEVDVF9FUSgxLCBjb250ZXh0LT5udW1Vc2VkVGV4 dHVyZXMoKSk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIEVYUEVDVF9FUSgyLCBjb250ZXh0 LT5udW1Vc2VkVGV4dHVyZXMoKSk7CiAKLSAgICAgICAgaWYgKGltcGwtPmZyYW1lTnVtYmVyKCkg PCA1KSB7CisgICAgICAgIGlmIChpbXBsLT5zb3VyY2VGcmFtZU51bWJlcigpIDwgNCkgewogICAg ICAgICAgICAgY29udGV4dC0+cmVzZXRVc2VkVGV4dHVyZXMoKTsKICAgICAgICAgICAgIHBvc3RT ZXROZWVkc0FuaW1hdGVBbmRDb21taXRUb01haW5UaHJlYWQoKTsKICAgICAgICAgICAgIHBvc3RT ZXROZWVkc1JlZHJhd1RvTWFpblRocmVhZCgpOwo=