74416 2011-12-13 09:15:29 -0800 [CSS Shaders] Report the errors generated when compiling and linking the shaders 2014-03-02 08:59:04 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED INVALID P2 Normal --- 71392 74887 1 achicu webkit-unassigned commit-queue dino esprehn+autocc glenn jnetterfield kondapallykalyan krit michelangelo mkwst simon.fraser oldest_to_newest 520120 0 achicu 2011-12-13 09:15:29 -0800 Find a way to report the errors back to the developer console. It should help debugging the shaders. 914348 1 208057 ralpht+bugs 2013-08-02 23:21:16 -0700 Created attachment 208057 Patch 914349 2 208057 ralpht+bugs 2013-08-02 23:23:27 -0700 Comment on attachment 208057 Patch I'd like to figure out how to get the file name and correctly propagate the line number through to the console before getting a review on this. Hopefully ANGLE surfaces that in a nice way. 919736 3 208057 buildbot 2013-08-21 22:35:56 -0700 Comment on attachment 208057 Patch Attachment 208057 did not pass win-ews (win): Output: http://webkit-queues.appspot.com/results/1530049 208057 2013-08-02 23:21:16 -0700 2013-08-21 22:35:56 -0700 Patch bug-74416-20130802232116.patch text/plain 9986 ralpht+bugs U3VidmVyc2lvbiBSZXZpc2lvbjogMTUzNjg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWYxMThmYmVhZDRmZDky NWNhZWZjOGRkNjNkYTQ4YmU5ZTgzYTM2Yi4uYWNlZTRhZGU5MjJhOWE2ZjIyNjFkMDM2ZjhhY2U1 YTJlY2I5ZDE2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTA4LTAyICBSYWxw aCBUaG9tYXMgIDxyYWxwaHRAZ21haWwuY29tPgorCisgICAgICAgIFtDU1MgU2hhZGVyc10gUmVw b3J0IHRoZSBlcnJvcnMgZ2VuZXJhdGVkIHdoZW4gY29tcGlsaW5nIGFuZCBsaW5raW5nIHRoZSBz aGFkZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03 NDQxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl cG9ydCB0aGUgZXJyb3JzIHRvIHRoZSBwYWdlJ3MgY29uc29sZS4gTGluZSBudW1iZXJzIGFuZCBz b3VyY2UgZmlsZXMgYXJlIG5vdCB5ZXQgcGFzc2VkIHRocm91Z2guCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0N1c3RvbUZpbHRlclZhbGlkYXRlZFByb2dyYW0uY3BwOgor ICAgICAgICAoV2ViQ29yZTo6dmFsaWRhdGVTeW1ib2xzKToKKyAgICAgICAgKFdlYkNvcmU6OkN1 c3RvbUZpbHRlclZhbGlkYXRlZFByb2dyYW06OkN1c3RvbUZpbHRlclZhbGlkYXRlZFByb2dyYW0p OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvQ3VzdG9tRmlsdGVyVmFsaWRh dGVkUHJvZ3JhbS5oOgorICAgICAgICAoV2ViQ29yZTo6Q3VzdG9tRmlsdGVyVmFsaWRhdGVkUHJv Z3JhbTo6Y3JlYXRlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmNvbXB1dGVGaWx0ZXJPcGVyYXRpb25zKToKKwog MjAxMy0wOC0wMiAgR3l1eW91bmcgS2ltICA8Z3l1eW91bmcua2ltQHNhbXN1bmcuY29tPgogCiAg ICAgICAgIEludHJvZHVjZSB0b1NWR01hc2tFbGVtZW50KCksIGFuZCB1c2UgaXQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvQ3VzdG9tRmlsdGVy VmFsaWRhdGVkUHJvZ3JhbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9m aWx0ZXJzL0N1c3RvbUZpbHRlclZhbGlkYXRlZFByb2dyYW0uY3BwCmluZGV4IDc3MGE1ZTVlNTFj OTlmMzE1Yzc3Y2ZhODVlMDZkYTY4ZDUwZDMyNGMuLmRhZTIzZWEyMWNhNGY0ZDQzYmUwMWU3YWY3 NjNlYWE5ZDVkMWU1NTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2ZpbHRlcnMvQ3VzdG9tRmlsdGVyVmFsaWRhdGVkUHJvZ3JhbS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9DdXN0b21GaWx0ZXJWYWxpZGF0ZWRQ cm9ncmFtLmNwcApAQCAtMzksNiArMzksNyBAQAogI2luY2x1ZGUgIkN1c3RvbUZpbHRlckdsb2Jh bENvbnRleHQuaCIKICNpbmNsdWRlICJDdXN0b21GaWx0ZXJQcm9ncmFtSW5mby5oIgogI2luY2x1 ZGUgIk5vdEltcGxlbWVudGVkLmgiCisjaW5jbHVkZSAiUGFnZUNvbnNvbGUuaCIKICNpbmNsdWRl IDx3dGYvSGFzaE1hcC5oPgogI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KICNpbmNsdWRlIDx3dGYv dGV4dC9TdHJpbmdCdWlsZGVyLmg+CkBAIC03Nyw3ICs3OCw3IEBAIHN0YXRpYyBTeW1ib2xOYW1l VG9UeXBlTWFwKiBidWlsdEluVW5pZm9ybU5hbWVUb1R5cGVNYXAoKQogICAgIHJldHVybiBuYW1l VG9UeXBlTWFwOwogfQogCi1zdGF0aWMgYm9vbCB2YWxpZGF0ZVN5bWJvbHMoY29uc3QgVmVjdG9y PEFOR0xFU2hhZGVyU3ltYm9sPiYgc3ltYm9scywgQ3VzdG9tRmlsdGVyTWVzaFR5cGUgbWVzaFR5 cGUpCitzdGF0aWMgYm9vbCB2YWxpZGF0ZVN5bWJvbHMoUGFnZUNvbnNvbGUqIGNvbnNvbGUsIGNv bnN0IFZlY3RvcjxBTkdMRVNoYWRlclN5bWJvbD4mIHN5bWJvbHMsIEN1c3RvbUZpbHRlck1lc2hU eXBlIG1lc2hUeXBlKQogewogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc3ltYm9scy5zaXpl KCk7ICsraSkgewogICAgICAgICBjb25zdCBBTkdMRVNoYWRlclN5bWJvbCYgc3ltYm9sID0gc3lt Ym9sc1tpXTsKQEAgLTg3LDIwICs4OCwyNCBAQCBzdGF0aWMgYm9vbCB2YWxpZGF0ZVN5bWJvbHMo Y29uc3QgVmVjdG9yPEFOR0xFU2hhZGVyU3ltYm9sPiYgc3ltYm9scywgQ3VzdG9tRmlsdAogICAg ICAgICAgICAgU3ltYm9sTmFtZVRvVHlwZU1hcDo6aXRlcmF0b3IgYnVpbHRJbkF0dHJpYnV0ZSA9 IGF0dHJpYnV0ZU5hbWVUb1R5cGVNYXAtPmZpbmQoc3ltYm9sLm5hbWUpOwogICAgICAgICAgICAg aWYgKGJ1aWx0SW5BdHRyaWJ1dGUgPT0gYXR0cmlidXRlTmFtZVRvVHlwZU1hcC0+ZW5kKCkpIHsK ICAgICAgICAgICAgICAgICAvLyBUaGUgYXV0aG9yIGRlZmluZWQgYSBjdXN0b20gYXR0cmlidXRl LgotICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBSZXBvcnQgdGhlIHZhbGlkYXRpb24gZXJyb3Iu Ci0gICAgICAgICAgICAgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTc0NDE2CisgICAgICAgICAgICAgICAgU3RyaW5nQnVpbGRlciBidWlsZGVyOworICAgICAg ICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kTGl0ZXJhbCgiVW5leHBlY3RlZCBjdXN0b20gYXR0cmli dXRlOiAiKTsKKyAgICAgICAgICAgICAgICBidWlsZGVyLmFwcGVuZChzeW1ib2wubmFtZSk7Cisg ICAgICAgICAgICAgICAgY29uc29sZS0+YWRkTWVzc2FnZShDU1NNZXNzYWdlU291cmNlLCBFcnJv ck1lc3NhZ2VMZXZlbCwgYnVpbGRlci50b1N0cmluZygpKTsKICAgICAgICAgICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAobWVzaFR5cGUgPT0gTWVz aFR5cGVBdHRhY2hlZCAmJiBzeW1ib2wubmFtZSA9PSAiYV90cmlhbmdsZUNvb3JkIikgewogICAg ICAgICAgICAgICAgIC8vIGFfdHJpYW5nbGVDb29yZCBpcyBvbmx5IGF2YWlsYWJsZSBmb3IgZGV0 YWNoZWQgbWVzaGVzLgotICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBSZXBvcnQgdGhlIHZhbGlk YXRpb24gZXJyb3IuCi0gICAgICAgICAgICAgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTc0NDE2CisgICAgICAgICAgICAgICAgY29uc29sZS0+YWRkTWVzc2Fn ZShDU1NNZXNzYWdlU291cmNlLCBFcnJvck1lc3NhZ2VMZXZlbCwgImF0dHJpYnV0ZSBhX3RyaWFu Z2xlQ29vcmQgaXMgb25seSBhdmFpbGFibGUgZm9yIGRldGFjaGVkIG1lc2hlcy4iKTsKICAgICAg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAo c3ltYm9sLmRhdGFUeXBlICE9IGJ1aWx0SW5BdHRyaWJ1dGUtPnZhbHVlKSB7CiAgICAgICAgICAg ICAgICAgLy8gVGhlIGF1dGhvciBkZWZpbmVkIG9uZSBvZiB0aGUgYnVpbHQtaW4gYXR0cmlidXRl cyB3aXRoIHRoZSB3cm9uZyB0eXBlLgotICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBSZXBvcnQg dGhlIHZhbGlkYXRpb24gZXJyb3IuCi0gICAgICAgICAgICAgICAgLy8gaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0NDE2CisgICAgICAgICAgICAgICAgU3RyaW5nQnVp bGRlciBidWlsZGVyOworICAgICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kTGl0ZXJhbCgiYXR0 cmlidXRlICIpOworICAgICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKHN5bWJvbC5uYW1lKTsK KyAgICAgICAgICAgICAgICBidWlsZGVyLmFwcGVuZExpdGVyYWwoIiB3YXMgbm90IG9mIHRoZSBl eHBlY3RlZCB0eXBlLiIpOworICAgICAgICAgICAgICAgIGNvbnNvbGUtPmFkZE1lc3NhZ2UoQ1NT TWVzc2FnZVNvdXJjZSwgRXJyb3JNZXNzYWdlTGV2ZWwsIGJ1aWxkZXIudG9TdHJpbmcoKSk7CiAg ICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgfQogICAgICAgICAgICAg YnJlYWs7CkBAIC0xMTIsNiArMTE3LDcgQEAgc3RhdGljIGJvb2wgdmFsaWRhdGVTeW1ib2xzKGNv bnN0IFZlY3RvcjxBTkdMRVNoYWRlclN5bWJvbD4mIHN5bWJvbHMsIEN1c3RvbUZpbHQKICAgICAg ICAgICAgICAgICAvLyBXZSBtdXN0IG5vdCBhbGxvdyBPcGVuR0wgdG8gZ2l2ZSB1bmJvdW5kIHNh bXBsZXJzIGEgZGVmYXVsdCB2YWx1ZSBvZiAwIGJlY2F1c2UgdGhhdCByZWZlcmVuY2VzIHRoZSBl bGVtZW50IHRleHR1cmUsCiAgICAgICAgICAgICAgICAgLy8gd2hpY2ggc2hvdWxkIGJlIGluYWNj ZXNzaWJsZSB0byB0aGUgYXV0aG9yJ3Mgc2hhZGVyIGNvZGUuCiAgICAgICAgICAgICAgICAgLy8g aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2MjMwCisgICAgICAgICAg ICAgICAgY29uc29sZS0+YWRkTWVzc2FnZShDU1NNZXNzYWdlU291cmNlLCBFcnJvck1lc3NhZ2VM ZXZlbCwgIlRleHR1cmUgc2FtcGxlcnMgYXJlIG5vdCBwZXJtaXR0ZWQgaW4gQ1NTIFNoYWRlcnMi KTsKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgICAgICB9CiAKQEAgLTEx OSw4ICsxMjUsMTEgQEAgc3RhdGljIGJvb2wgdmFsaWRhdGVTeW1ib2xzKGNvbnN0IFZlY3RvcjxB TkdMRVNoYWRlclN5bWJvbD4mIHN5bWJvbHMsIEN1c3RvbUZpbHQKICAgICAgICAgICAgIFN5bWJv bE5hbWVUb1R5cGVNYXA6Oml0ZXJhdG9yIGJ1aWx0SW5Vbmlmb3JtID0gdW5pZm9ybU5hbWVUb1R5 cGVNYXAtPmZpbmQoc3ltYm9sLm5hbWUpOwogICAgICAgICAgICAgaWYgKGJ1aWx0SW5Vbmlmb3Jt ICE9IHVuaWZvcm1OYW1lVG9UeXBlTWFwLT5lbmQoKSAmJiAoc3ltYm9sLmlzQXJyYXkgfHwgc3lt Ym9sLmRhdGFUeXBlICE9IGJ1aWx0SW5Vbmlmb3JtLT52YWx1ZSkpIHsKICAgICAgICAgICAgICAg ICAvLyBUaGUgYXV0aG9yIGRlZmluZWQgb25lIG9mIHRoZSBidWlsdC1pbiB1bmlmb3JtcyB3aXRo IHRoZSB3cm9uZyB0eXBlLgotICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBSZXBvcnQgdGhlIHZh bGlkYXRpb24gZXJyb3IuCi0gICAgICAgICAgICAgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTc0NDE2CisgICAgICAgICAgICAgICAgU3RyaW5nQnVpbGRlciBi dWlsZGVyOworICAgICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kTGl0ZXJhbCgidW5pZm9ybSAi KTsKKyAgICAgICAgICAgICAgICBidWlsZGVyLmFwcGVuZChzeW1ib2wubmFtZSk7CisgICAgICAg ICAgICAgICAgYnVpbGRlci5hcHBlbmQoIiB3YXMgbm90IG9mIHRoZSBleHBlY3RlZCB0eXBlLiIp OworICAgICAgICAgICAgICAgIGNvbnNvbGUtPmFkZE1lc3NhZ2UoQ1NTTWVzc2FnZVNvdXJjZSwg RXJyb3JNZXNzYWdlTGV2ZWwsIGJ1aWxkZXIudG9TdHJpbmcoKSk7CiAgICAgICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgYnJlYWs7CkBAIC0xNTgs NyArMTY3LDcgQEAgU3RyaW5nIEN1c3RvbUZpbHRlclZhbGlkYXRlZFByb2dyYW06OmRlZmF1bHRG cmFnbWVudFNoYWRlclN0cmluZygpCiAgICAgcmV0dXJuIGZyYWdtZW50U2hhZGVyU3RyaW5nOwog fQogCi1DdXN0b21GaWx0ZXJWYWxpZGF0ZWRQcm9ncmFtOjpDdXN0b21GaWx0ZXJWYWxpZGF0ZWRQ cm9ncmFtKEN1c3RvbUZpbHRlckdsb2JhbENvbnRleHQqIGdsb2JhbENvbnRleHQsIGNvbnN0IEN1 c3RvbUZpbHRlclByb2dyYW1JbmZvJiBwcm9ncmFtSW5mbykKK0N1c3RvbUZpbHRlclZhbGlkYXRl ZFByb2dyYW06OkN1c3RvbUZpbHRlclZhbGlkYXRlZFByb2dyYW0oUGFnZUNvbnNvbGUqIGNvbnNv bGUsIEN1c3RvbUZpbHRlckdsb2JhbENvbnRleHQqIGdsb2JhbENvbnRleHQsIGNvbnN0IEN1c3Rv bUZpbHRlclByb2dyYW1JbmZvJiBwcm9ncmFtSW5mbykKICAgICA6IG1fcHJvZ3JhbUluZm8ocHJv Z3JhbUluZm8pCiAgICAgLCBtX2lzSW5pdGlhbGl6ZWQoZmFsc2UpCiB7CkBAIC0xODAsMTQgKzE4 OSwxNCBAQCBDdXN0b21GaWx0ZXJWYWxpZGF0ZWRQcm9ncmFtOjpDdXN0b21GaWx0ZXJWYWxpZGF0 ZWRQcm9ncmFtKEN1c3RvbUZpbHRlckdsb2JhbENvbgogICAgIGJvb2wgdmVydGV4U2hhZGVyVmFs aWQgPSB2YWxpZGF0b3ItPmNvbXBpbGVTaGFkZXJTb3VyY2Uob3JpZ2luYWxWZXJ0ZXhTaGFkZXIu dXRmOCgpLmRhdGEoKSwgU0hBREVSX1RZUEVfVkVSVEVYLCBtX3ZhbGlkYXRlZFZlcnRleFNoYWRl ciwgdmVydGV4U2hhZGVyTG9nLCBzeW1ib2xzKTsKICAgICBib29sIGZyYWdtZW50U2hhZGVyVmFs aWQgPSB2YWxpZGF0b3ItPmNvbXBpbGVTaGFkZXJTb3VyY2Uob3JpZ2luYWxGcmFnbWVudFNoYWRl ci51dGY4KCkuZGF0YSgpLCBTSEFERVJfVFlQRV9GUkFHTUVOVCwgbV92YWxpZGF0ZWRGcmFnbWVu dFNoYWRlciwgZnJhZ21lbnRTaGFkZXJMb2csIHN5bWJvbHMpOwogICAgIGlmICghdmVydGV4U2hh ZGVyVmFsaWQgfHwgIWZyYWdtZW50U2hhZGVyVmFsaWQpIHsKLSAgICAgICAgLy8gRklYTUU6IFJl cG9ydCB0aGUgdmFsaWRhdGlvbiBlcnJvcnMuCi0gICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDQxNgorICAgICAgICBpZiAoIXZlcnRleFNoYWRlclZh bGlkKQorICAgICAgICAgICAgY29uc29sZS0+YWRkTWVzc2FnZShDU1NNZXNzYWdlU291cmNlLCBF cnJvck1lc3NhZ2VMZXZlbCwgdmVydGV4U2hhZGVyTG9nKTsKKyAgICAgICAgaWYgKCFmcmFnbWVu dFNoYWRlclZhbGlkKQorICAgICAgICAgICAgY29uc29sZS0+YWRkTWVzc2FnZShDU1NNZXNzYWdl U291cmNlLCBFcnJvck1lc3NhZ2VMZXZlbCwgZnJhZ21lbnRTaGFkZXJMb2cpOwogICAgICAgICBy ZXR1cm47CiAgICAgfQogCi0gICAgaWYgKCF2YWxpZGF0ZVN5bWJvbHMoc3ltYm9scywgbV9wcm9n cmFtSW5mby5tZXNoVHlwZSgpKSkgewotICAgICAgICAvLyBGSVhNRTogUmVwb3J0IHZhbGlkYXRp b24gZXJyb3JzLgotICAgICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NzQ0MTYKKyAgICBpZiAoIXZhbGlkYXRlU3ltYm9scyhjb25zb2xlLCBzeW1ib2xzLCBt X3Byb2dyYW1JbmZvLm1lc2hUeXBlKCkpKSB7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvQ3VzdG9t RmlsdGVyVmFsaWRhdGVkUHJvZ3JhbS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZmlsdGVycy9DdXN0b21GaWx0ZXJWYWxpZGF0ZWRQcm9ncmFtLmgKaW5kZXggZWY3OTE5YWJj NjYxM2M3MjU0NDEyYmYyYWE2YjkwMWQ2ZmZmN2ExNy4uY2NlNTM4NDEyNTAxM2Y5OWMxMzA3NWI3 ZmNhYTRhMDc3OWZiOTcxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZmlsdGVycy9DdXN0b21GaWx0ZXJWYWxpZGF0ZWRQcm9ncmFtLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9DdXN0b21GaWx0ZXJWYWxpZGF0ZWRQ cm9ncmFtLmgKQEAgLTUxLDYgKzUxLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogc3RydWN0IEFO R0xFU2hhZGVyU3ltYm9sOwogY2xhc3MgQ3VzdG9tRmlsdGVyQ29tcGlsZWRQcm9ncmFtOwogY2xh c3MgQ3VzdG9tRmlsdGVyR2xvYmFsQ29udGV4dDsKK2NsYXNzIFBhZ2VDb25zb2xlOwogCiAjaWYg VVNFKFRFWFRVUkVfTUFQUEVSKQogY2xhc3MgVGV4dHVyZU1hcHBlclBsYXRmb3JtQ29tcGlsZWRQ cm9ncmFtOwpAQCAtNjQsOSArNjUsOSBAQCB0eXBlZGVmIFRleHR1cmVNYXBwZXJQbGF0Zm9ybUNv bXBpbGVkUHJvZ3JhbSBQbGF0Zm9ybUNvbXBpbGVkUHJvZ3JhbTsKIC8vCiBjbGFzcyBDdXN0b21G aWx0ZXJWYWxpZGF0ZWRQcm9ncmFtIDogcHVibGljIFJlZkNvdW50ZWQ8Q3VzdG9tRmlsdGVyVmFs aWRhdGVkUHJvZ3JhbT4gewogcHVibGljOgotICAgIHN0YXRpYyBQYXNzUmVmUHRyPEN1c3RvbUZp bHRlclZhbGlkYXRlZFByb2dyYW0+IGNyZWF0ZShDdXN0b21GaWx0ZXJHbG9iYWxDb250ZXh0KiBn bG9iYWxDb250ZXh0LCBjb25zdCBDdXN0b21GaWx0ZXJQcm9ncmFtSW5mbyYgcHJvZ3JhbUluZm8p CisgICAgc3RhdGljIFBhc3NSZWZQdHI8Q3VzdG9tRmlsdGVyVmFsaWRhdGVkUHJvZ3JhbT4gY3Jl YXRlKFBhZ2VDb25zb2xlKiBwYWdlQ29uc29sZSwgQ3VzdG9tRmlsdGVyR2xvYmFsQ29udGV4dCog Z2xvYmFsQ29udGV4dCwgY29uc3QgQ3VzdG9tRmlsdGVyUHJvZ3JhbUluZm8mIHByb2dyYW1JbmZv KQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBDdXN0b21GaWx0ZXJWYWxpZGF0 ZWRQcm9ncmFtKGdsb2JhbENvbnRleHQsIHByb2dyYW1JbmZvKSk7CisgICAgICAgIHJldHVybiBh ZG9wdFJlZihuZXcgQ3VzdG9tRmlsdGVyVmFsaWRhdGVkUHJvZ3JhbShwYWdlQ29uc29sZSwgZ2xv YmFsQ29udGV4dCwgcHJvZ3JhbUluZm8pKTsKICAgICB9CiAKICAgICB+Q3VzdG9tRmlsdGVyVmFs aWRhdGVkUHJvZ3JhbSgpOwpAQCAtOTUsNyArOTYsNyBAQCBwdWJsaWM6CiAKICAgICBib29sIGlz SW5pdGlhbGl6ZWQoKSBjb25zdCB7IHJldHVybiBtX2lzSW5pdGlhbGl6ZWQ7IH0KIHByaXZhdGU6 Ci0gICAgQ3VzdG9tRmlsdGVyVmFsaWRhdGVkUHJvZ3JhbShDdXN0b21GaWx0ZXJHbG9iYWxDb250 ZXh0KiwgY29uc3QgQ3VzdG9tRmlsdGVyUHJvZ3JhbUluZm8mKTsKKyAgICBDdXN0b21GaWx0ZXJW YWxpZGF0ZWRQcm9ncmFtKFBhZ2VDb25zb2xlKiwgQ3VzdG9tRmlsdGVyR2xvYmFsQ29udGV4dCos IGNvbnN0IEN1c3RvbUZpbHRlclByb2dyYW1JbmZvJik7CiAKICAgICB2b2lkIHBsYXRmb3JtSW5p dCgpOwogICAgIHZvaWQgcGxhdGZvcm1EZXN0cm95KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyLmNwcAppbmRleCBjOThjZTkyZGM3MzNhMDY2Nzc2ZTdiNjM4NDI4YWEyNzc2 MDFlZmE0Li5iNjYzZTQxYjYyZWFhMzkwMzBhZTdkYmNkYjg4MjQ2N2Q2MjdjMDA5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTYzODUsNyArNjM4NSw4IEBA IEZpbHRlck9wZXJhdGlvbnMgUmVuZGVyTGF5ZXI6OmNvbXB1dGVGaWx0ZXJPcGVyYXRpb25zKGNv bnN0IFJlbmRlclN0eWxlKiBzdHlsZSkKICAgICAgICAgICAgIGlmICghdmFsaWRhdGVkUHJvZ3Jh bSkgewogICAgICAgICAgICAgICAgIC8vIExhemlseSBjcmVhdGUgYSB2YWxpZGF0ZWQgcHJvZ3Jh bSBhbmQgc3RvcmUgaXQgb24gdGhlIEN1c3RvbUZpbHRlclByb2dyYW0uCiAgICAgICAgICAgICAg ICAgQ3VzdG9tRmlsdGVyR2xvYmFsQ29udGV4dCogZ2xvYmFsQ29udGV4dCA9IHJlbmRlcmVyKCkt PnZpZXcoKS0+Y3VzdG9tRmlsdGVyR2xvYmFsQ29udGV4dCgpOwotICAgICAgICAgICAgICAgIHZh bGlkYXRlZFByb2dyYW0gPSBDdXN0b21GaWx0ZXJWYWxpZGF0ZWRQcm9ncmFtOjpjcmVhdGUoZ2xv YmFsQ29udGV4dCwgcHJvZ3JhbS0+cHJvZ3JhbUluZm8oKSk7CisgICAgICAgICAgICAgICAgdmFs aWRhdGVkUHJvZ3JhbSA9IEN1c3RvbUZpbHRlclZhbGlkYXRlZFByb2dyYW06OmNyZWF0ZShyZW5k ZXJlcigpLT5kb2N1bWVudCgpLT5wYWdlKCktPmNvbnNvbGUoKSwKKyAgICAgICAgICAgICAgICAg ICAgZ2xvYmFsQ29udGV4dCwgcHJvZ3JhbS0+cHJvZ3JhbUluZm8oKSk7CiAgICAgICAgICAgICAg ICAgcHJvZ3JhbS0+c2V0VmFsaWRhdGVkUHJvZ3JhbSh2YWxpZGF0ZWRQcm9ncmFtKTsKICAgICAg ICAgICAgIH0KIAo=