102310 2012-11-14 17:59:25 -0800 [chromium] WebGL texImage2D fails with deferred image decoding 2012-11-15 12:36:18 -0800 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hclam hclam dino jamesr kbr nick senorblanco webkit.review.bot oldest_to_newest 767534 0 hclam 2012-11-14 17:59:25 -0800 When deferred image decoding is enabled WebGL's texImage2D using an Image object will fail. This is due to the fact that it generates an ImageFrame marked as incomplete which WebGL rejects. 767546 1 174307 hclam 2012-11-14 18:09:13 -0800 Created attachment 174307 Patch 767552 2 174307 jamesr 2012-11-14 18:16:52 -0800 Comment on attachment 174307 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=174307&action=review > LayoutTests/fast/images/webgl-teximage2d.html:1 > +<script src="../js/resources/js-test-pre.js"></script> add a <!DOCTYPE html> before this > LayoutTests/fast/images/webgl-teximage2d.html:2 > +<script src="../canvas/webgl/resources/webgl-test.js"></script> why isn't this test in fast/canvas/webgl ? 767554 3 jamesr 2012-11-14 18:18:20 -0800 Seems fairly reasonable to me, but I think Ken or Stephen are more familiar with this bit. 767566 4 hclam 2012-11-14 18:26:07 -0800 I talked to Dirk about this. Since I want to run this test with --enable-deferred-image-decoding virtual suite there's a couple options: 1. Add a virtual suite that runs *one* test in fast/canvas/webgl 2. Copy the test from fast/canvas/webgl 3. Write a simple webgl test in fast/images that does exactly what I need I did just 3. 767606 5 174307 kbr 2012-11-14 19:05:56 -0800 Comment on attachment 174307 Patch Looks good. Please make sure the WebGL conformance suite and the fast/canvas/webgl/ layout tests pass with --enable-deferred-image-decoding, as there are many other tests which already exercise this path, some potentially more strenuously. r=me 768096 6 174307 senorblanco 2012-11-15 08:22:42 -0800 Comment on attachment 174307 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=174307&action=review I have no comments; will leave for Ken. > Source/WebCore/ChangeLog:10 > + generates an ImageFrame marked as incompelte, which WebGL rejects. This results incompelte -> incomplete 768286 7 kbr 2012-11-15 10:44:19 -0800 Note: please mark the patch cq? (Details link) if you would like it submitted to the commit queue. 768289 8 hclam 2012-11-15 10:45:43 -0800 (In reply to comment #7) > Note: please mark the patch cq? (Details link) if you would like it submitted to the commit queue. Thanks. I'll land this manually. 768292 9 174486 hclam 2012-11-15 10:47:52 -0800 Created attachment 174486 Patch for landing 768389 10 174486 webkit.review.bot 2012-11-15 12:36:14 -0800 Comment on attachment 174486 Patch for landing Clearing flags on attachment: 174486 Committed r134816: <http://trac.webkit.org/changeset/134816> 768390 11 webkit.review.bot 2012-11-15 12:36:18 -0800 All reviewed patches have been landed. Closing bug. 174307 2012-11-14 18:09:13 -0800 2012-11-15 10:47:49 -0800 Patch bug-102310-20121114180711.patch text/plain 6315 hclam U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0MzE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDQ2NDQyZTEyNzM2MDc0 NDZkZjY0MjE5ODAyOTdmYTEwN2VlMTI1My4uNmIzZTAxOWIwM2M5ODg3NDlkMmY5ZTdlMDE3ZjFm NjFiMmUwNTJiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTExLTE0ICBBbHBo YSBMYW0gIDxoY2xhbUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBXZWJHTCB0 ZXhJbWFnZTJEIGZhaWxzIHdpdGggZGVmZXJyZWQgaW1hZ2UgZGVjb2RpbmcKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjMxMAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNraWEncyBpbXBsZW1lbnRhdGlv biBvZiBHcmFwaGljc0NvbnRleHQzRDo6Z2V0SW1hZ2VEYXRhKCkgdXNlcyBJbWFnZVNvdXJjZQor ICAgICAgICB0byBkZWNvZGUgYW4gaW1hZ2UuIFdoZW4gZGVmZXJyZWQgaW1hZ2UgZGVjb2Rpbmcg aXMgZW5hYmxlZCB0aGlzIGNsYXNzCisgICAgICAgIGdlbmVyYXRlcyBhbiBJbWFnZUZyYW1lIG1h cmtlZCBhcyBpbmNvbXBlbHRlLCB3aGljaCBXZWJHTCByZWplY3RzLiBUaGlzIHJlc3VsdHMKKyAg ICAgICAgaW4gZmFpbGluZyBvZiB0ZXhJbWFnZTJELgorCisgICAgICAgIFRoaXMgY2hhbmdlIHVz ZXMgSW1hZ2VEZWNvZGVyIGRpcmVjdGx5IGluc3RlYWQgb2YgSW1hZ2VTb3VyY2UuIFRoaXMgc2tp cHMKKyAgICAgICAgdGhlIGNvZGUgcGF0aCBvZiBkZWZlcnJlZCBpbWFnZSBkZWNvZGluZy4gVGhp cyBiZWhhdmlvciBpcyBjb3JyZWN0IGJlY2F1c2UKKyAgICAgICAgR3JhcGhpY3NDb250ZXh0M0Qg d2FudHMgdG8gZGVjb2RlIHRoZSBpbWFnZSBkaWZmZXJlbnRseSB3aXRoIGFscGhhIG5vdAorICAg ICAgICBwcmVtdWx0aXBsaWVkIGFuZCBjb2xvciBwcm9maWxlIGFwcGxpZWQgb3B0aW9uYWxseS4K KworICAgICAgICBBZGRlZCBhIHRlc3QgdG8gcHJvdmUgdGhpcyBjaGFuZ2UgZml4ZWQgdGhlIGJ1 Zy4KKworICAgICAgICBUZXN0OiBmYXN0L2ltYWdlcy93ZWJnbC10ZXhpbWFnZTJkLmh0bWwKKwor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0M0RTa2lhLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEOjpnZXRJbWFnZURhdGEpOgor CiAyMDEyLTExLTEyICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAg ICAgICAgIFJlZHVjZSB0aGUgY3JhenkgbnVtYmVyIG9mIHBhcmFtZXRlcnMgdG8gUmVuZGVyTGF5 ZXIgcGFpbnRpbmcgbWVtYmVyIGZ1bmN0aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRleHQzRFNraWEuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRleHQzRFNraWEuY3Bw CmluZGV4IDE3YWQ4M2Q4ZjgzNzVmZTBjOTMxNThjNjQ1YjBmNTIwZTE1MTcyZTguLmZlYTZhZGNl MzAxODU3NzY0MDg2ZWEyN2I3NWNlYmI5ZTZiMTU2OGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0M0RTa2lhLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0dyYXBoaWNzQ29udGV4dDNE U2tpYS5jcHAKQEAgLTMyLDcgKzMyLDcgQEAKIAogI2luY2x1ZGUgIkJpdG1hcEltYWdlLmgiCiAj aW5jbHVkZSAiSW1hZ2UuaCIKLSNpbmNsdWRlICJJbWFnZVNvdXJjZS5oIgorI2luY2x1ZGUgIklt YWdlRGVjb2Rlci5oIgogI2luY2x1ZGUgIk5hdGl2ZUltYWdlU2tpYS5oIgogI2luY2x1ZGUgIlNr Q29sb3JQcml2LmgiCiAjaW5jbHVkZSA8d3RmL093blB0ci5oPgpAQCAtNTYsMTQgKzU2LDIwIEBA IGJvb2wgR3JhcGhpY3NDb250ZXh0M0Q6OmdldEltYWdlRGF0YShJbWFnZSogaW1hZ2UsCiAgICAg QWxwaGFPcCBuZWVkZWRBbHBoYU9wID0gQWxwaGFEb05vdGhpbmc7CiAgICAgYm9vbCBoYXNBbHBo YSA9IHNraWFJbWFnZSA/ICFza2lhSW1hZ2UtPmJpdG1hcCgpLmlzT3BhcXVlKCkgOiB0cnVlOwog ICAgIGlmICgoIXNraWFJbWFnZSB8fCBpZ25vcmVHYW1tYUFuZENvbG9yUHJvZmlsZSB8fCAoaGFz QWxwaGEgJiYgIXByZW11bHRpcGx5QWxwaGEpKSAmJiBpbWFnZS0+ZGF0YSgpKSB7Ci0gICAgICAg IEltYWdlU291cmNlIGRlY29kZXIoSW1hZ2VTb3VyY2U6OkFscGhhTm90UHJlbXVsdGlwbGllZCwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZ25vcmVHYW1tYUFuZENvbG9yUHJvZmlsZSA/ IEltYWdlU291cmNlOjpHYW1tYUFuZENvbG9yUHJvZmlsZUlnbm9yZWQgOiBJbWFnZVNvdXJjZTo6 R2FtbWFBbmRDb2xvclByb2ZpbGVBcHBsaWVkKTsKLSAgICAgICAgLy8gQXR0ZW1wdCB0byBnZXQg cmF3IHVucHJlbXVsdGlwbGllZCBpbWFnZSBkYXRhIAotICAgICAgICBkZWNvZGVyLnNldERhdGEo aW1hZ2UtPmRhdGEoKSwgdHJ1ZSk7Ci0gICAgICAgIGlmICghZGVjb2Rlci5mcmFtZUNvdW50KCkg fHwgIWRlY29kZXIuZnJhbWVJc0NvbXBsZXRlQXRJbmRleCgwKSkKKyAgICAgICAgLy8gQXR0ZW1w dCB0byBnZXQgcmF3IHVucHJlbXVsdGlwbGllZCBpbWFnZSBkYXRhLgorICAgICAgICBPd25QdHI8 SW1hZ2VEZWNvZGVyPiBkZWNvZGVyKGFkb3B0UHRyKEltYWdlRGVjb2Rlcjo6Y3JlYXRlKAorICAg ICAgICAgICAgKihpbWFnZS0+ZGF0YSgpKSwgSW1hZ2VTb3VyY2U6OkFscGhhTm90UHJlbXVsdGlw bGllZCwKKyAgICAgICAgICAgIGlnbm9yZUdhbW1hQW5kQ29sb3JQcm9maWxlID8gSW1hZ2VTb3Vy Y2U6OkdhbW1hQW5kQ29sb3JQcm9maWxlSWdub3JlZCA6IEltYWdlU291cmNlOjpHYW1tYUFuZENv bG9yUHJvZmlsZUFwcGxpZWQpKSk7CisgICAgICAgIGlmICghZGVjb2RlcikKICAgICAgICAgICAg IHJldHVybiBmYWxzZTsKLSAgICAgICAgaGFzQWxwaGEgPSBkZWNvZGVyLmZyYW1lSGFzQWxwaGFB dEluZGV4KDApOwotICAgICAgICBwaXhlbHMgPSBhZG9wdFB0cihkZWNvZGVyLmNyZWF0ZUZyYW1l QXRJbmRleCgwKSk7CisgICAgICAgIGRlY29kZXItPnNldERhdGEoaW1hZ2UtPmRhdGEoKSwgdHJ1 ZSk7CisgICAgICAgIGlmICghZGVjb2Rlci0+ZnJhbWVDb3VudCgpKQorICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOworICAgICAgICBJbWFnZUZyYW1lKiBmcmFtZSA9IGRlY29kZXItPmZyYW1lQnVm ZmVyQXRJbmRleCgwKTsKKyAgICAgICAgaWYgKCFmcmFtZSB8fCBmcmFtZS0+c3RhdHVzKCkgIT0g SW1hZ2VGcmFtZTo6RnJhbWVDb21wbGV0ZSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICAgICAgaGFzQWxwaGEgPSBmcmFtZS0+aGFzQWxwaGEoKTsKKyAgICAgICAgcGl4ZWxzID0gYWRv cHRQdHIoZnJhbWUtPmFzTmV3TmF0aXZlSW1hZ2UoKSk7CiAgICAgICAgIGlmICghcGl4ZWxzLmdl dCgpIHx8ICFwaXhlbHMtPmlzRGF0YUNvbXBsZXRlKCkgfHwgIXBpeGVscy0+Yml0bWFwKCkud2lk dGgoKSB8fCAhcGl4ZWxzLT5iaXRtYXAoKS5oZWlnaHQoKSkKICAgICAgICAgICAgIHJldHVybiBm YWxzZTsKICAgICAgICAgU2tCaXRtYXA6OkNvbmZpZyBza2lhQ29uZmlnID0gcGl4ZWxzLT5iaXRt YXAoKS5jb25maWcoKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwppbmRleCBlYjQyNjRlMjk1ZWZlYzA4YTlhNmY1MjAxMzlkODQ4NDgw MmM1NjI0Li43M2FkNmQ3Yzg1NTgyN2E5ZDBmZDEzYjUwYzIyNzM2MzJjYThlNjk4IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTItMTEtMTQgIEFscGhhIExhbSAgPGhjbGFtQGNocm9taXVtLm9y Zz4KKworICAgICAgICBbY2hyb21pdW1dIFdlYkdMIHRleEltYWdlMkQgZmFpbHMgd2l0aCBkZWZl cnJlZCBpbWFnZSBkZWNvZGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTAyMzEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWRkZWQgYSB0ZXN0IHRvIGV4ZXJjaXNlIHRleEltYWdlMkQgd2l0aCBhbiBJ bWFnZSBvYmplY3QuCisKKyAgICAgICAgKiBmYXN0L2ltYWdlcy93ZWJnbC10ZXhpbWFnZTJkLWV4 cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9pbWFnZXMvd2ViZ2wtdGV4aW1hZ2Uy ZC5odG1sOiBBZGRlZC4KKwogMjAxMi0xMS0xMSAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUu Y29tPgogCiAgICAgICAgIERGRyBBcml0aE11bCBvdmVyZmxvdyBjaGVjayBlbGltaW5hdGlvbiBp cyB0b28gYWdncmVzc2l2ZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9pbWFnZXMvd2Vi Z2wtdGV4aW1hZ2UyZC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2ltYWdlcy93ZWJn bC10ZXhpbWFnZTJkLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5iYjEyZGQ4ZDA3ZmJjMWQ3OTlj OTE3YzdkZjYwNjdiMWNjNjFmMmNmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFz dC9pbWFnZXMvd2ViZ2wtdGV4aW1hZ2UyZC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwzIEBACitQ QVNTIGNvbnRleHQgZXhpc3RzCitQQVNTIE9LCisgCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9m YXN0L2ltYWdlcy93ZWJnbC10ZXhpbWFnZTJkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2ltYWdl cy93ZWJnbC10ZXhpbWFnZTJkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOWEzNmEzN2Y1YzVmZmE0NzdmNzI5 NWNlZmJjNzg5OTJlYjBjNmJmYgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qv aW1hZ2VzL3dlYmdsLXRleGltYWdlMmQuaHRtbApAQCAtMCwwICsxLDM5IEBACis8c2NyaXB0IHNy Yz0iLi4vanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3Jj PSIuLi9jYW52YXMvd2ViZ2wvcmVzb3VyY2VzL3dlYmdsLXRlc3QuanMiPjwvc2NyaXB0PgorPGNh bnZhcyBpZD0iY2FudmFzIiB3aWR0aD0iMCIgaGVpZ2h0PSIwIj4gPC9jYW52YXM+Cis8aW1nIHNy Yz0icmVzb3VyY2VzL2dyZWVuLmpwZyIgd2lkdGg9IjAiIGhlaWdodD0iMCIgaWQ9ImltYWdlIj48 L2ltZz4KKzxzY3JpcHQ+CisKK2lmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICB0ZXN0UnVubmVy LndhaXRVbnRpbERvbmUoKTsKKwordmFyIGdsID0gY3JlYXRlM0RDb250ZXh0KGRvY3VtZW50Lmdl dEVsZW1lbnRCeUlkKCJjYW52YXMiKSk7CitpZiAoIWdsKSB7CisgICAgdGVzdEZhaWxlZCgiY29u dGV4dCBkb2VzIG5vdCBleGlzdCIpOworfSBlbHNlIHsKKyAgICB0ZXN0UGFzc2VkKCJjb250ZXh0 IGV4aXN0cyIpOworfQorCit2YXIgZW51bXMgPSBuZXcgQXJyYXkoKTsKK2ZvciAodmFyIG5hbWUg aW4gZ2wpIHsKKyAgICBpZiAodHlwZW9mIGdsW25hbWVdID09ICdudW1iZXInKQorICAgICAgICBl bnVtc1tnbFtuYW1lXV0gPSBuYW1lOworfQorCit2YXIgaW1nID0gZG9jdW1lbnQuZ2V0RWxlbWVu dEJ5SWQoImltYWdlIik7CitpbWcub25sb2FkID0gZnVuY3Rpb24oKSB7CisgICAgdmFyIHRleHR1 cmUgPSBnbC5jcmVhdGVUZXh0dXJlKCk7CisgICAgZ2wuYmluZFRleHR1cmUoZ2wuVEVYVFVSRV8y RCwgdGV4dHVyZSk7CisgICAgdHJ5IHsKKyAgICAgICAgZ2wudGV4SW1hZ2UyRChnbC5URVhUVVJF XzJELCAwLCBnbC5SR0JBLCBnbC5SR0JBLCBnbC5VTlNJR05FRF9CWVRFLCBpbWcpOworICAgICAg ICB2YXIgZXJyID0gZ2wuZ2V0RXJyb3IoKTsKKyAgICAgICAgaWYgKGVyciAhPSBnbC5OT19FUlJP UikKKyAgICAgICAgICAgIHRocm93ICJXZWJHTCBlcnJvcjogIiArIGVudW1zW2Vycl07CisgICAg ICAgIHRlc3RQYXNzZWQoIk9LIik7CisgICAgfSBjYXRjaCAoZSkgeworICAgICAgICB0ZXN0RmFp bGVkKGUudG9TdHJpbmcoKSk7CisgICAgfQorICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAg ICAgICAgdGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7Cit9Cis8L3NjcmlwdD4K 174486 2012-11-15 10:47:52 -0800 2012-11-15 12:36:14 -0800 Patch for landing bug-102310-20121115104549.patch text/plain 6317 hclam U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0MzE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDQ2NDQyZTEyNzM2MDc0 NDZkZjY0MjE5ODAyOTdmYTEwN2VlMTI1My4uNThhZGI5NTM2NzhhMWVhZDgzNDY1NTMyMzI2Yjk2 YWZiZDgxMGQzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTExLTE0ICBBbHBo YSBMYW0gIDxoY2xhbUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBXZWJHTCB0 ZXhJbWFnZTJEIGZhaWxzIHdpdGggZGVmZXJyZWQgaW1hZ2UgZGVjb2RpbmcKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjMxMAorCisgICAgICAgIFJl dmlld2VkIGJ5IEtlbm5ldGggUnVzc2VsbC4KKworICAgICAgICBTa2lhJ3MgaW1wbGVtZW50YXRp b24gb2YgR3JhcGhpY3NDb250ZXh0M0Q6OmdldEltYWdlRGF0YSgpIHVzZXMgSW1hZ2VTb3VyY2UK KyAgICAgICAgdG8gZGVjb2RlIGFuIGltYWdlLiBXaGVuIGRlZmVycmVkIGltYWdlIGRlY29kaW5n IGlzIGVuYWJsZWQgdGhpcyBjbGFzcworICAgICAgICBnZW5lcmF0ZXMgYW4gSW1hZ2VGcmFtZSBt YXJrZWQgYXMgaW5jb21wbGV0ZSwgd2hpY2ggV2ViR0wgcmVqZWN0cy4gVGhpcyByZXN1bHRzCisg ICAgICAgIGluIGZhaWxpbmcgb2YgdGV4SW1hZ2UyRC4KKworICAgICAgICBUaGlzIGNoYW5nZSB1 c2VzIEltYWdlRGVjb2RlciBkaXJlY3RseSBpbnN0ZWFkIG9mIEltYWdlU291cmNlLiBUaGlzIHNr aXBzCisgICAgICAgIHRoZSBjb2RlIHBhdGggb2YgZGVmZXJyZWQgaW1hZ2UgZGVjb2RpbmcuIFRo aXMgYmVoYXZpb3IgaXMgY29ycmVjdCBiZWNhdXNlCisgICAgICAgIEdyYXBoaWNzQ29udGV4dDNE IHdhbnRzIHRvIGRlY29kZSB0aGUgaW1hZ2UgZGlmZmVyZW50bHkgd2l0aCBhbHBoYSBub3QKKyAg ICAgICAgcHJlbXVsdGlwbGllZCBhbmQgY29sb3IgcHJvZmlsZSBhcHBsaWVkIG9wdGlvbmFsbHku CisKKyAgICAgICAgQWRkZWQgYSB0ZXN0IHRvIHByb3ZlIHRoaXMgY2hhbmdlIGZpeGVkIHRoZSBi dWcuCisKKyAgICAgICAgVGVzdDogZmFzdC9pbWFnZXMvd2ViZ2wtdGV4aW1hZ2UyZC5odG1sCisK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL0dyYXBoaWNzQ29udGV4dDNEU2tpYS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQzRDo6Z2V0SW1hZ2VEYXRhKToK KwogMjAxMi0xMS0xMiAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZWR1Y2UgdGhlIGNyYXp5IG51bWJlciBvZiBwYXJhbWV0ZXJzIHRvIFJlbmRlckxh eWVyIHBhaW50aW5nIG1lbWJlciBmdW5jdGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0M0RTa2lhLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0M0RTa2lhLmNw cAppbmRleCAxN2FkODNkOGY4Mzc1ZmUwYzkzMTU4YzY0NWIwZjUyMGUxNTE3MmU4Li5mZWE2YWRj ZTMwMTg1Nzc2NDA4NmVhMjdiNzVjZWJiOWU2YjE1NjhlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0dyYXBoaWNzQ29udGV4dDNEU2tpYS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRleHQz RFNraWEuY3BwCkBAIC0zMiw3ICszMiw3IEBACiAKICNpbmNsdWRlICJCaXRtYXBJbWFnZS5oIgog I2luY2x1ZGUgIkltYWdlLmgiCi0jaW5jbHVkZSAiSW1hZ2VTb3VyY2UuaCIKKyNpbmNsdWRlICJJ bWFnZURlY29kZXIuaCIKICNpbmNsdWRlICJOYXRpdmVJbWFnZVNraWEuaCIKICNpbmNsdWRlICJT a0NvbG9yUHJpdi5oIgogI2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4KQEAgLTU2LDE0ICs1NiwyMCBA QCBib29sIEdyYXBoaWNzQ29udGV4dDNEOjpnZXRJbWFnZURhdGEoSW1hZ2UqIGltYWdlLAogICAg IEFscGhhT3AgbmVlZGVkQWxwaGFPcCA9IEFscGhhRG9Ob3RoaW5nOwogICAgIGJvb2wgaGFzQWxw aGEgPSBza2lhSW1hZ2UgPyAhc2tpYUltYWdlLT5iaXRtYXAoKS5pc09wYXF1ZSgpIDogdHJ1ZTsK ICAgICBpZiAoKCFza2lhSW1hZ2UgfHwgaWdub3JlR2FtbWFBbmRDb2xvclByb2ZpbGUgfHwgKGhh c0FscGhhICYmICFwcmVtdWx0aXBseUFscGhhKSkgJiYgaW1hZ2UtPmRhdGEoKSkgewotICAgICAg ICBJbWFnZVNvdXJjZSBkZWNvZGVyKEltYWdlU291cmNlOjpBbHBoYU5vdFByZW11bHRpcGxpZWQs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgaWdub3JlR2FtbWFBbmRDb2xvclByb2ZpbGUg PyBJbWFnZVNvdXJjZTo6R2FtbWFBbmRDb2xvclByb2ZpbGVJZ25vcmVkIDogSW1hZ2VTb3VyY2U6 OkdhbW1hQW5kQ29sb3JQcm9maWxlQXBwbGllZCk7Ci0gICAgICAgIC8vIEF0dGVtcHQgdG8gZ2V0 IHJhdyB1bnByZW11bHRpcGxpZWQgaW1hZ2UgZGF0YSAKLSAgICAgICAgZGVjb2Rlci5zZXREYXRh KGltYWdlLT5kYXRhKCksIHRydWUpOwotICAgICAgICBpZiAoIWRlY29kZXIuZnJhbWVDb3VudCgp IHx8ICFkZWNvZGVyLmZyYW1lSXNDb21wbGV0ZUF0SW5kZXgoMCkpCisgICAgICAgIC8vIEF0dGVt cHQgdG8gZ2V0IHJhdyB1bnByZW11bHRpcGxpZWQgaW1hZ2UgZGF0YS4KKyAgICAgICAgT3duUHRy PEltYWdlRGVjb2Rlcj4gZGVjb2RlcihhZG9wdFB0cihJbWFnZURlY29kZXI6OmNyZWF0ZSgKKyAg ICAgICAgICAgICooaW1hZ2UtPmRhdGEoKSksIEltYWdlU291cmNlOjpBbHBoYU5vdFByZW11bHRp cGxpZWQsCisgICAgICAgICAgICBpZ25vcmVHYW1tYUFuZENvbG9yUHJvZmlsZSA/IEltYWdlU291 cmNlOjpHYW1tYUFuZENvbG9yUHJvZmlsZUlnbm9yZWQgOiBJbWFnZVNvdXJjZTo6R2FtbWFBbmRD b2xvclByb2ZpbGVBcHBsaWVkKSkpOworICAgICAgICBpZiAoIWRlY29kZXIpCiAgICAgICAgICAg ICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIGhhc0FscGhhID0gZGVjb2Rlci5mcmFtZUhhc0FscGhh QXRJbmRleCgwKTsKLSAgICAgICAgcGl4ZWxzID0gYWRvcHRQdHIoZGVjb2Rlci5jcmVhdGVGcmFt ZUF0SW5kZXgoMCkpOworICAgICAgICBkZWNvZGVyLT5zZXREYXRhKGltYWdlLT5kYXRhKCksIHRy dWUpOworICAgICAgICBpZiAoIWRlY29kZXItPmZyYW1lQ291bnQoKSkKKyAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKKyAgICAgICAgSW1hZ2VGcmFtZSogZnJhbWUgPSBkZWNvZGVyLT5mcmFtZUJ1 ZmZlckF0SW5kZXgoMCk7CisgICAgICAgIGlmICghZnJhbWUgfHwgZnJhbWUtPnN0YXR1cygpICE9 IEltYWdlRnJhbWU6OkZyYW1lQ29tcGxldGUpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7Cisg ICAgICAgIGhhc0FscGhhID0gZnJhbWUtPmhhc0FscGhhKCk7CisgICAgICAgIHBpeGVscyA9IGFk b3B0UHRyKGZyYW1lLT5hc05ld05hdGl2ZUltYWdlKCkpOwogICAgICAgICBpZiAoIXBpeGVscy5n ZXQoKSB8fCAhcGl4ZWxzLT5pc0RhdGFDb21wbGV0ZSgpIHx8ICFwaXhlbHMtPmJpdG1hcCgpLndp ZHRoKCkgfHwgIXBpeGVscy0+Yml0bWFwKCkuaGVpZ2h0KCkpCiAgICAgICAgICAgICByZXR1cm4g ZmFsc2U7CiAgICAgICAgIFNrQml0bWFwOjpDb25maWcgc2tpYUNvbmZpZyA9IHBpeGVscy0+Yml0 bWFwKCkuY29uZmlnKCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZWI0MjY0ZTI5NWVmZWMwOGE5YTZmNTIwMTM5ZDg0ODQ4 MDJjNTYyNC4uY2UyODZkZmQ1M2U3NGU2OTMxYWI4Yzk1NGJkZjAxY2JhNDZmZGM5MyAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE1IEBACisyMDEyLTExLTE0ICBBbHBoYSBMYW0gIDxoY2xhbUBjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBXZWJHTCB0ZXhJbWFnZTJEIGZhaWxzIHdpdGggZGVm ZXJyZWQgaW1hZ2UgZGVjb2RpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEwMjMxMAorCisgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUnVzc2Vs bC4KKworICAgICAgICBBZGRlZCBhIHRlc3QgdG8gZXhlcmNpc2UgdGV4SW1hZ2UyRCB3aXRoIGFu IEltYWdlIG9iamVjdC4KKworICAgICAgICAqIGZhc3QvaW1hZ2VzL3dlYmdsLXRleGltYWdlMmQt ZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2ltYWdlcy93ZWJnbC10ZXhpbWFn ZTJkLmh0bWw6IEFkZGVkLgorCiAyMDEyLTExLTExICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBs ZS5jb20+CiAKICAgICAgICAgREZHIEFyaXRoTXVsIG92ZXJmbG93IGNoZWNrIGVsaW1pbmF0aW9u IGlzIHRvbyBhZ2dyZXNzaXZlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2ltYWdlcy93 ZWJnbC10ZXhpbWFnZTJkLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvaW1hZ2VzL3dl YmdsLXRleGltYWdlMmQtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmJiMTJkZDhkMDdmYmMxZDc5 OWM5MTdjN2RmNjA2N2IxY2M2MWYyY2YKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L2ltYWdlcy93ZWJnbC10ZXhpbWFnZTJkLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDMgQEAK K1BBU1MgY29udGV4dCBleGlzdHMKK1BBU1MgT0sKKyAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2Zhc3QvaW1hZ2VzL3dlYmdsLXRleGltYWdlMmQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvaW1h Z2VzL3dlYmdsLXRleGltYWdlMmQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi45YTM2YTM3ZjVjNWZmYTQ3N2Y3 Mjk1Y2VmYmM3ODk5MmViMGM2YmZiCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFz dC9pbWFnZXMvd2ViZ2wtdGV4aW1hZ2UyZC5odG1sCkBAIC0wLDAgKzEsMzkgQEAKKzxzY3JpcHQg c3JjPSIuLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBz cmM9Ii4uL2NhbnZhcy93ZWJnbC9yZXNvdXJjZXMvd2ViZ2wtdGVzdC5qcyI+PC9zY3JpcHQ+Cis8 Y2FudmFzIGlkPSJjYW52YXMiIHdpZHRoPSIwIiBoZWlnaHQ9IjAiPiA8L2NhbnZhcz4KKzxpbWcg c3JjPSJyZXNvdXJjZXMvZ3JlZW4uanBnIiB3aWR0aD0iMCIgaGVpZ2h0PSIwIiBpZD0iaW1hZ2Ui PjwvaW1nPgorPHNjcmlwdD4KKworaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgIHRlc3RSdW5u ZXIud2FpdFVudGlsRG9uZSgpOworCit2YXIgZ2wgPSBjcmVhdGUzRENvbnRleHQoZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoImNhbnZhcyIpKTsKK2lmICghZ2wpIHsKKyAgICB0ZXN0RmFpbGVkKCJj b250ZXh0IGRvZXMgbm90IGV4aXN0Iik7Cit9IGVsc2UgeworICAgIHRlc3RQYXNzZWQoImNvbnRl eHQgZXhpc3RzIik7Cit9CisKK3ZhciBlbnVtcyA9IG5ldyBBcnJheSgpOworZm9yICh2YXIgbmFt ZSBpbiBnbCkgeworICAgIGlmICh0eXBlb2YgZ2xbbmFtZV0gPT0gJ251bWJlcicpCisgICAgICAg IGVudW1zW2dsW25hbWVdXSA9IG5hbWU7Cit9CisKK3ZhciBpbWcgPSBkb2N1bWVudC5nZXRFbGVt ZW50QnlJZCgiaW1hZ2UiKTsKK2ltZy5vbmxvYWQgPSBmdW5jdGlvbigpIHsKKyAgICB2YXIgdGV4 dHVyZSA9IGdsLmNyZWF0ZVRleHR1cmUoKTsKKyAgICBnbC5iaW5kVGV4dHVyZShnbC5URVhUVVJF XzJELCB0ZXh0dXJlKTsKKyAgICB0cnkgeworICAgICAgICBnbC50ZXhJbWFnZTJEKGdsLlRFWFRV UkVfMkQsIDAsIGdsLlJHQkEsIGdsLlJHQkEsIGdsLlVOU0lHTkVEX0JZVEUsIGltZyk7CisgICAg ICAgIHZhciBlcnIgPSBnbC5nZXRFcnJvcigpOworICAgICAgICBpZiAoZXJyICE9IGdsLk5PX0VS Uk9SKQorICAgICAgICAgICAgdGhyb3cgIldlYkdMIGVycm9yOiAiICsgZW51bXNbZXJyXTsKKyAg ICAgICAgdGVzdFBhc3NlZCgiT0siKTsKKyAgICB9IGNhdGNoIChlKSB7CisgICAgICAgIHRlc3RG YWlsZWQoZS50b1N0cmluZygpKTsKKyAgICB9CisgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQor ICAgICAgICB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKK30KKzwvc2NyaXB0Pgo=