93500 2012-08-08 11:30:21 -0700 [chromium] Enable occlusion tracker in the occlusion tests for surface cacheing 2012-08-08 13:14:08 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 danakj danakj cc-bugs enne jamesr piman webkit.review.bot wjmaclean zlieber oldest_to_newest 690547 0 danakj 2012-08-08 11:30:21 -0700 [chromium] Partially externally occluded render passes should not cache their textures 690553 1 157261 danakj 2012-08-08 11:34:06 -0700 Created attachment 157261 Patch 690576 2 157261 danakj 2012-08-08 11:53:32 -0700 Comment on attachment 157261 Patch This needs more thought. 690583 3 157267 danakj 2012-08-08 12:05:08 -0700 Created attachment 157267 Patch 690626 4 157267 enne 2012-08-08 12:48:47 -0700 Comment on attachment 157267 Patch R=me. 690650 5 157267 webkit.review.bot 2012-08-08 13:14:03 -0700 Comment on attachment 157267 Patch Clearing flags on attachment: 157267 Committed r125078: <http://trac.webkit.org/changeset/125078> 690651 6 webkit.review.bot 2012-08-08 13:14:08 -0700 All reviewed patches have been landed. Closing bug. 157261 2012-08-08 11:34:06 -0700 2012-08-08 12:05:05 -0700 Patch bug-93500-20120808143340.patch text/plain 9452 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0ODk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTMwYjI2NTBjYzM4Mjk2 ZTFkZTg3ZWM4OGM3OWQ1Y2VjNmFhZTdhMS4uNzdlYjgxYTk5ZmFhZDUxOGY2OGE1N2YwYzhiZjBh M2I3ODU3OTdhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA4LTA4ICBEYW5h IEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gUGFy dGlhbGx5IGV4dGVybmFsbHkgb2NjbHVkZWQgcmVuZGVyIHBhc3NlcyBzaG91bGQgbm90IGNhY2hl IHRoZWlyIHRleHR1cmVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD05MzUwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEEgcmVuZGVyIHBhc3MgdGhhdCBpcyBub3Qgb2NjbHVkZWQsIGJ1dCBoYXMgc29tZSBl eHRlcm5hbCBvY2NsdXNpb24sCisgICAgICAgIHNob3VsZCBub3QgY2FjaGUgaXRzIHRleHR1cmUg YW5kIHJldXNlIGl0LiBDdXJyZW50bHkgdGhlIGNvZGUgZG9lcyBub3QKKyAgICAgICAgY2hlY2sg Zm9yIGV4dGVybmFsIG9jY2x1c2lvbiB3aGVuIGEgbGF5ZXIgaXMgbm90IGZ1bGx5IG9jY2x1ZGVk LgorCisgICAgICAgIFRlc3RzOiBDQ0xheWVyVHJlZUhvc3RJbXBsVGVzdC50ZXh0dXJlQ2FjaGlu Z1dpdGhPY2NsdXNpb24KKyAgICAgICAgICAgICAgIENDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LnRl eHR1cmVDYWNoaW5nV2l0aE9jY2x1c2lvbkVhcmx5T3V0CisgICAgICAgICAgICAgICBDQ0xheWVy VHJlZUhvc3RJbXBsVGVzdC50ZXh0dXJlQ2FjaGluZ1dpdGhPY2NsdXNpb25QYXJ0aWFsU3dhcAor CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0 SW1wbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVyVHJlZUhvc3RJbXBsOjpjYWxjdWxh dGVSZW5kZXJQYXNzZXMpOgorCiAyMDEyLTA4LTA3ICBGbG9yaW4gTWFsaXRhICA8Zm1hbGl0YUBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtXSBVbnJldmlld2VkIGJ1aWxkIGZpeCBh ZnRlciByMTI0ODc5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCA3OGRhYTU5MDMzYmQy N2Y5ZmMxODMzZWU5NDQ2MjE2MTNmNGZiZjFlLi5kZWQxN2Y5ZWQwOWIxZWExMzQwNTJkZmJhZGI2 YjU0ZTc2YjUwMWZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBA CisyMDEyLTA4LTA4ICBEYW5hIEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgorCisgICAg ICAgIFtjaHJvbWl1bV0gUGFydGlhbGx5IGV4dGVybmFsbHkgb2NjbHVkZWQgcmVuZGVyIHBhc3Nl cyBzaG91bGQgbm90IGNhY2hlIHRoZWlyIHRleHR1cmVzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MzUwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3Qu Y3BwOgorCiAyMDEyLTA4LTA3ICBBbGV4ZWkgRmlsaXBwb3YgIDxhbGV4ZWlmQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBtYWtlIHRoZSBNZW1vcnlDbGFzc0luZm8gY2xh c3MgYSBub3QtdGVtcGxhdGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdEltcGwuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5jcHAK aW5kZXggNWFjMTkzMTg2MjdjMjllM2JkNzZmYmE2OWY1YjUxZjI2MzAzN2Y4NC4uYTYyMmI1ZDdj ZThhNWU2MzkwNmY0NTVlMTBiMDJiOTQwNDE4NjA0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXll clRyZWVIb3N0SW1wbC5jcHAKQEAgLTMyMiwxMCArMzIyLDEwIEBAIGJvb2wgQ0NMYXllclRyZWVI b3N0SW1wbDo6Y2FsY3VsYXRlUmVuZGVyUGFzc2VzKEZyYW1lRGF0YSYgZnJhbWUpCiAgICAgICAg ICAgICBwYXNzLT5hcHBlbmRRdWFkc0ZvclJlbmRlclN1cmZhY2VMYXllcigqaXQsIGNvbnRyaWJ1 dGluZ1JlbmRlclBhc3MsICZvY2NsdXNpb25UcmFja2VyKTsKICAgICAgICAgfSBlbHNlIGlmIChp dC5yZXByZXNlbnRzSXRzZWxmKCkgJiYgIWl0LT52aXNpYmxlQ29udGVudFJlY3QoKS5pc0VtcHR5 KCkgJiYgIWl0LT5zY2lzc29yUmVjdCgpLmlzRW1wdHkoKSkgewogICAgICAgICAgICAgYm9vbCBo YXNPY2NsdXNpb25Gcm9tT3V0c2lkZVRhcmdldFN1cmZhY2U7Ci0gICAgICAgICAgICBpZiAob2Nj bHVzaW9uVHJhY2tlci5vY2NsdWRlZCgqaXQsIGl0LT52aXNpYmxlQ29udGVudFJlY3QoKSwgJmhh c09jY2x1c2lvbkZyb21PdXRzaWRlVGFyZ2V0U3VyZmFjZSkpIHsKLSAgICAgICAgICAgICAgICBp ZiAoaGFzT2NjbHVzaW9uRnJvbU91dHNpZGVUYXJnZXRTdXJmYWNlKQotICAgICAgICAgICAgICAg ICAgICBwYXNzLT5zZXRIYXNPY2NsdXNpb25Gcm9tT3V0c2lkZVRhcmdldFN1cmZhY2UoaGFzT2Nj bHVzaW9uRnJvbU91dHNpZGVUYXJnZXRTdXJmYWNlKTsKLSAgICAgICAgICAgIH0gZWxzZSB7Cisg ICAgICAgICAgICBib29sIG9jY2x1ZGVkID0gb2NjbHVzaW9uVHJhY2tlci5vY2NsdWRlZCgqaXQs IGl0LT52aXNpYmxlQ29udGVudFJlY3QoKSwgJmhhc09jY2x1c2lvbkZyb21PdXRzaWRlVGFyZ2V0 U3VyZmFjZSk7CisgICAgICAgICAgICBpZiAoaGFzT2NjbHVzaW9uRnJvbU91dHNpZGVUYXJnZXRT dXJmYWNlKQorICAgICAgICAgICAgICAgIHBhc3MtPnNldEhhc09jY2x1c2lvbkZyb21PdXRzaWRl VGFyZ2V0U3VyZmFjZShoYXNPY2NsdXNpb25Gcm9tT3V0c2lkZVRhcmdldFN1cmZhY2UpOworICAg ICAgICAgICAgaWYgKCFvY2NsdWRlZCkgewogICAgICAgICAgICAgICAgIGl0LT53aWxsRHJhdyht X3Jlc291cmNlUHJvdmlkZXIuZ2V0KCkpOwogICAgICAgICAgICAgICAgIGZyYW1lLndpbGxEcmF3 TGF5ZXJzLmFwcGVuZCgqaXQpOwogICAgICAgICAgICAgICAgIHBhc3MtPmFwcGVuZFF1YWRzRm9y TGF5ZXIoKml0LCAmb2NjbHVzaW9uVHJhY2tlciwgaGFkTWlzc2luZ1RpbGVzKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3Qu Y3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RJbXBsVGVz dC5jcHAKaW5kZXggN2MyZDBkNmVmYmU4MzRiM2IxMDMzYzA2NDM3ZTBjNzdiMThiZWMzOC4uODIx NGI2OWVhOWE4NWE0MjYzMjljMWRjODA5MmE0MzY5M2RhMzU1ZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RJbXBsVGVzdC5jcHAKKysrIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RJbXBsVGVzdC5jcHAK QEAgLTI2MzksNiArMjYzOSw3IEBAIFRFU1RfRihDQ0xheWVyVHJlZUhvc3RJbXBsVGVzdCwgdGV4 dHVyZUNhY2hpbmdXaXRoQ2xpcHBpbmcpCiAgICAgQ0NTZXR0aW5nczo6c2V0UGFydGlhbFN3YXBF bmFibGVkKHRydWUpOwogCiAgICAgQ0NMYXllclRyZWVTZXR0aW5ncyBzZXR0aW5nczsKKyAgICBz ZXR0aW5ncy5taW5pbXVtT2NjbHVzaW9uVHJhY2tpbmdTaXplID0gSW50U2l6ZSgpOwogICAgIE93 blB0cjxDQ0xheWVyVHJlZUhvc3RJbXBsPiBteUhvc3RJbXBsID0gQ0NMYXllclRyZWVIb3N0SW1w bDo6Y3JlYXRlKHNldHRpbmdzLCB0aGlzKTsKIAogICAgIENDTGF5ZXJJbXBsKiByb290UHRyOwpA QCAtMjY5Niw2ICsyNjk3LDkgQEAgVEVTVF9GKENDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LCB0ZXh0 dXJlQ2FjaGluZ1dpdGhDbGlwcGluZykKICAgICAgICAgcXVhZFZpc2libGVSZWN0ID0gZnJhbWUu cmVuZGVyUGFzc2VzWzBdLT5xdWFkTGlzdCgpWzFdLT5xdWFkVmlzaWJsZVJlY3QoKTsKICAgICAg ICAgRVhQRUNUX0lOVF9SRUNUX0VRKEludFJlY3QoMCwgMCwgMTAwLCAzKSwgcXVhZFZpc2libGVS ZWN0KTsKIAorICAgICAgICAvLyBWZXJpZnkgdGhhdCB0aGUgcmVuZGVyIHN1cmZhY2UgdGV4dHVy ZSBpcyAqbm90KiBjbGlwcGVkLgorICAgICAgICBFWFBFQ1RfSU5UX1JFQ1RfRVEoSW50UmVjdCgw LCAwLCAxMDAsIDEwMCksIGZyYW1lLnJlbmRlclBhc3Nlc1swXS0+ZnJhbWVidWZmZXJPdXRwdXRS ZWN0KCkpOworCiAgICAgICAgIEVYUEVDVF9FUShDQ0RyYXdRdWFkOjpSZW5kZXJQYXNzLCBmcmFt ZS5yZW5kZXJQYXNzZXNbMV0tPnF1YWRMaXN0KClbMF0tPm1hdGVyaWFsKCkpOwogICAgICAgICBD Q1JlbmRlclBhc3NEcmF3UXVhZCogcXVhZCA9IHN0YXRpY19jYXN0PENDUmVuZGVyUGFzc0RyYXdR dWFkKj4oZnJhbWUucmVuZGVyUGFzc2VzWzFdLT5xdWFkTGlzdCgpWzBdLmdldCgpKTsKICAgICAg ICAgRVhQRUNUX0ZBTFNFKHF1YWQtPmNvbnRlbnRzQ2hhbmdlZFNpbmNlTGFzdEZyYW1lKCkuaXNF bXB0eSgpKTsKQEAgLTI3MzEsNiArMjczNSw3IEBAIFRFU1RfRihDQ0xheWVyVHJlZUhvc3RJbXBs VGVzdCwgdGV4dHVyZUNhY2hpbmdXaXRoT2NjbHVzaW9uKQogICAgIENDU2V0dGluZ3M6OnNldFBh cnRpYWxTd2FwRW5hYmxlZChmYWxzZSk7CiAKICAgICBDQ0xheWVyVHJlZVNldHRpbmdzIHNldHRp bmdzOworICAgIHNldHRpbmdzLm1pbmltdW1PY2NsdXNpb25UcmFja2luZ1NpemUgPSBJbnRTaXpl KCk7CiAgICAgT3duUHRyPENDTGF5ZXJUcmVlSG9zdEltcGw+IG15SG9zdEltcGwgPSBDQ0xheWVy VHJlZUhvc3RJbXBsOjpjcmVhdGUoc2V0dGluZ3MsIHRoaXMpOwogCiAgICAgLy8gTGF5ZXJzIGFy ZSBzdHJ1Y3R1cmUgYXMgZm9sbG93czoKQEAgLTI3ODYsMTEgKzI3OTEsMTEgQEAgVEVTVF9GKEND TGF5ZXJUcmVlSG9zdEltcGxUZXN0LCB0ZXh0dXJlQ2FjaGluZ1dpdGhPY2NsdXNpb24pCiAgICAg ICAgIEVYUEVDVF9UUlVFKG15SG9zdEltcGwtPnByZXBhcmVUb0RyYXcoZnJhbWUpKTsKIAogICAg ICAgICAvLyBNdXN0IHJlY2VpdmUgMyByZW5kZXIgcGFzc2VzLgotICAgICAgICAvLyBGb3IgUm9v dCwgdGhlcmUgYXJlIDIgcXVhZHM7IGZvciBTMSwgdGhlcmUgYXJlIDMgcXVhZHM7IGZvciBTMiwg dGhlcmUgaXMgMSBxdWFkLgorICAgICAgICAvLyBGb3IgUm9vdCwgdGhlcmUgYXJlIDIgcXVhZHM7 IGZvciBTMSwgdGhlcmUgYXJlIDIgcXVhZHMgKDEgaXMgb2NjbHVkZWQpOyBmb3IgUzIsIHRoZXJl IGlzIDIgcXVhZHMuCiAgICAgICAgIEFTU0VSVF9FUSgzVSwgZnJhbWUucmVuZGVyUGFzc2VzLnNp emUoKSk7CiAKICAgICAgICAgRVhQRUNUX0VRKDJVLCBmcmFtZS5yZW5kZXJQYXNzZXNbMF0tPnF1 YWRMaXN0KCkuc2l6ZSgpKTsKLSAgICAgICAgRVhQRUNUX0VRKDNVLCBmcmFtZS5yZW5kZXJQYXNz ZXNbMV0tPnF1YWRMaXN0KCkuc2l6ZSgpKTsKKyAgICAgICAgRVhQRUNUX0VRKDJVLCBmcmFtZS5y ZW5kZXJQYXNzZXNbMV0tPnF1YWRMaXN0KCkuc2l6ZSgpKTsKICAgICAgICAgRVhQRUNUX0VRKDJV LCBmcmFtZS5yZW5kZXJQYXNzZXNbMl0tPnF1YWRMaXN0KCkuc2l6ZSgpKTsKIAogICAgICAgICBt eUhvc3RJbXBsLT5kcmF3TGF5ZXJzKGZyYW1lKTsKQEAgLTI4NDYsNiArMjg1MSw3IEBAIFRFU1Rf RihDQ0xheWVyVHJlZUhvc3RJbXBsVGVzdCwgdGV4dHVyZUNhY2hpbmdXaXRoT2NjbHVzaW9uRWFy bHlPdXQpCiAgICAgQ0NTZXR0aW5nczo6c2V0UGFydGlhbFN3YXBFbmFibGVkKGZhbHNlKTsKIAog ICAgIENDTGF5ZXJUcmVlU2V0dGluZ3Mgc2V0dGluZ3M7CisgICAgc2V0dGluZ3MubWluaW11bU9j Y2x1c2lvblRyYWNraW5nU2l6ZSA9IEludFNpemUoKTsKICAgICBPd25QdHI8Q0NMYXllclRyZWVI b3N0SW1wbD4gbXlIb3N0SW1wbCA9IENDTGF5ZXJUcmVlSG9zdEltcGw6OmNyZWF0ZShzZXR0aW5n cywgdGhpcyk7CiAKICAgICAvLyBMYXllcnMgYXJlIHN0cnVjdHVyZSBhcyBmb2xsb3dzOgpAQCAt MzEyMyw2ICszMTI5LDcgQEAgVEVTVF9GKENDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LCB0ZXh0dXJl Q2FjaGluZ1dpdGhPY2NsdXNpb25QYXJ0aWFsU3dhcCkKICAgICBDQ1NldHRpbmdzOjpzZXRQYXJ0 aWFsU3dhcEVuYWJsZWQodHJ1ZSk7CiAKICAgICBDQ0xheWVyVHJlZVNldHRpbmdzIHNldHRpbmdz OworICAgIHNldHRpbmdzLm1pbmltdW1PY2NsdXNpb25UcmFja2luZ1NpemUgPSBJbnRTaXplKCk7 CiAgICAgT3duUHRyPENDTGF5ZXJUcmVlSG9zdEltcGw+IG15SG9zdEltcGwgPSBDQ0xheWVyVHJl ZUhvc3RJbXBsOjpjcmVhdGUoc2V0dGluZ3MsIHRoaXMpOwogCiAgICAgLy8gTGF5ZXJzIGFyZSBz dHJ1Y3R1cmUgYXMgZm9sbG93czoKQEAgLTMxNzgsMTEgKzMxODUsMTEgQEAgVEVTVF9GKENDTGF5 ZXJUcmVlSG9zdEltcGxUZXN0LCB0ZXh0dXJlQ2FjaGluZ1dpdGhPY2NsdXNpb25QYXJ0aWFsU3dh cCkKICAgICAgICAgRVhQRUNUX1RSVUUobXlIb3N0SW1wbC0+cHJlcGFyZVRvRHJhdyhmcmFtZSkp OwogCiAgICAgICAgIC8vIE11c3QgcmVjZWl2ZSAzIHJlbmRlciBwYXNzZXMuCi0gICAgICAgIC8v IEZvciBSb290LCB0aGVyZSBhcmUgMiBxdWFkczsgZm9yIFMxLCB0aGVyZSBhcmUgMyBxdWFkczsg Zm9yIFMyLCB0aGVyZSBpcyAxIHF1YWQuCisgICAgICAgIC8vIEZvciBSb290LCB0aGVyZSBhcmUg MiBxdWFkczsgZm9yIFMxLCB0aGVyZSBhcmUgMiBxdWFkcyAob25lIGlzIG9jY2x1ZGVkKTsgZm9y IFMyLCB0aGVyZSBpcyAyIHF1YWRzLgogICAgICAgICBBU1NFUlRfRVEoM1UsIGZyYW1lLnJlbmRl clBhc3Nlcy5zaXplKCkpOwogCiAgICAgICAgIEVYUEVDVF9FUSgyVSwgZnJhbWUucmVuZGVyUGFz c2VzWzBdLT5xdWFkTGlzdCgpLnNpemUoKSk7Ci0gICAgICAgIEVYUEVDVF9FUSgzVSwgZnJhbWUu cmVuZGVyUGFzc2VzWzFdLT5xdWFkTGlzdCgpLnNpemUoKSk7CisgICAgICAgIEVYUEVDVF9FUSgy VSwgZnJhbWUucmVuZGVyUGFzc2VzWzFdLT5xdWFkTGlzdCgpLnNpemUoKSk7CiAgICAgICAgIEVY UEVDVF9FUSgyVSwgZnJhbWUucmVuZGVyUGFzc2VzWzJdLT5xdWFkTGlzdCgpLnNpemUoKSk7CiAK ICAgICAgICAgbXlIb3N0SW1wbC0+ZHJhd0xheWVycyhmcmFtZSk7CkBAIC0zMjM3LDcgKzMyNDQs NiBAQCBURVNUX0YoQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QsIHRleHR1cmVDYWNoaW5nV2l0aE9j Y2x1c2lvblBhcnRpYWxTd2FwKQogICAgICAgICBteUhvc3RJbXBsLT5kcmF3TGF5ZXJzKGZyYW1l KTsKICAgICAgICAgbXlIb3N0SW1wbC0+ZGlkRHJhd0FsbExheWVycyhmcmFtZSk7CiAgICAgfQot CiB9CiAKIFRFU1RfRihDQ0xheWVyVHJlZUhvc3RJbXBsVGVzdCwgc3VyZmFjZVRleHR1cmVDYWNo aW5nKQpAQCAtMzI0NSw2ICszMjUxLDcgQEAgVEVTVF9GKENDTGF5ZXJUcmVlSG9zdEltcGxUZXN0 LCBzdXJmYWNlVGV4dHVyZUNhY2hpbmcpCiAgICAgQ0NTZXR0aW5nczo6c2V0UGFydGlhbFN3YXBF bmFibGVkKHRydWUpOwogCiAgICAgQ0NMYXllclRyZWVTZXR0aW5ncyBzZXR0aW5nczsKKyAgICBz ZXR0aW5ncy5taW5pbXVtT2NjbHVzaW9uVHJhY2tpbmdTaXplID0gSW50U2l6ZSgpOwogICAgIE93 blB0cjxDQ0xheWVyVHJlZUhvc3RJbXBsPiBteUhvc3RJbXBsID0gQ0NMYXllclRyZWVIb3N0SW1w bDo6Y3JlYXRlKHNldHRpbmdzLCB0aGlzKTsKIAogICAgIENDTGF5ZXJJbXBsKiByb290UHRyOwpA QCAtMzM5Nyw2ICszNDA0LDcgQEAgVEVTVF9GKENDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LCBzdXJm YWNlVGV4dHVyZUNhY2hpbmdOb1BhcnRpYWxTd2FwKQogICAgIENDU2V0dGluZ3M6OnNldFBhcnRp YWxTd2FwRW5hYmxlZChmYWxzZSk7CiAKICAgICBDQ0xheWVyVHJlZVNldHRpbmdzIHNldHRpbmdz OworICAgIHNldHRpbmdzLm1pbmltdW1PY2NsdXNpb25UcmFja2luZ1NpemUgPSBJbnRTaXplKCk7 CiAgICAgT3duUHRyPENDTGF5ZXJUcmVlSG9zdEltcGw+IG15SG9zdEltcGwgPSBDQ0xheWVyVHJl ZUhvc3RJbXBsOjpjcmVhdGUoc2V0dGluZ3MsIHRoaXMpOwogCiAgICAgQ0NMYXllckltcGwqIHJv b3RQdHI7CkBAIC0zNDIwLDYgKzM0MjgsMTIgQEAgVEVTVF9GKENDTGF5ZXJUcmVlSG9zdEltcGxU ZXN0LCBzdXJmYWNlVGV4dHVyZUNhY2hpbmdOb1BhcnRpYWxTd2FwKQogICAgICAgICBDQ1JlbmRl clBhc3MqIHRhcmdldFBhc3MgPSBmcmFtZS5yZW5kZXJQYXNzZXNCeUlkLmdldChxdWFkLT5yZW5k ZXJQYXNzSWQoKSk7CiAgICAgICAgIEVYUEVDVF9UUlVFKHRhcmdldFBhc3MtPnRhcmdldFN1cmZh Y2UoKS0+Y29udGVudHNDaGFuZ2VkKCkpOwogCisgICAgICAgIEVYUEVDVF9UUlVFKGZyYW1lLnJl bmRlclBhc3Nlc1swXS0+dGFyZ2V0U3VyZmFjZSgpLT5jb250ZW50c0NoYW5nZWQoKSk7CisgICAg ICAgIEVYUEVDVF9UUlVFKGZyYW1lLnJlbmRlclBhc3Nlc1sxXS0+dGFyZ2V0U3VyZmFjZSgpLT5j b250ZW50c0NoYW5nZWQoKSk7CisKKyAgICAgICAgRVhQRUNUX0ZBTFNFKGZyYW1lLnJlbmRlclBh c3Nlc1swXS0+aGFzT2NjbHVzaW9uRnJvbU91dHNpZGVUYXJnZXRTdXJmYWNlKCkpOworICAgICAg ICBFWFBFQ1RfRkFMU0UoZnJhbWUucmVuZGVyUGFzc2VzWzFdLT5oYXNPY2NsdXNpb25Gcm9tT3V0 c2lkZVRhcmdldFN1cmZhY2UoKSk7CisKICAgICAgICAgbXlIb3N0SW1wbC0+ZHJhd0xheWVycyhm cmFtZSk7CiAgICAgICAgIG15SG9zdEltcGwtPmRpZERyYXdBbGxMYXllcnMoZnJhbWUpOwogICAg IH0KQEAgLTM0MzUsNiArMzQ0OSw4IEBAIFRFU1RfRihDQ0xheWVyVHJlZUhvc3RJbXBsVGVzdCwg c3VyZmFjZVRleHR1cmVDYWNoaW5nTm9QYXJ0aWFsU3dhcCkKICAgICAgICAgQVNTRVJUX0VRKDFV LCBmcmFtZS5yZW5kZXJQYXNzZXMuc2l6ZSgpKTsKICAgICAgICAgRVhQRUNUX0VRKDFVLCBmcmFt ZS5yZW5kZXJQYXNzZXNbMF0tPnF1YWRMaXN0KCkuc2l6ZSgpKTsKIAorICAgICAgICBFWFBFQ1Rf RkFMU0UoZnJhbWUucmVuZGVyUGFzc2VzWzBdLT50YXJnZXRTdXJmYWNlKCktPmNvbnRlbnRzQ2hh bmdlZCgpKTsKKwogICAgICAgICBteUhvc3RJbXBsLT5kcmF3TGF5ZXJzKGZyYW1lKTsKICAgICAg ICAgbXlIb3N0SW1wbC0+ZGlkRHJhd0FsbExheWVycyhmcmFtZSk7CiAgICAgfQo= 157267 2012-08-08 12:05:08 -0700 2012-08-08 13:14:03 -0700 Patch bug-93500-20120808150442.patch text/plain 6963 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0ODk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDc4ZGFhNTkwMzNiZDI3ZjlmYzE4MzNlZTk0NDYyMTYxM2Y0ZmJmMWUuLjM0ZTM5NzU4YjBiNjUy NWExYjZlNTYxMjU0OTEzMWFmZjg4YjM3YmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTItMDgtMDggIERhbmEgSmFuc2VucyAgPGRhbmFrakBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBFbmFibGUgb2NjbHVzaW9uIHRyYWNrZXIgaW4g dGhlIG9jY2x1c2lvbiB0ZXN0cyBmb3Igc3VyZmFjZSBjYWNoZWluZworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTM1MDAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgb2NjbHVzaW9uIHRyYWNrZXIgaXMg bm90IGJlaW5nIHVzZWQgaW4gdGhlc2UgdGVzdHMgZXhjZXB0IHRvIGRvCisgICAgICAgIHNjaXNz b3JpbmcuIFdlIHdhbnQgdG8gdGVzdCBvY2NsdXNpb24gd2l0aCB0aGVzZSBvY2NsdXNpb24gdGVz dHMsCisgICAgICAgIGFuZCB3aGVuIHNjaXNzb3JpbmcgaXMgbm90IHBhcnQgb2Ygb2NjbHVzaW9u IHRyYWNrZXIsIHRoZXNlCisgICAgICAgIHRlc3RzIHdvdWxkIGJlY29tZSB1c2VsZXNzIG90aGVy d2lzZS4KKworICAgICAgICAqIHRlc3RzL0NDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LmNwcDoKKwog MjAxMi0wOC0wNyAgQWxleGVpIEZpbGlwcG92ICA8YWxleGVpZkBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgV2ViIEluc3BlY3RvcjogbWFrZSB0aGUgTWVtb3J5Q2xhc3NJbmZvIGNsYXNzIGEgbm90 LXRlbXBsYXRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5 ZXJUcmVlSG9zdEltcGxUZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NM YXllclRyZWVIb3N0SW1wbFRlc3QuY3BwCmluZGV4IDdjMmQwZDZlZmJlODM0YjNiMTAzM2MwNjQz N2UwYzc3YjE4YmVjMzguLjgyMTRiNjllYTlhODVhNDI2MzI5YzFkYzgwOTJhNDM2OTNkYTM1NWUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0 SW1wbFRlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRy ZWVIb3N0SW1wbFRlc3QuY3BwCkBAIC0yNjM5LDYgKzI2MzksNyBAQCBURVNUX0YoQ0NMYXllclRy ZWVIb3N0SW1wbFRlc3QsIHRleHR1cmVDYWNoaW5nV2l0aENsaXBwaW5nKQogICAgIENDU2V0dGlu Z3M6OnNldFBhcnRpYWxTd2FwRW5hYmxlZCh0cnVlKTsKIAogICAgIENDTGF5ZXJUcmVlU2V0dGlu Z3Mgc2V0dGluZ3M7CisgICAgc2V0dGluZ3MubWluaW11bU9jY2x1c2lvblRyYWNraW5nU2l6ZSA9 IEludFNpemUoKTsKICAgICBPd25QdHI8Q0NMYXllclRyZWVIb3N0SW1wbD4gbXlIb3N0SW1wbCA9 IENDTGF5ZXJUcmVlSG9zdEltcGw6OmNyZWF0ZShzZXR0aW5ncywgdGhpcyk7CiAKICAgICBDQ0xh eWVySW1wbCogcm9vdFB0cjsKQEAgLTI2OTYsNiArMjY5Nyw5IEBAIFRFU1RfRihDQ0xheWVyVHJl ZUhvc3RJbXBsVGVzdCwgdGV4dHVyZUNhY2hpbmdXaXRoQ2xpcHBpbmcpCiAgICAgICAgIHF1YWRW aXNpYmxlUmVjdCA9IGZyYW1lLnJlbmRlclBhc3Nlc1swXS0+cXVhZExpc3QoKVsxXS0+cXVhZFZp c2libGVSZWN0KCk7CiAgICAgICAgIEVYUEVDVF9JTlRfUkVDVF9FUShJbnRSZWN0KDAsIDAsIDEw MCwgMyksIHF1YWRWaXNpYmxlUmVjdCk7CiAKKyAgICAgICAgLy8gVmVyaWZ5IHRoYXQgdGhlIHJl bmRlciBzdXJmYWNlIHRleHR1cmUgaXMgKm5vdCogY2xpcHBlZC4KKyAgICAgICAgRVhQRUNUX0lO VF9SRUNUX0VRKEludFJlY3QoMCwgMCwgMTAwLCAxMDApLCBmcmFtZS5yZW5kZXJQYXNzZXNbMF0t PmZyYW1lYnVmZmVyT3V0cHV0UmVjdCgpKTsKKwogICAgICAgICBFWFBFQ1RfRVEoQ0NEcmF3UXVh ZDo6UmVuZGVyUGFzcywgZnJhbWUucmVuZGVyUGFzc2VzWzFdLT5xdWFkTGlzdCgpWzBdLT5tYXRl cmlhbCgpKTsKICAgICAgICAgQ0NSZW5kZXJQYXNzRHJhd1F1YWQqIHF1YWQgPSBzdGF0aWNfY2Fz dDxDQ1JlbmRlclBhc3NEcmF3UXVhZCo+KGZyYW1lLnJlbmRlclBhc3Nlc1sxXS0+cXVhZExpc3Qo KVswXS5nZXQoKSk7CiAgICAgICAgIEVYUEVDVF9GQUxTRShxdWFkLT5jb250ZW50c0NoYW5nZWRT aW5jZUxhc3RGcmFtZSgpLmlzRW1wdHkoKSk7CkBAIC0yNzMxLDYgKzI3MzUsNyBAQCBURVNUX0Yo Q0NMYXllclRyZWVIb3N0SW1wbFRlc3QsIHRleHR1cmVDYWNoaW5nV2l0aE9jY2x1c2lvbikKICAg ICBDQ1NldHRpbmdzOjpzZXRQYXJ0aWFsU3dhcEVuYWJsZWQoZmFsc2UpOwogCiAgICAgQ0NMYXll clRyZWVTZXR0aW5ncyBzZXR0aW5nczsKKyAgICBzZXR0aW5ncy5taW5pbXVtT2NjbHVzaW9uVHJh Y2tpbmdTaXplID0gSW50U2l6ZSgpOwogICAgIE93blB0cjxDQ0xheWVyVHJlZUhvc3RJbXBsPiBt eUhvc3RJbXBsID0gQ0NMYXllclRyZWVIb3N0SW1wbDo6Y3JlYXRlKHNldHRpbmdzLCB0aGlzKTsK IAogICAgIC8vIExheWVycyBhcmUgc3RydWN0dXJlIGFzIGZvbGxvd3M6CkBAIC0yNzg2LDExICsy NzkxLDExIEBAIFRFU1RfRihDQ0xheWVyVHJlZUhvc3RJbXBsVGVzdCwgdGV4dHVyZUNhY2hpbmdX aXRoT2NjbHVzaW9uKQogICAgICAgICBFWFBFQ1RfVFJVRShteUhvc3RJbXBsLT5wcmVwYXJlVG9E cmF3KGZyYW1lKSk7CiAKICAgICAgICAgLy8gTXVzdCByZWNlaXZlIDMgcmVuZGVyIHBhc3Nlcy4K LSAgICAgICAgLy8gRm9yIFJvb3QsIHRoZXJlIGFyZSAyIHF1YWRzOyBmb3IgUzEsIHRoZXJlIGFy ZSAzIHF1YWRzOyBmb3IgUzIsIHRoZXJlIGlzIDEgcXVhZC4KKyAgICAgICAgLy8gRm9yIFJvb3Qs IHRoZXJlIGFyZSAyIHF1YWRzOyBmb3IgUzEsIHRoZXJlIGFyZSAyIHF1YWRzICgxIGlzIG9jY2x1 ZGVkKTsgZm9yIFMyLCB0aGVyZSBpcyAyIHF1YWRzLgogICAgICAgICBBU1NFUlRfRVEoM1UsIGZy YW1lLnJlbmRlclBhc3Nlcy5zaXplKCkpOwogCiAgICAgICAgIEVYUEVDVF9FUSgyVSwgZnJhbWUu cmVuZGVyUGFzc2VzWzBdLT5xdWFkTGlzdCgpLnNpemUoKSk7Ci0gICAgICAgIEVYUEVDVF9FUSgz VSwgZnJhbWUucmVuZGVyUGFzc2VzWzFdLT5xdWFkTGlzdCgpLnNpemUoKSk7CisgICAgICAgIEVY UEVDVF9FUSgyVSwgZnJhbWUucmVuZGVyUGFzc2VzWzFdLT5xdWFkTGlzdCgpLnNpemUoKSk7CiAg ICAgICAgIEVYUEVDVF9FUSgyVSwgZnJhbWUucmVuZGVyUGFzc2VzWzJdLT5xdWFkTGlzdCgpLnNp emUoKSk7CiAKICAgICAgICAgbXlIb3N0SW1wbC0+ZHJhd0xheWVycyhmcmFtZSk7CkBAIC0yODQ2 LDYgKzI4NTEsNyBAQCBURVNUX0YoQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QsIHRleHR1cmVDYWNo aW5nV2l0aE9jY2x1c2lvbkVhcmx5T3V0KQogICAgIENDU2V0dGluZ3M6OnNldFBhcnRpYWxTd2Fw RW5hYmxlZChmYWxzZSk7CiAKICAgICBDQ0xheWVyVHJlZVNldHRpbmdzIHNldHRpbmdzOworICAg IHNldHRpbmdzLm1pbmltdW1PY2NsdXNpb25UcmFja2luZ1NpemUgPSBJbnRTaXplKCk7CiAgICAg T3duUHRyPENDTGF5ZXJUcmVlSG9zdEltcGw+IG15SG9zdEltcGwgPSBDQ0xheWVyVHJlZUhvc3RJ bXBsOjpjcmVhdGUoc2V0dGluZ3MsIHRoaXMpOwogCiAgICAgLy8gTGF5ZXJzIGFyZSBzdHJ1Y3R1 cmUgYXMgZm9sbG93czoKQEAgLTMxMjMsNiArMzEyOSw3IEBAIFRFU1RfRihDQ0xheWVyVHJlZUhv c3RJbXBsVGVzdCwgdGV4dHVyZUNhY2hpbmdXaXRoT2NjbHVzaW9uUGFydGlhbFN3YXApCiAgICAg Q0NTZXR0aW5nczo6c2V0UGFydGlhbFN3YXBFbmFibGVkKHRydWUpOwogCiAgICAgQ0NMYXllclRy ZWVTZXR0aW5ncyBzZXR0aW5nczsKKyAgICBzZXR0aW5ncy5taW5pbXVtT2NjbHVzaW9uVHJhY2tp bmdTaXplID0gSW50U2l6ZSgpOwogICAgIE93blB0cjxDQ0xheWVyVHJlZUhvc3RJbXBsPiBteUhv c3RJbXBsID0gQ0NMYXllclRyZWVIb3N0SW1wbDo6Y3JlYXRlKHNldHRpbmdzLCB0aGlzKTsKIAog ICAgIC8vIExheWVycyBhcmUgc3RydWN0dXJlIGFzIGZvbGxvd3M6CkBAIC0zMTc4LDExICszMTg1 LDExIEBAIFRFU1RfRihDQ0xheWVyVHJlZUhvc3RJbXBsVGVzdCwgdGV4dHVyZUNhY2hpbmdXaXRo T2NjbHVzaW9uUGFydGlhbFN3YXApCiAgICAgICAgIEVYUEVDVF9UUlVFKG15SG9zdEltcGwtPnBy ZXBhcmVUb0RyYXcoZnJhbWUpKTsKIAogICAgICAgICAvLyBNdXN0IHJlY2VpdmUgMyByZW5kZXIg cGFzc2VzLgotICAgICAgICAvLyBGb3IgUm9vdCwgdGhlcmUgYXJlIDIgcXVhZHM7IGZvciBTMSwg dGhlcmUgYXJlIDMgcXVhZHM7IGZvciBTMiwgdGhlcmUgaXMgMSBxdWFkLgorICAgICAgICAvLyBG b3IgUm9vdCwgdGhlcmUgYXJlIDIgcXVhZHM7IGZvciBTMSwgdGhlcmUgYXJlIDIgcXVhZHMgKG9u ZSBpcyBvY2NsdWRlZCk7IGZvciBTMiwgdGhlcmUgaXMgMiBxdWFkcy4KICAgICAgICAgQVNTRVJU X0VRKDNVLCBmcmFtZS5yZW5kZXJQYXNzZXMuc2l6ZSgpKTsKIAogICAgICAgICBFWFBFQ1RfRVEo MlUsIGZyYW1lLnJlbmRlclBhc3Nlc1swXS0+cXVhZExpc3QoKS5zaXplKCkpOwotICAgICAgICBF WFBFQ1RfRVEoM1UsIGZyYW1lLnJlbmRlclBhc3Nlc1sxXS0+cXVhZExpc3QoKS5zaXplKCkpOwor ICAgICAgICBFWFBFQ1RfRVEoMlUsIGZyYW1lLnJlbmRlclBhc3Nlc1sxXS0+cXVhZExpc3QoKS5z aXplKCkpOwogICAgICAgICBFWFBFQ1RfRVEoMlUsIGZyYW1lLnJlbmRlclBhc3Nlc1syXS0+cXVh ZExpc3QoKS5zaXplKCkpOwogCiAgICAgICAgIG15SG9zdEltcGwtPmRyYXdMYXllcnMoZnJhbWUp OwpAQCAtMzIzNyw3ICszMjQ0LDYgQEAgVEVTVF9GKENDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LCB0 ZXh0dXJlQ2FjaGluZ1dpdGhPY2NsdXNpb25QYXJ0aWFsU3dhcCkKICAgICAgICAgbXlIb3N0SW1w bC0+ZHJhd0xheWVycyhmcmFtZSk7CiAgICAgICAgIG15SG9zdEltcGwtPmRpZERyYXdBbGxMYXll cnMoZnJhbWUpOwogICAgIH0KLQogfQogCiBURVNUX0YoQ0NMYXllclRyZWVIb3N0SW1wbFRlc3Qs IHN1cmZhY2VUZXh0dXJlQ2FjaGluZykKQEAgLTMyNDUsNiArMzI1MSw3IEBAIFRFU1RfRihDQ0xh eWVyVHJlZUhvc3RJbXBsVGVzdCwgc3VyZmFjZVRleHR1cmVDYWNoaW5nKQogICAgIENDU2V0dGlu Z3M6OnNldFBhcnRpYWxTd2FwRW5hYmxlZCh0cnVlKTsKIAogICAgIENDTGF5ZXJUcmVlU2V0dGlu Z3Mgc2V0dGluZ3M7CisgICAgc2V0dGluZ3MubWluaW11bU9jY2x1c2lvblRyYWNraW5nU2l6ZSA9 IEludFNpemUoKTsKICAgICBPd25QdHI8Q0NMYXllclRyZWVIb3N0SW1wbD4gbXlIb3N0SW1wbCA9 IENDTGF5ZXJUcmVlSG9zdEltcGw6OmNyZWF0ZShzZXR0aW5ncywgdGhpcyk7CiAKICAgICBDQ0xh eWVySW1wbCogcm9vdFB0cjsKQEAgLTMzOTcsNiArMzQwNCw3IEBAIFRFU1RfRihDQ0xheWVyVHJl ZUhvc3RJbXBsVGVzdCwgc3VyZmFjZVRleHR1cmVDYWNoaW5nTm9QYXJ0aWFsU3dhcCkKICAgICBD Q1NldHRpbmdzOjpzZXRQYXJ0aWFsU3dhcEVuYWJsZWQoZmFsc2UpOwogCiAgICAgQ0NMYXllclRy ZWVTZXR0aW5ncyBzZXR0aW5nczsKKyAgICBzZXR0aW5ncy5taW5pbXVtT2NjbHVzaW9uVHJhY2tp bmdTaXplID0gSW50U2l6ZSgpOwogICAgIE93blB0cjxDQ0xheWVyVHJlZUhvc3RJbXBsPiBteUhv c3RJbXBsID0gQ0NMYXllclRyZWVIb3N0SW1wbDo6Y3JlYXRlKHNldHRpbmdzLCB0aGlzKTsKIAog ICAgIENDTGF5ZXJJbXBsKiByb290UHRyOwpAQCAtMzQyMCw2ICszNDI4LDEyIEBAIFRFU1RfRihD Q0xheWVyVHJlZUhvc3RJbXBsVGVzdCwgc3VyZmFjZVRleHR1cmVDYWNoaW5nTm9QYXJ0aWFsU3dh cCkKICAgICAgICAgQ0NSZW5kZXJQYXNzKiB0YXJnZXRQYXNzID0gZnJhbWUucmVuZGVyUGFzc2Vz QnlJZC5nZXQocXVhZC0+cmVuZGVyUGFzc0lkKCkpOwogICAgICAgICBFWFBFQ1RfVFJVRSh0YXJn ZXRQYXNzLT50YXJnZXRTdXJmYWNlKCktPmNvbnRlbnRzQ2hhbmdlZCgpKTsKIAorICAgICAgICBF WFBFQ1RfVFJVRShmcmFtZS5yZW5kZXJQYXNzZXNbMF0tPnRhcmdldFN1cmZhY2UoKS0+Y29udGVu dHNDaGFuZ2VkKCkpOworICAgICAgICBFWFBFQ1RfVFJVRShmcmFtZS5yZW5kZXJQYXNzZXNbMV0t PnRhcmdldFN1cmZhY2UoKS0+Y29udGVudHNDaGFuZ2VkKCkpOworCisgICAgICAgIEVYUEVDVF9G QUxTRShmcmFtZS5yZW5kZXJQYXNzZXNbMF0tPmhhc09jY2x1c2lvbkZyb21PdXRzaWRlVGFyZ2V0 U3VyZmFjZSgpKTsKKyAgICAgICAgRVhQRUNUX0ZBTFNFKGZyYW1lLnJlbmRlclBhc3Nlc1sxXS0+ aGFzT2NjbHVzaW9uRnJvbU91dHNpZGVUYXJnZXRTdXJmYWNlKCkpOworCiAgICAgICAgIG15SG9z dEltcGwtPmRyYXdMYXllcnMoZnJhbWUpOwogICAgICAgICBteUhvc3RJbXBsLT5kaWREcmF3QWxs TGF5ZXJzKGZyYW1lKTsKICAgICB9CkBAIC0zNDM1LDYgKzM0NDksOCBAQCBURVNUX0YoQ0NMYXll clRyZWVIb3N0SW1wbFRlc3QsIHN1cmZhY2VUZXh0dXJlQ2FjaGluZ05vUGFydGlhbFN3YXApCiAg ICAgICAgIEFTU0VSVF9FUSgxVSwgZnJhbWUucmVuZGVyUGFzc2VzLnNpemUoKSk7CiAgICAgICAg IEVYUEVDVF9FUSgxVSwgZnJhbWUucmVuZGVyUGFzc2VzWzBdLT5xdWFkTGlzdCgpLnNpemUoKSk7 CiAKKyAgICAgICAgRVhQRUNUX0ZBTFNFKGZyYW1lLnJlbmRlclBhc3Nlc1swXS0+dGFyZ2V0U3Vy ZmFjZSgpLT5jb250ZW50c0NoYW5nZWQoKSk7CisKICAgICAgICAgbXlIb3N0SW1wbC0+ZHJhd0xh eWVycyhmcmFtZSk7CiAgICAgICAgIG15SG9zdEltcGwtPmRpZERyYXdBbGxMYXllcnMoZnJhbWUp OwogICAgIH0K