43873 2010-08-11 13:27:39 -0700 regression in generateMipmap 2010-08-12 15:59:47 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) Mac (Intel) OS X 10.6 RESOLVED FIXED P2 Normal --- 33805 1 computerfreak97 zmo cmarrin dglazkov kbr zmo oldest_to_newest 263427 0 computerfreak97 2010-08-11 13:27:39 -0700 There are no textures in the demo at: https://cvs.khronos.org/svn/repos/registry/trunk/public/webgl/sdk/demos/mozilla/spore/index.html. It is confirmed that there are by looking at in in chrome/firefox. 263882 1 zmo 2010-08-12 11:01:20 -0700 It should be a recent regression. My build from this Monday still shows the texture. 263938 2 zmo 2010-08-12 13:26:27 -0700 I am looking into this. 263945 3 zmo 2010-08-12 13:31:43 -0700 Ok, it's a bug in the NPOT/Texture completeness patch, so it is before this Monday's build. I was fixing it on Monday; that's why my Monday's build shows the texture correctly. Only I got distracted with other bugs, so I haven't committed the fix. Will upload a patch shortly after. 263960 4 zmo 2010-08-12 14:03:14 -0700 After generateMipmap() on a POT texture, it should draw successfully with the texture. 263964 5 64258 zmo 2010-08-12 14:08:59 -0700 Created attachment 64258 patch test is in sync with khronos conformance test, except one failing case. Commented out that failing case for now. 264037 6 64258 kbr 2010-08-12 15:39:31 -0700 Comment on attachment 64258 patch Looks good to me. 264050 7 64258 dglazkov 2010-08-12 15:51:51 -0700 Comment on attachment 64258 patch ok. 264060 8 zmo 2010-08-12 15:59:47 -0700 Committed r65277: <http://trac.webkit.org/changeset/65277> 64258 2010-08-12 14:08:59 -0700 2010-08-12 15:51:50 -0700 patch npot.patch text/plain 14576 zmo SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NTI2NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMTAtMDgtMTIgIFpoZW55YW8gTW8gIDx6bW9AZ29vZ2xlLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICByZWdyZXNz aW9uIGluIGdlbmVyYXRlTWlwbWFwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD00Mzg3MworCisgICAgICAgICogaHRtbC9jYW52YXMvV2ViR0xUZXh0dXJl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMVGV4dHVyZTo6Z2VuZXJhdGVNaXBtYXBMZXZl bEluZm8pOiBzaG91bGQgc2V0IG1fbmVlZFRvVXNlQmxhY2tUZXh0dXJlIHRvIGZhbHNlIGlmIGdl bmVyYXRlTWlwbWFwTGV2ZWxJbmZvIHJ1bnMgdGhyb3VnaCBzdWNjZXNzZnVsbHkuCisKIDIwMTAt MDgtMTIgIERpcmsgU2NodWx6ZSAgPGtyaXRAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmll d2VkIHNvcnQgb2YgWENvZGUgcHJvamVjdCBmaWxlLgpJbmRleDogV2ViQ29yZS9odG1sL2NhbnZh cy9XZWJHTFRleHR1cmUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9jYW52YXMvV2Vi R0xUZXh0dXJlLmNwcAkocmV2aXNpb24gNjUyMTUpCisrKyBXZWJDb3JlL2h0bWwvY2FudmFzL1dl YkdMVGV4dHVyZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE1MSwyMSArMTUxLDIyIEBAIHZvaWQg V2ViR0xUZXh0dXJlOjpnZW5lcmF0ZU1pcG1hcExldmVsSW4KICAgICAgICAgcmV0dXJuOwogICAg IGlmICghY2FuR2VuZXJhdGVNaXBtYXBzKCkpCiAgICAgICAgIHJldHVybjsKLSAgICBpZiAobV9p c0NvbXBsZXRlKQotICAgICAgICByZXR1cm47Ci0gICAgZm9yIChzaXplX3QgaWkgPSAwOyBpaSA8 IG1faW5mby5zaXplKCk7ICsraWkpIHsKLSAgICAgICAgY29uc3QgTGV2ZWxJbmZvJiBpbmZvMCA9 IG1faW5mb1tpaV1bMF07Ci0gICAgICAgIGludCB3aWR0aCA9IGluZm8wLndpZHRoOwotICAgICAg ICBpbnQgaGVpZ2h0ID0gaW5mbzAuaGVpZ2h0OwotICAgICAgICBpbnQgbGV2ZWxDb3VudCA9IGNv bXB1dGVMZXZlbENvdW50KHdpZHRoLCBoZWlnaHQpOwotICAgICAgICBmb3IgKGludCBsZXZlbCA9 IDE7IGxldmVsIDwgbGV2ZWxDb3VudDsgKytsZXZlbCkgewotICAgICAgICAgICAgd2lkdGggPSBz dGQ6Om1heCgxLCB3aWR0aCA+PiAxKTsKLSAgICAgICAgICAgIGhlaWdodCA9IHN0ZDo6bWF4KDEs IGhlaWdodCA+PiAxKTsKLSAgICAgICAgICAgIExldmVsSW5mbyYgaW5mbyA9IG1faW5mb1tpaV1b bGV2ZWxdOwotICAgICAgICAgICAgaW5mby5zZXRJbmZvKGluZm8wLmludGVybmFsRm9ybWF0LCB3 aWR0aCwgaGVpZ2h0LCBpbmZvMC50eXBlKTsKKyAgICBpZiAoIW1faXNDb21wbGV0ZSkgeworICAg ICAgICBmb3IgKHNpemVfdCBpaSA9IDA7IGlpIDwgbV9pbmZvLnNpemUoKTsgKytpaSkgeworICAg ICAgICAgICAgY29uc3QgTGV2ZWxJbmZvJiBpbmZvMCA9IG1faW5mb1tpaV1bMF07CisgICAgICAg ICAgICBpbnQgd2lkdGggPSBpbmZvMC53aWR0aDsKKyAgICAgICAgICAgIGludCBoZWlnaHQgPSBp bmZvMC5oZWlnaHQ7CisgICAgICAgICAgICBpbnQgbGV2ZWxDb3VudCA9IGNvbXB1dGVMZXZlbENv dW50KHdpZHRoLCBoZWlnaHQpOworICAgICAgICAgICAgZm9yIChpbnQgbGV2ZWwgPSAxOyBsZXZl bCA8IGxldmVsQ291bnQ7ICsrbGV2ZWwpIHsKKyAgICAgICAgICAgICAgICB3aWR0aCA9IHN0ZDo6 bWF4KDEsIHdpZHRoID4+IDEpOworICAgICAgICAgICAgICAgIGhlaWdodCA9IHN0ZDo6bWF4KDEs IGhlaWdodCA+PiAxKTsKKyAgICAgICAgICAgICAgICBMZXZlbEluZm8mIGluZm8gPSBtX2luZm9b aWldW2xldmVsXTsKKyAgICAgICAgICAgICAgICBpbmZvLnNldEluZm8oaW5mbzAuaW50ZXJuYWxG b3JtYXQsIHdpZHRoLCBoZWlnaHQsIGluZm8wLnR5cGUpOworICAgICAgICAgICAgfQogICAgICAg ICB9CisgICAgICAgIG1faXNDb21wbGV0ZSA9IHRydWU7CiAgICAgfQotICAgIG1faXNDb21wbGV0 ZSA9IHRydWU7CisgICAgbV9uZWVkVG9Vc2VCbGFja1RleHR1cmUgPSBmYWxzZTsKIH0KIAogdW5z aWduZWQgbG9uZyBXZWJHTFRleHR1cmU6OmdldEludGVybmFsRm9ybWF0KCkgY29uc3QKSW5kZXg6 IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cJKHJldmlzaW9uIDY1MjY0KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMDgtMTIgIFpoZW55YW8gTW8gIDx6bW9AZ29vZ2xl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBy ZWdyZXNzaW9uIGluIGdlbmVyYXRlTWlwbWFwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD00Mzg3MworCisgICAgICAgICogZmFzdC9jYW52YXMvd2ViZ2wv dGV4dHVyZS1ucG90LWV4cGVjdGVkLnR4dDogQWRkIG1vcmUgdGVzdCBjYXNlcyBvbiBOUE9UL1BP VCB0ZXh0dXJlIGJlaGF2aW9ycy4KKyAgICAgICAgKiBmYXN0L2NhbnZhcy93ZWJnbC90ZXh0dXJl LW5wb3QuaHRtbDogRGl0dG8uCisKIDIwMTAtMDgtMTIgIFZpY3RvcmlhIEtpcnN0ICA8dnJrQGdv b2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCkluZGV4OiBMYXlv dXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC90ZXh0dXJlLW5wb3QtZXhwZWN0ZWQudHh0Cj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvY2FudmFzL3dlYmdsL3RleHR1cmUtbnBvdC1leHBl Y3RlZC50eHQJKHJldmlzaW9uIDY1MjE1KQorKysgTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2Vi Z2wvdGV4dHVyZS1ucG90LWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMSwxMiArMSwy OSBAQAotIFBBU1MgU2hvdWxkIGJlIG5vIGVycm9ycyBmcm9tIHNldHVwLgotUEFTUyBnbC50ZXhJ bWFnZTJEIHdpdGggTlBPVCB0ZXh0dXJlIHdpdGggbGV2ZWwgPiAwIHNob3VsZCByZXR1cm4gSU5W QUxJRF9WQUxVRQotUEFTUyBnbC50ZXhJbWFnZTJEIHdpdGggTlBPVCB0ZXh0dXJlIGF0IGxldmVs IDAgc2hvdWxkIHN1Y2NlZWQKLVBBU1MgZ2wuZ2VuZXJhdGVNaXBtYXAgd2l0aCBOUE9UIHRleHR1 cmUgc2hvdWxkIHJldHVybiBJTlZBTElEX09QRVJBVElPTgorIFBBU1MgZ2V0RXJyb3Igd2FzIGV4 cGVjdGVkIHZhbHVlOiBOT19FUlJPUiA6IFNob3VsZCBiZSBubyBlcnJvcnMgZnJvbSBzZXR1cC4K K1BBU1MgZ2V0RXJyb3Igd2FzIGV4cGVjdGVkIHZhbHVlOiBJTlZBTElEX1ZBTFVFIDogZ2wudGV4 SW1hZ2UyRCB3aXRoIE5QT1QgdGV4dHVyZSB3aXRoIGxldmVsID4gMCBzaG91bGQgcmV0dXJuIElO VkFMSURfVkFMVUUKK1BBU1MgZ2V0RXJyb3Igd2FzIGV4cGVjdGVkIHZhbHVlOiBOT19FUlJPUiA6 IGdsLnRleEltYWdlMkQgd2l0aCBOUE9UIHRleHR1cmUgYXQgbGV2ZWwgMCBzaG91bGQgc3VjY2Vl ZAorUEFTUyBnZXRFcnJvciB3YXMgZXhwZWN0ZWQgdmFsdWU6IElOVkFMSURfT1BFUkFUSU9OIDog Z2wuZ2VuZXJhdGVNaXBtYXAgd2l0aCBOUE9UIHRleHR1cmUgc2hvdWxkIHJldHVybiBJTlZBTElE X09QRVJBVElPTgogUEFTUyBOUE9UIHRleHR1cmUgd2l0aCBURVhUVVJFX1dSQVAgc2V0IHRvIFJF UEVBVCBzaG91bGQgZHJhdyB3aXRoIDAsMCwwLDI1NQotUEFTUyBTaG91bGQgYmUgbm8gZXJyb3Jz IGZyb20gc2V0dXAuCitQQVNTIGdldEVycm9yIHdhcyBleHBlY3RlZCB2YWx1ZTogTk9fRVJST1Ig OiBTaG91bGQgYmUgbm8gZXJyb3JzIGZyb20gc2V0dXAuCiBQQVNTIE5QT1QgdGV4dHVyZSB3aXRo IFRFWFRVUkVfTUlOX0ZJTFRFUiBub3QgTkVBUkVTVCBvciBMSU5FQVIgc2hvdWxkIGRyYXcgd2l0 aCAwLDAsMCwyNTUKLVBBU1MgU2hvdWxkIGJlIG5vIGVycm9ycyBmcm9tIHNldHVwLgorUEFTUyBn ZXRFcnJvciB3YXMgZXhwZWN0ZWQgdmFsdWU6IE5PX0VSUk9SIDogU2hvdWxkIGJlIG5vIGVycm9y cyBmcm9tIHNldHVwLgogUEFTUyBOUE9UIHRleHR1cmUgd2l0aCBURVhUVVJFX01JTl9GSUxURVIg c2V0IHRvIExJTkVBUiBzaG91bGQgZHJhdy4KK1BBU1MgZ2V0RXJyb3Igd2FzIGV4cGVjdGVkIHZh bHVlOiBJTlZBTElEX1ZBTFVFIDogY29weVRleEltYWdlMkQgd2l0aCBOUE9UIHRleHR1cmUgd2l0 aCBsZXZlbCA+IDAgc2hvdWxkIHJldHVybiBJTlZBTElEX1ZBTFVFLgorUEFTUyBnZXRFcnJvciB3 YXMgZXhwZWN0ZWQgdmFsdWU6IE5PX0VSUk9SIDogZ2wudGV4SW1hZ2UyRCBhbmQgZ2wuZ2VuZXJh dGVNaXBtYXAgd2l0aCBQT1QgdGV4dHVyZSBhdCBsZXZlbCAwIHNob3VsZCBzdWNjZWVkCitQQVNT IFBPVCB0ZXh0dXJlIHdpdGggVEVYVFVSRV9NSU5fRklMVEVSIHNldCB0byBMSU5FQVJfTUlQTUFQ X0xJTkVBUiBzaG91bGQgZHJhdy4KK1BBU1MgZ2V0RXJyb3Igd2FzIGV4cGVjdGVkIHZhbHVlOiBO T19FUlJPUiA6IFNob3VsZCBiZSBubyBlcnJvcnMgZnJvbSBzZXR1cC4KKworY2hlY2sgdXNpbmcg Y3ViZW1hcAorUEFTUyBnZXRFcnJvciB3YXMgZXhwZWN0ZWQgdmFsdWU6IElOVkFMSURfVkFMVUUg OiBnbC50ZXhJbWFnZTJEIHdpdGggTlBPVCB0ZXh0dXJlIHdpdGggbGV2ZWwgPiAwIHNob3VsZCBy ZXR1cm4gSU5WQUxJRF9WQUxVRQorUEFTUyBnZXRFcnJvciB3YXMgZXhwZWN0ZWQgdmFsdWU6IE5P X0VSUk9SIDogZ2wudGV4SW1hZ2UyRCB3aXRoIE5QT1QgdGV4dHVyZSBhdCBsZXZlbCAwIHNob3Vs ZCBzdWNjZWVkCitQQVNTIGdldEVycm9yIHdhcyBleHBlY3RlZCB2YWx1ZTogSU5WQUxJRF9PUEVS QVRJT04gOiBnbC5nZW5lcmF0ZU1pcG1hcCB3aXRoIE5QT1QgdGV4dHVyZSBzaG91bGQgcmV0dXJu IElOVkFMSURfT1BFUkFUSU9OCitQQVNTIE5QT1QgY3ViZW1hcCB3aXRoIFRFWFRVUkVfV1JBUCBz ZXQgdG8gUkVQRUFUIHNob3VsZCBkcmF3IHdpdGggMCwwLDAsMjU1CitQQVNTIGdldEVycm9yIHdh cyBleHBlY3RlZCB2YWx1ZTogTk9fRVJST1IgOiBTaG91bGQgYmUgbm8gZXJyb3JzIGZyb20gc2V0 dXAuCitQQVNTIE5QT1QgY3ViZW1hcCB3aXRoIFRFWFRVUkVfTUlOX0ZJTFRFUiBub3QgTkVBUkVT VCBvciBMSU5FQVIgc2hvdWxkIGRyYXcgd2l0aCAwLDAsMCwyNTUKK1BBU1MgZ2V0RXJyb3Igd2Fz IGV4cGVjdGVkIHZhbHVlOiBOT19FUlJPUiA6IFNob3VsZCBiZSBubyBlcnJvcnMgZnJvbSBzZXR1 cC4KK1BBU1MgTlBPVCBjdWJlbWFwIHdpdGggVEVYVFVSRV9NSU5fRklMVEVSIHNldCB0byBMSU5F QVIgc2hvdWxkIGRyYXcuCitQQVNTIGdldEVycm9yIHdhcyBleHBlY3RlZCB2YWx1ZTogTk9fRVJS T1IgOiBnbC50ZXhJbWFnZTJEIHdpdGggUE9UIHRleHR1cmUgYXQgbGV2ZWwgMCBzaG91bGQgc3Vj Y2VlZAorUEFTUyBQT1QgY3ViZW1hcCB3aXRoIFRFWFRVUkVfTUlOX0ZJTFRFUiBzZXQgdG8gTElO RUFSX01JUE1BUF9MSU5FQVIgYnV0IG5vIG1pcHMgZHJhdyB3aXRoIDAsMCwwLDI1NQorUEFTUyBn ZXRFcnJvciB3YXMgZXhwZWN0ZWQgdmFsdWU6IE5PX0VSUk9SIDogZ2wuZ2VuZXJhdGVNaXBtYXAg d2l0aCBQT1QgdGV4dHVyZSBzaG91bGQgcmV0dXJuIHN1Y2NlZWQKIFBBU1Mgc3VjY2Vzc2Z1bGx5 UGFyc2VkIGlzIHRydWUKIAogVEVTVCBDT01QTEVURQpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9j YW52YXMvd2ViZ2wvdGV4dHVyZS1ucG90Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMv ZmFzdC9jYW52YXMvd2ViZ2wvdGV4dHVyZS1ucG90Lmh0bWwJKHJldmlzaW9uIDY1MjE1KQorKysg TGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvdGV4dHVyZS1ucG90Lmh0bWwJKHdvcmtpbmcg Y29weSkKQEAgLTEyLDMwICsxMiw1MiBAQAogPGNhbnZhcyBpZD0iZXhhbXBsZSIgd2lkdGg9IjQi IGhlaWdodD0iNCIgc3R5bGU9IndpZHRoOiA0MHB4OyBoZWlnaHQ6IDMwcHg7Ij48L2NhbnZhcz4K IDxkaXYgaWQ9ImRlc2NyaXB0aW9uIj48L2Rpdj4KIDxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2Pgor PHNjcmlwdCBpZD0idnNoYWRlciIgdHlwZT0ieC1zaGFkZXIveC12ZXJ0ZXgiPgorYXR0cmlidXRl IHZlYzQgdlBvc2l0aW9uOworYXR0cmlidXRlIHZlYzIgdGV4Q29vcmQwOwordmFyeWluZyB2ZWMy IHRleENvb3JkOwordm9pZCBtYWluKCkKK3sKKyAgICBnbF9Qb3NpdGlvbiA9IHZQb3NpdGlvbjsK KyAgICB0ZXhDb29yZCA9IHRleENvb3JkMDsKK30KKzwvc2NyaXB0PgorCis8c2NyaXB0IGlkPSJm c2hhZGVyIiB0eXBlPSJ4LXNoYWRlci94LWZyYWdtZW50Ij4KKyNpZmRlZiBHTF9FUworcHJlY2lz aW9uIG1lZGl1bXAgZmxvYXQ7CisjZW5kaWYKK3VuaWZvcm0gc2FtcGxlckN1YmUgdGV4OwordmFy eWluZyB2ZWMyIHRleENvb3JkOwordm9pZCBtYWluKCkKK3sKKyAgICBnbF9GcmFnQ29sb3IgPSB0 ZXh0dXJlQ3ViZSh0ZXgsIG5vcm1hbGl6ZSh2ZWMzKHRleENvb3JkLCAxKSkpOworfQorPC9zY3Jp cHQ+CiA8c2NyaXB0PgogdmFyIHd0dSA9IFdlYkdMVGVzdFV0aWxzOwogdmFyIGNhbnZhcyA9IGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCJleGFtcGxlIik7CiB2YXIgZ2wgPSB3dHUuY3JlYXRlM0RD b250ZXh0KGNhbnZhcyk7CiB2YXIgcHJvZ3JhbSA9IHd0dS5zZXR1cFRleHR1cmVkUXVhZChnbCk7 CiAKLWFzc2VydE1zZyhnbC5nZXRFcnJvcigpID09IGdsLk5PX0VSUk9SLCAiU2hvdWxkIGJlIG5v IGVycm9ycyBmcm9tIHNldHVwLiIpOworZ2xFcnJvclNob3VsZEJlKGdsLCBnbC5OT19FUlJPUiwg IlNob3VsZCBiZSBubyBlcnJvcnMgZnJvbSBzZXR1cC4iKTsKIAogdmFyIHRleCA9IGdsLmNyZWF0 ZVRleHR1cmUoKTsKIAogLy8gQ2hlY2sgdGhhdCBhbiBOUE9UIHRleHR1cmUgbm90IG9uIGxldmVs IDAgZ2VuZXJhdGVzIElOVkFMSURfVkFMVUUKIHd0dS5maWxsVGV4dHVyZShnbCwgdGV4LCA1LCAz LCBbMCwgMTkyLCAxMjgsIDI1NV0sIDEpOwotYXNzZXJ0TXNnKGdsLmdldEVycm9yKCkgPT0gZ2wu SU5WQUxJRF9WQUxVRSwKLSAgICAgICAgICAiZ2wudGV4SW1hZ2UyRCB3aXRoIE5QT1QgdGV4dHVy ZSB3aXRoIGxldmVsID4gMCBzaG91bGQgcmV0dXJuIElOVkFMSURfVkFMVUUiKTsKK2dsRXJyb3JT aG91bGRCZShnbCwgZ2wuSU5WQUxJRF9WQUxVRSwKKyAgICAiZ2wudGV4SW1hZ2UyRCB3aXRoIE5Q T1QgdGV4dHVyZSB3aXRoIGxldmVsID4gMCBzaG91bGQgcmV0dXJuIElOVkFMSURfVkFMVUUiKTsK IAogLy8gQ2hlY2sgdGhhdCBhbiBOUE9UIHRleHR1cmUgb24gbGV2ZWwgMCBzdWNjZWVkcwogd3R1 LmZpbGxUZXh0dXJlKGdsLCB0ZXgsIDUsIDMsIFswLCAxOTIsIDEyOCwgMjU1XSk7Ci1hc3NlcnRN c2coZ2wuZ2V0RXJyb3IoKSA9PSBnbC5OT19FUlJPUiwKLSAgICAgICAgICAiZ2wudGV4SW1hZ2Uy RCB3aXRoIE5QT1QgdGV4dHVyZSBhdCBsZXZlbCAwIHNob3VsZCBzdWNjZWVkIik7CitnbEVycm9y U2hvdWxkQmUoZ2wsIGdsLk5PX0VSUk9SLAorICAgICJnbC50ZXhJbWFnZTJEIHdpdGggTlBPVCB0 ZXh0dXJlIGF0IGxldmVsIDAgc2hvdWxkIHN1Y2NlZWQiKTsKIAogLy8gQ2hlY2sgdGhhdCBnZW5l cmF0ZU1pcG1hcCBmYWlscyBvbiBOUE9UCiBnbC5nZW5lcmF0ZU1pcG1hcChnbC5URVhUVVJFXzJE KTsKLWFzc2VydE1zZyhnbC5nZXRFcnJvcigpID09IGdsLklOVkFMSURfT1BFUkFUSU9OLAotICAg ICAgICAgICJnbC5nZW5lcmF0ZU1pcG1hcCB3aXRoIE5QT1QgdGV4dHVyZSBzaG91bGQgcmV0dXJu IElOVkFMSURfT1BFUkFUSU9OIik7CitnbEVycm9yU2hvdWxkQmUoZ2wsIGdsLklOVkFMSURfT1BF UkFUSU9OLAorICAgICJnbC5nZW5lcmF0ZU1pcG1hcCB3aXRoIE5QT1QgdGV4dHVyZSBzaG91bGQg cmV0dXJuIElOVkFMSURfT1BFUkFUSU9OIik7CiAKIHZhciBsb2MgPSBnbC5nZXRVbmlmb3JtTG9j YXRpb24ocHJvZ3JhbSwgInRleCIpOwogZ2wudW5pZm9ybTFpKGxvYywgMCk7CkBAIC01MCw3ICs3 Miw3IEBAIHd0dS5kcmF3UXVhZChnbCk7CiB3dHUuY2hlY2tDYW52YXMoCiAgICAgZ2wsIFswLCAw LCAwLCAyNTVdLAogICAgICJOUE9UIHRleHR1cmUgd2l0aCBURVhUVVJFX1dSQVAgc2V0IHRvIFJF UEVBVCBzaG91bGQgZHJhdyB3aXRoIDAsMCwwLDI1NSIpOwotYXNzZXJ0TXNnKGdsLmdldEVycm9y KCkgPT0gZ2wuTk9fRVJST1IsICJTaG91bGQgYmUgbm8gZXJyb3JzIGZyb20gc2V0dXAuIik7Citn bEVycm9yU2hvdWxkQmUoZ2wsIGdsLk5PX0VSUk9SLCAiU2hvdWxkIGJlIG5vIGVycm9ycyBmcm9t IHNldHVwLiIpOwogCiBnbC50ZXhQYXJhbWV0ZXJpKGdsLlRFWFRVUkVfMkQsIGdsLlRFWFRVUkVf V1JBUF9TLCBnbC5DTEFNUF9UT19FREdFKTsKIGdsLnRleFBhcmFtZXRlcmkoZ2wuVEVYVFVSRV8y RCwgZ2wuVEVYVFVSRV9XUkFQX1QsIGdsLkNMQU1QX1RPX0VER0UpOwpAQCAtNjAsNyArODIsNyBA QCB3dHUuZHJhd1F1YWQoZ2wpOwogd3R1LmNoZWNrQ2FudmFzKAogICAgIGdsLCBbMCwgMCwgMCwg MjU1XSwKICAgICAiTlBPVCB0ZXh0dXJlIHdpdGggVEVYVFVSRV9NSU5fRklMVEVSIG5vdCBORUFS RVNUIG9yIExJTkVBUiBzaG91bGQgZHJhdyB3aXRoIDAsMCwwLDI1NSIpOwotYXNzZXJ0TXNnKGds LmdldEVycm9yKCkgPT0gZ2wuTk9fRVJST1IsICJTaG91bGQgYmUgbm8gZXJyb3JzIGZyb20gc2V0 dXAuIik7CitnbEVycm9yU2hvdWxkQmUoZ2wsIGdsLk5PX0VSUk9SLCAiU2hvdWxkIGJlIG5vIGVy cm9ycyBmcm9tIHNldHVwLiIpOwogCiBnbC50ZXhQYXJhbWV0ZXJpKGdsLlRFWFRVUkVfMkQsIGds LlRFWFRVUkVfTUlOX0ZJTFRFUiwgZ2wuTElORUFSKTsKIApAQCAtNjksNyArOTEsMTMzIEBAIHd0 dS5jaGVja0NhbnZhcygKICAgICBnbCwgWzAsIDE5MiwgMTI4LCAyNTVdLAogICAgICJOUE9UIHRl eHR1cmUgd2l0aCBURVhUVVJFX01JTl9GSUxURVIgc2V0IHRvIExJTkVBUiBzaG91bGQgZHJhdy4i KTsKIAorZ2wuY29weVRleEltYWdlMkQoZ2wuVEVYVFVSRV8yRCwgMSwgZ2wuUkdCQSwgMCwgMCwg NSwgMywgMCk7CitnbEVycm9yU2hvdWxkQmUoZ2wsIGdsLklOVkFMSURfVkFMVUUsCisgICAgImNv cHlUZXhJbWFnZTJEIHdpdGggTlBPVCB0ZXh0dXJlIHdpdGggbGV2ZWwgPiAwIHNob3VsZCByZXR1 cm4gSU5WQUxJRF9WQUxVRS4iKTsKKworLy8gQ2hlY2sgdGhhdCBnZW5lcmF0ZU1pcG1hcCBmb3Ig YW4gUE9UIHRleHR1cmUgc3VjY2VlZHMKK3d0dS5maWxsVGV4dHVyZShnbCwgdGV4LCA0LCA0LCBb MCwgMTkyLCAxMjgsIDI1NV0pOworZ2wuZ2VuZXJhdGVNaXBtYXAoZ2wuVEVYVFVSRV8yRCk7Citn bEVycm9yU2hvdWxkQmUoZ2wsIGdsLk5PX0VSUk9SLAorICAgICJnbC50ZXhJbWFnZTJEIGFuZCBn bC5nZW5lcmF0ZU1pcG1hcCB3aXRoIFBPVCB0ZXh0dXJlIGF0IGxldmVsIDAgc2hvdWxkIHN1Y2Nl ZWQiKTsKKworZ2wudGV4UGFyYW1ldGVyaShnbC5URVhUVVJFXzJELCBnbC5URVhUVVJFX01JTl9G SUxURVIsIGdsLkxJTkVBUl9NSVBNQVBfTElORUFSKTsKK2dsLnRleFBhcmFtZXRlcmkoZ2wuVEVY VFVSRV8yRCwgZ2wuVEVYVFVSRV9NQUdfRklMVEVSLCBnbC5MSU5FQVIpOworZ2wudGV4UGFyYW1l dGVyaShnbC5URVhUVVJFXzJELCBnbC5URVhUVVJFX1dSQVBfUywgZ2wuUkVQRUFUKTsKK2dsLnRl eFBhcmFtZXRlcmkoZ2wuVEVYVFVSRV8yRCwgZ2wuVEVYVFVSRV9XUkFQX1QsIGdsLlJFUEVBVCk7 CisKK3d0dS5kcmF3UXVhZChnbCk7Cit3dHUuY2hlY2tDYW52YXMoCisgICAgZ2wsIFswLCAxOTIs IDEyOCwgMjU1XSwKKyAgICAiUE9UIHRleHR1cmUgd2l0aCBURVhUVVJFX01JTl9GSUxURVIgc2V0 IHRvIExJTkVBUl9NSVBNQVBfTElORUFSIHNob3VsZCBkcmF3LiIpOworZ2xFcnJvclNob3VsZEJl KGdsLCBnbC5OT19FUlJPUiwgIlNob3VsZCBiZSBubyBlcnJvcnMgZnJvbSBzZXR1cC4iKTsKKwor ZGVidWcoIiIpOworZGVidWcoImNoZWNrIHVzaW5nIGN1YmVtYXAiKTsKK3ZhciBwcm9ncmFtID0g d3R1LnNldHVwUHJvZ3JhbSgKKyAgICBnbCwKKyAgICBbd3R1LmxvYWRTaGFkZXJGcm9tU2NyaXB0 KGdsLCAndnNoYWRlcicsIGdsLlZFUlRFWF9TSEFERVIpLAorICAgICB3dHUubG9hZFNoYWRlckZy b21TY3JpcHQoZ2wsICdmc2hhZGVyJywgZ2wuRlJBR01FTlRfU0hBREVSKV0sCisgICAgWyd2UG9z aXRpb24nLCAndGV4Q29vcmQwJ10sIFswLCAxXSk7Cit2YXIgdGV4ID0gZ2wuY3JlYXRlVGV4dHVy ZSgpOworCisvLyBDaGVjayB0aGF0IGFuIE5QT1QgdGV4dHVyZSBub3Qgb24gbGV2ZWwgMCBnZW5l cmF0ZXMgSU5WQUxJRF9WQUxVRQorZmlsbEN1YmVUZXh0dXJlKGdsLCB0ZXgsIDUsIDMsIFswLCAx OTIsIDEyOCwgMjU1XSwgMSk7CitnbEVycm9yU2hvdWxkQmUoZ2wsIGdsLklOVkFMSURfVkFMVUUs CisgICAgImdsLnRleEltYWdlMkQgd2l0aCBOUE9UIHRleHR1cmUgd2l0aCBsZXZlbCA+IDAgc2hv dWxkIHJldHVybiBJTlZBTElEX1ZBTFVFIik7CisKKy8vIENoZWNrIHRoYXQgYW4gTlBPVCB0ZXh0 dXJlIG9uIGxldmVsIDAgc3VjY2VlZHMKK2ZpbGxDdWJlVGV4dHVyZShnbCwgdGV4LCA1LCA1LCBb MCwgMTkyLCAxMjgsIDI1NV0pOworZ2xFcnJvclNob3VsZEJlKGdsLCBnbC5OT19FUlJPUiwKKyAg ICAiZ2wudGV4SW1hZ2UyRCB3aXRoIE5QT1QgdGV4dHVyZSBhdCBsZXZlbCAwIHNob3VsZCBzdWNj ZWVkIik7CisKKy8vIENoZWNrIHRoYXQgZ2VuZXJhdGVNaXBtYXAgZmFpbHMgb24gTlBPVAorZ2wu Z2VuZXJhdGVNaXBtYXAoZ2wuVEVYVFVSRV9DVUJFX01BUCk7CitnbEVycm9yU2hvdWxkQmUoZ2ws IGdsLklOVkFMSURfT1BFUkFUSU9OLAorICAgICJnbC5nZW5lcmF0ZU1pcG1hcCB3aXRoIE5QT1Qg dGV4dHVyZSBzaG91bGQgcmV0dXJuIElOVkFMSURfT1BFUkFUSU9OIik7CisKK3ZhciBsb2MgPSBn bC5nZXRVbmlmb3JtTG9jYXRpb24ocHJvZ3JhbSwgInRleCIpOworZ2wudW5pZm9ybTFpKGxvYywg MCk7CisKKy8vIENoZWNrIHRoYXQgbm90aGluZyBpcyBkcmF3biBpZiBmaWx0ZXJpbmcgaXMgbm90 IGNvcnJlY3QgZm9yIE5QT1QKK2dsLnRleFBhcmFtZXRlcmkoZ2wuVEVYVFVSRV9DVUJFX01BUCwg Z2wuVEVYVFVSRV9NSU5fRklMVEVSLCBnbC5ORUFSRVNUKTsKK2dsLnRleFBhcmFtZXRlcmkoZ2wu VEVYVFVSRV9DVUJFX01BUCwgZ2wuVEVYVFVSRV9NQUdfRklMVEVSLCBnbC5ORUFSRVNUKTsKK2ds LnRleFBhcmFtZXRlcmkoZ2wuVEVYVFVSRV9DVUJFX01BUCwgZ2wuVEVYVFVSRV9XUkFQX1MsIGds LlJFUEVBVCk7CitnbC50ZXhQYXJhbWV0ZXJpKGdsLlRFWFRVUkVfQ1VCRV9NQVAsIGdsLlRFWFRV UkVfV1JBUF9ULCBnbC5SRVBFQVQpOworCit3dHUuZHJhd1F1YWQoZ2wpOword3R1LmNoZWNrQ2Fu dmFzKAorICAgIGdsLCBbMCwgMCwgMCwgMjU1XSwKKyAgICAiTlBPVCBjdWJlbWFwIHdpdGggVEVY VFVSRV9XUkFQIHNldCB0byBSRVBFQVQgc2hvdWxkIGRyYXcgd2l0aCAwLDAsMCwyNTUiKTsKK2ds RXJyb3JTaG91bGRCZShnbCwgZ2wuTk9fRVJST1IsICJTaG91bGQgYmUgbm8gZXJyb3JzIGZyb20g c2V0dXAuIik7CisKK2dsLnRleFBhcmFtZXRlcmkoZ2wuVEVYVFVSRV9DVUJFX01BUCwgZ2wuVEVY VFVSRV9XUkFQX1MsIGdsLkNMQU1QX1RPX0VER0UpOworZ2wudGV4UGFyYW1ldGVyaShnbC5URVhU VVJFX0NVQkVfTUFQLCBnbC5URVhUVVJFX1dSQVBfVCwgZ2wuQ0xBTVBfVE9fRURHRSk7CitnbC50 ZXhQYXJhbWV0ZXJpKGdsLlRFWFRVUkVfQ1VCRV9NQVAsIGdsLlRFWFRVUkVfTUlOX0ZJTFRFUiwg Z2wuTkVBUkVTVF9NSVBNQVBfTElORUFSKTsKKword3R1LmRyYXdRdWFkKGdsKTsKK3d0dS5jaGVj a0NhbnZhcygKKyAgICBnbCwgWzAsIDAsIDAsIDI1NV0sCisgICAgIk5QT1QgY3ViZW1hcCB3aXRo IFRFWFRVUkVfTUlOX0ZJTFRFUiBub3QgTkVBUkVTVCBvciBMSU5FQVIgc2hvdWxkIGRyYXcgd2l0 aCAwLDAsMCwyNTUiKTsKK2dsRXJyb3JTaG91bGRCZShnbCwgZ2wuTk9fRVJST1IsICJTaG91bGQg YmUgbm8gZXJyb3JzIGZyb20gc2V0dXAuIik7CisKK2dsLnRleFBhcmFtZXRlcmkoZ2wuVEVYVFVS RV9DVUJFX01BUCwgZ2wuVEVYVFVSRV9NSU5fRklMVEVSLCBnbC5MSU5FQVIpOworCit3dHUuZHJh d1F1YWQoZ2wpOword3R1LmNoZWNrQ2FudmFzKAorICAgIGdsLCBbMCwgMTkyLCAxMjgsIDI1NV0s CisgICAgIk5QT1QgY3ViZW1hcCB3aXRoIFRFWFRVUkVfTUlOX0ZJTFRFUiBzZXQgdG8gTElORUFS IHNob3VsZCBkcmF3LiIpOworCisvLyBDaGVjayB0aGF0IGFuIFBPVCB0ZXh0dXJlIG9uIGxldmVs IDAgc3VjY2VlZHMKK2ZpbGxDdWJlVGV4dHVyZShnbCwgdGV4LCA0LCA0LCBbMCwgMTkyLCAxMjgs IDI1NV0pOworZ2xFcnJvclNob3VsZEJlKGdsLCBnbC5OT19FUlJPUiwKKyAgICAiZ2wudGV4SW1h Z2UyRCB3aXRoIFBPVCB0ZXh0dXJlIGF0IGxldmVsIDAgc2hvdWxkIHN1Y2NlZWQiKTsKKworZ2wu dGV4UGFyYW1ldGVyaShnbC5URVhUVVJFX0NVQkVfTUFQLCBnbC5URVhUVVJFX01JTl9GSUxURVIs IGdsLkxJTkVBUl9NSVBNQVBfTElORUFSKTsKK2dsLnRleFBhcmFtZXRlcmkoZ2wuVEVYVFVSRV9D VUJFX01BUCwgZ2wuVEVYVFVSRV9NQUdfRklMVEVSLCBnbC5MSU5FQVIpOworZ2wudGV4UGFyYW1l dGVyaShnbC5URVhUVVJFX0NVQkVfTUFQLCBnbC5URVhUVVJFX1dSQVBfUywgZ2wuUkVQRUFUKTsK K2dsLnRleFBhcmFtZXRlcmkoZ2wuVEVYVFVSRV9DVUJFX01BUCwgZ2wuVEVYVFVSRV9XUkFQX1Qs IGdsLlJFUEVBVCk7CisKK3d0dS5kcmF3UXVhZChnbCk7Cit3dHUuY2hlY2tDYW52YXMoCisgICAg Z2wsIFswLCAwLCAwLCAyNTVdLAorICAgICJQT1QgY3ViZW1hcCB3aXRoIFRFWFRVUkVfTUlOX0ZJ TFRFUiBzZXQgdG8gTElORUFSX01JUE1BUF9MSU5FQVIgYnV0IG5vIG1pcHMgZHJhdyB3aXRoIDAs MCwwLDI1NSIpOworCisvLyBDaGVjayB0aGF0IGdlbmVyYXRlTWlwbWFwIHN1Y2NlZWRzIG9uIFBP VAorZ2wuZ2VuZXJhdGVNaXBtYXAoZ2wuVEVYVFVSRV9DVUJFX01BUCk7CitnbEVycm9yU2hvdWxk QmUoZ2wsIGdsLk5PX0VSUk9SLAorICAgICJnbC5nZW5lcmF0ZU1pcG1hcCB3aXRoIFBPVCB0ZXh0 dXJlIHNob3VsZCByZXR1cm4gc3VjY2VlZCIpOworCisvLyBGSVhNRTogYWRkIHRoZSB0ZXN0IGJh Y2sgb25jZSB0aGUgYnVnIGlzIGZpeGVkLgorLy93dHUuZHJhd1F1YWQoZ2wpOworLy93dHUuY2hl Y2tDYW52YXMoCisvLyAgICBnbCwgWzAsIDE5MiwgMTI4LCAyNTVdLAorLy8gICAgIlBPVCBjdWJl bWFwIHdpdGggVEVYVFVSRV9NSU5fRklMVEVSIHNldCB0byBMSU5FQVJfTUlQTUFQX0xJTkVBUiBz aG91bGQgZHJhdy4iKTsKKwogc3VjY2Vzc2Z1bGx5UGFyc2VkID0gdHJ1ZTsKKworZnVuY3Rpb24g ZmlsbEN1YmVUZXh0dXJlKGdsLCB0ZXgsIHdpZHRoLCBoZWlnaHQsIGNvbG9yLCBvcHRfbGV2ZWwp IHsKKyAgb3B0X2xldmVsID0gb3B0X2xldmVsIHx8IDA7CisgIHZhciBjYW52YXMgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCdjYW52YXMnKTsKKyAgY2FudmFzLndpZHRoID0gd2lkdGg7CisgIGNh bnZhcy5oZWlnaHQgPSBoZWlnaHQ7CisgIHZhciBjdHgyZCA9IGNhbnZhcy5nZXRDb250ZXh0KCcy ZCcpOworICBjdHgyZC5maWxsU3R5bGUgPSAicmdiYSgiICsgY29sb3JbMF0gKyAiLCIgKyBjb2xv clsxXSArICIsIiArIGNvbG9yWzJdICsgIiwiICsgY29sb3JbM10gKyAiKSI7CisgIGN0eDJkLmZp bGxSZWN0KDAsIDAsIHdpZHRoLCBoZWlnaHQpOworICBnbC5iaW5kVGV4dHVyZShnbC5URVhUVVJF X0NVQkVfTUFQLCB0ZXgpOworICB2YXIgdGFyZ2V0cyA9IFsKKyAgICBnbC5URVhUVVJFX0NVQkVf TUFQX1BPU0lUSVZFX1gsCisgICAgZ2wuVEVYVFVSRV9DVUJFX01BUF9ORUdBVElWRV9YLAorICAg IGdsLlRFWFRVUkVfQ1VCRV9NQVBfUE9TSVRJVkVfWSwKKyAgICBnbC5URVhUVVJFX0NVQkVfTUFQ X05FR0FUSVZFX1ksCisgICAgZ2wuVEVYVFVSRV9DVUJFX01BUF9QT1NJVElWRV9aLAorICAgIGds LlRFWFRVUkVfQ1VCRV9NQVBfTkVHQVRJVkVfWl07CisgIGZvciAodmFyIHR0ID0gMDsgdHQgPCB0 YXJnZXRzLmxlbmd0aDsgKyt0dCkgeworICAgIGdsLnRleEltYWdlMkQoCisgICAgICAgIHRhcmdl dHNbdHRdLCBvcHRfbGV2ZWwsIGdsLlJHQkEsIGdsLlJHQkEsIGdsLlVOU0lHTkVEX0JZVEUsIGNh bnZhcyk7CisgIH0KK307CisKIDwvc2NyaXB0PgogPC9ib2R5PgogPHNjcmlwdCBzcmM9Ii4uLy4u L2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0Pgo=