83409 2012-04-06 16:24:53 -0700 bindAttribLocation should check webgl reserved prefix 2012-04-09 15:40:46 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zmo zmo kbr oldest_to_newest 597795 0 zmo 2012-04-06 16:24:53 -0700 right now it just passes down to command buffer, where command buffer only checks for "gl_". 597840 1 136106 zmo 2012-04-06 17:19:45 -0700 Created attachment 136106 Patch 597842 2 zmo 2012-04-06 17:21:11 -0700 Ken, please review. 598471 3 136106 kbr 2012-04-09 11:41:25 -0700 Comment on attachment 136106 Patch Looks good. Can you make sure these changes make it into the WebGL conformance suite (and email public_webgl about their addition)? Thanks. 598527 4 136285 zmo 2012-04-09 12:32:47 -0700 Created attachment 136285 Patch 598530 5 zmo 2012-04-09 12:37:43 -0700 The changes are already in the khronos and then I synced to layout tests. I'll email it to the public_webgl. 598537 6 zmo 2012-04-09 12:45:21 -0700 by the way, the second patch is the same as the first one. I simply did an webkit-update and reuploaded. You don't have to look again. 598656 7 136285 kbr 2012-04-09 15:08:57 -0700 Comment on attachment 136285 Patch Still looks fine. 598682 8 zmo 2012-04-09 15:40:46 -0700 Committed r113634: <http://trac.webkit.org/changeset/113634> 136106 2012-04-06 17:19:45 -0700 2012-04-09 12:32:44 -0700 Patch bug-83409-20120406171944.patch text/plain 5857 zmo SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMzUyMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA0LTA2ICBaaGVueWFv IE1vICA8em1vQGdvb2dsZS5jb20+CisKKyAgICAgICAgYmluZEF0dHJpYkxvY2F0aW9uIHNob3Vs ZCBjaGVjayB3ZWJnbCByZXNlcnZlZCBwcmVmaXgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTgzNDA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQu Y3BwOiBDaGVjayBmb3IgaW52YWxpZCBwYXJhbWV0ZXJzIGZvciBhIGZldyBmdW5jdGlvbnMuCisg ICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5nQ29udGV4 dDo6YmluZEF0dHJpYkxvY2F0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5n Q29udGV4dDo6Z2V0QXR0cmliTG9jYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5k ZXJpbmdDb250ZXh0OjpnZXRVbmlmb3JtTG9jYXRpb24pOgorCiAyMDEyLTA0LTA2ICBBbGV4YW5k cmUgRWxpYXMgIDxhZWxpYXNAZ29vZ2xlLmNvbT4KIAogICAgICAgICBGaXggYnVnIGluIENvbnRh aW5lck5vZGU6OmdldFJlY3Qgd2l0aCBzY2FsZSB0cmFuc2Zvcm1zCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHAJKHJl dmlzaW9uIDExMzUxMCkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVy aW5nQ29udGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2NSw2ICsxNjUsMTMgQEAgbmFtZXNw YWNlIHsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAorICAgIGJvb2wgaXNQcmVmaXhS ZXNlcnZlZChjb25zdCBTdHJpbmcmIG5hbWUpCisgICAgeworICAgICAgICBpZiAobmFtZS5zdGFy dHNXaXRoKCJnbF8iKSB8fCBuYW1lLnN0YXJ0c1dpdGgoIndlYmdsXyIpIHx8IG5hbWUuc3RhcnRz V2l0aCgiX3dlYmdsXyIpKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIHJldHVy biBmYWxzZTsKKyAgICB9CisKICAgICAvLyBTdHJpcHMgY29tbWVudHMgZnJvbSBzaGFkZXIgdGV4 dC4gVGhpcyBhbGxvd3Mgbm9uLUFTQ0lJIGNoYXJhY3RlcnMKICAgICAvLyB0byBiZSB1c2VkIGlu IGNvbW1lbnRzIHdpdGhvdXQgcG90ZW50aWFsbHkgYnJlYWtpbmcgT3BlbkdMCiAgICAgLy8gaW1w bGVtZW50YXRpb25zIG5vdCBleHBlY3RpbmcgY2hhcmFjdGVycyBvdXRzaWRlIHRoZSBHTFNMIEVT IHNldC4KQEAgLTg1MSw2ICs4NTgsMTQgQEAgdm9pZCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmJp bmRBdHRyaWJMbwogICAgICAgICByZXR1cm47CiAgICAgaWYgKCF2YWxpZGF0ZVN0cmluZygiYmlu ZEF0dHJpYkxvY2F0aW9uIiwgbmFtZSkpCiAgICAgICAgIHJldHVybjsKKyAgICBpZiAoaXNQcmVm aXhSZXNlcnZlZChuYW1lKSkgeworICAgICAgICBzeW50aGVzaXplR0xFcnJvcihHcmFwaGljc0Nv bnRleHQzRDo6SU5WQUxJRF9PUEVSQVRJT04sICJiaW5kQXR0cmliTG9jYXRpb24iLCAicmVzZXJ2 ZWQgcHJlZml4Iik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgaWYgKGluZGV4ID49IG1f bWF4VmVydGV4QXR0cmlicykgeworICAgICAgICBzeW50aGVzaXplR0xFcnJvcihHcmFwaGljc0Nv bnRleHQzRDo6SU5WQUxJRF9WQUxVRSwgImJpbmRBdHRyaWJMb2NhdGlvbiIsICJpbmRleCBvdXQg b2YgcmFuZ2UiKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KICAgICBtX2NvbnRleHQtPmJpbmRB dHRyaWJMb2NhdGlvbihvYmplY3RPclplcm8ocHJvZ3JhbSksIGluZGV4LCBuYW1lKTsKICAgICBj bGVhbnVwQWZ0ZXJHcmFwaGljc0NhbGwoZmFsc2UpOwogfQpAQCAtMjE4MCwxMiArMjE5NSwxOCBA QCBib29sIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6Z2V0QXR0YWNoZWRTCiAKIEdDM0RpbnQgV2Vi R0xSZW5kZXJpbmdDb250ZXh0OjpnZXRBdHRyaWJMb2NhdGlvbihXZWJHTFByb2dyYW0qIHByb2dy YW0sIGNvbnN0IFN0cmluZyYgbmFtZSkKIHsKLSAgICBpZiAoaXNDb250ZXh0TG9zdCgpKQorICAg IGlmIChpc0NvbnRleHRMb3N0KCkgfHwgIXZhbGlkYXRlV2ViR0xPYmplY3QoImdldEF0dHJpYkxv Y2F0aW9uIiwgcHJvZ3JhbSkpCiAgICAgICAgIHJldHVybiAtMTsKICAgICBpZiAoIXZhbGlkYXRl TG9jYXRpb25MZW5ndGgoImdldEF0dHJpYkxvY2F0aW9uIiwgbmFtZSkpCiAgICAgICAgIHJldHVy biAtMTsKICAgICBpZiAoIXZhbGlkYXRlU3RyaW5nKCJnZXRBdHRyaWJMb2NhdGlvbiIsIG5hbWUp KQogICAgICAgICByZXR1cm4gLTE7CisgICAgaWYgKGlzUHJlZml4UmVzZXJ2ZWQobmFtZSkpCisg ICAgICAgIHJldHVybiAtMTsKKyAgICBpZiAoIXByb2dyYW0tPmdldExpbmtTdGF0dXMoKSkgewor ICAgICAgICBzeW50aGVzaXplR0xFcnJvcihHcmFwaGljc0NvbnRleHQzRDo6SU5WQUxJRF9PUEVS QVRJT04sICJnZXRBdHRyaWJMb2NhdGlvbiIsICJwcm9ncmFtIG5vdCBsaW5rZWQiKTsKKyAgICAg ICAgcmV0dXJuIDA7CisgICAgfQogICAgIHJldHVybiBtX2NvbnRleHQtPmdldEF0dHJpYkxvY2F0 aW9uKG9iamVjdE9yWmVybyhwcm9ncmFtKSwgbmFtZSk7CiB9CiAKQEAgLTI5NDgsNiArMjk2OSwx MiBAQCBQYXNzUmVmUHRyPFdlYkdMVW5pZm9ybUxvY2F0aW9uPiBXZWJHTFJlCiAgICAgICAgIHJl dHVybiAwOwogICAgIGlmICghdmFsaWRhdGVTdHJpbmcoImdldFVuaWZvcm1Mb2NhdGlvbiIsIG5h bWUpKQogICAgICAgICByZXR1cm4gMDsKKyAgICBpZiAoaXNQcmVmaXhSZXNlcnZlZChuYW1lKSkK KyAgICAgICAgcmV0dXJuIDA7CisgICAgaWYgKCFwcm9ncmFtLT5nZXRMaW5rU3RhdHVzKCkpIHsK KyAgICAgICAgc3ludGhlc2l6ZUdMRXJyb3IoR3JhcGhpY3NDb250ZXh0M0Q6OklOVkFMSURfT1BF UkFUSU9OLCAiZ2V0VW5pZm9ybUxvY2F0aW9uIiwgInByb2dyYW0gbm90IGxpbmtlZCIpOworICAg ICAgICByZXR1cm4gMDsKKyAgICB9CiAgICAgV2ViR0xTdGF0ZVJlc3RvcmVyKHRoaXMsIGZhbHNl KTsKICAgICBHQzNEaW50IHVuaWZvcm1Mb2NhdGlvbiA9IG1fY29udGV4dC0+Z2V0VW5pZm9ybUxv Y2F0aW9uKG9iamVjdE9yWmVybyhwcm9ncmFtKSwgbmFtZSk7CiAgICAgaWYgKHVuaWZvcm1Mb2Nh dGlvbiA9PSAtMSkKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM YXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMzUyMSkKKysrIExheW91dFRlc3RzL0No YW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA0LTA2ICBaaGVu eWFvIE1vICA8em1vQGdvb2dsZS5jb20+CisKKyAgICAgICAgYmluZEF0dHJpYkxvY2F0aW9uIHNo b3VsZCBjaGVjayB3ZWJnbCByZXNlcnZlZCBwcmVmaXgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzNDA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L2NhbnZhcy93ZWJnbC93ZWJnbC1zcGVjaWZp Yy1leHBlY3RlZC50eHQ6IEFkZGVkIHdlYmdsIHByZWZpeCB0ZXN0IGNhc2UgZm9yIGJpbmRBdHRy aWJMb2NhdGlvbi4KKyAgICAgICAgKiBmYXN0L2NhbnZhcy93ZWJnbC93ZWJnbC1zcGVjaWZpYy5o dG1sOgorCiAyMDEyLTA0LTA2ICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgVW5yZXZpZXdlZCBnYXJkZW5pbmcuCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0 L2NhbnZhcy93ZWJnbC93ZWJnbC1zcGVjaWZpYy1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g TGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvd2ViZ2wtc3BlY2lmaWMtZXhwZWN0ZWQudHh0 CShyZXZpc2lvbiAxMTM1MTApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC93ZWJn bC1zcGVjaWZpYy1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTYwLDYgKzYwLDEwIEBA IFBBU1MgZ2V0RXJyb3Igd2FzIGV4cGVjdGVkIHZhbHVlOiBOT19FUlIKIAogVmVyaWZ5IHRoYXQg ZHJhd2luZ0J1ZmZlcldpZHRoIGFuZCBkcmF3aW5nQnVmZmVySGVpZ2h0cyBhcmUgaW1wbGVtZW50 ZWQKIFBBU1MgZ2wuZHJhd2luZ0J1ZmZlcldpZHRoID49IDAgJiYgZ2wuZHJhd2luZ0J1ZmZlckhl aWdodCA+PSAwIGlzIHRydWUKKworVmVyaWZ5IHRoYXQgYmluZEF0dHJpYkxvY2F0aW9uIHJlamVj dHMgbmFtZXMgc3RhcnQgd2l0aCB3ZWJnbF8gb3IgX3dlYmdsXworUEFTUyBnbC5iaW5kQXR0cmli TG9jYXRpb24ocHJvZ3JhbSwgMCwgJ3dlYmdsX2EnKSBnZW5lcmF0ZWQgZXhwZWN0ZWQgR0wgZXJy b3I6IElOVkFMSURfT1BFUkFUSU9OLgorUEFTUyBnbC5iaW5kQXR0cmliTG9jYXRpb24ocHJvZ3Jh bSwgMCwgJ193ZWJnbF9hJykgZ2VuZXJhdGVkIGV4cGVjdGVkIEdMIGVycm9yOiBJTlZBTElEX09Q RVJBVElPTi4KIFBBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKIAogVEVTVCBDT01QTEVU RQpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvd2ViZ2wtc3BlY2lmaWMuaHRt bAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC93ZWJnbC1zcGVj aWZpYy5odG1sCShyZXZpc2lvbiAxMTM1MTApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy93 ZWJnbC93ZWJnbC1zcGVjaWZpYy5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC04OSw2ICs4OSwxMyBA QCBnbEVycm9yU2hvdWxkQmUoZ2wsIGdsLk5PX0VSUk9SLCAic2V0L2dlCiBkZWJ1ZygiIik7CiBk ZWJ1ZygiVmVyaWZ5IHRoYXQgZHJhd2luZ0J1ZmZlcldpZHRoIGFuZCBkcmF3aW5nQnVmZmVySGVp Z2h0cyBhcmUgaW1wbGVtZW50ZWQiKTsKIHNob3VsZEJlVHJ1ZSgiZ2wuZHJhd2luZ0J1ZmZlcldp ZHRoID49IDAgJiYgZ2wuZHJhd2luZ0J1ZmZlckhlaWdodCA+PSAwIik7CisKK2RlYnVnKCIiKTsK K2RlYnVnKCJWZXJpZnkgdGhhdCBiaW5kQXR0cmliTG9jYXRpb24gcmVqZWN0cyBuYW1lcyBzdGFy dCB3aXRoIHdlYmdsXyBvciBfd2ViZ2xfIik7CitzaG91bGRHZW5lcmF0ZUdMRXJyb3IoZ2wsIGds LklOVkFMSURfT1BFUkFUSU9OLCAiZ2wuYmluZEF0dHJpYkxvY2F0aW9uKHByb2dyYW0sIDAsICd3 ZWJnbF9hJykiKTsKK3Nob3VsZEdlbmVyYXRlR0xFcnJvcihnbCwgZ2wuSU5WQUxJRF9PUEVSQVRJ T04sICJnbC5iaW5kQXR0cmliTG9jYXRpb24ocHJvZ3JhbSwgMCwgJ193ZWJnbF9hJykiKTsKKwor c3VjY2Vzc2Z1bGx5UGFyc2VkID0gdHJ1ZTsKIDwvc2NyaXB0PgogCiA8c2NyaXB0IHNyYz0iLi4v Li4vanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cg== 136285 2012-04-09 12:32:47 -0700 2012-04-09 15:08:57 -0700 Patch bug-83409-20120409123245.patch text/plain 5882 zmo SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMzU5MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA0LTA2ICBaaGVueWFv IE1vICA8em1vQGdvb2dsZS5jb20+CisKKyAgICAgICAgYmluZEF0dHJpYkxvY2F0aW9uIHNob3Vs ZCBjaGVjayB3ZWJnbCByZXNlcnZlZCBwcmVmaXgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTgzNDA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQu Y3BwOiBDaGVjayBmb3IgaW52YWxpZCBwYXJhbWV0ZXJzIGZvciBhIGZldyBmdW5jdGlvbnMuCisg ICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5nQ29udGV4 dDo6YmluZEF0dHJpYkxvY2F0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5n Q29udGV4dDo6Z2V0QXR0cmliTG9jYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5k ZXJpbmdDb250ZXh0OjpnZXRVbmlmb3JtTG9jYXRpb24pOgorCiAyMDEyLTA0LTA2ICBBbmRyZXkg S29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3Rvcjog em9vbSBvbiB2ZXJ0aWNhbCBtb3VzZXdoZWVsIGluIFRpbWVsaW5lIG92ZXJ2aWV3CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4 dC5jcHAJKHJldmlzaW9uIDExMzU5MikKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dl YkdMUmVuZGVyaW5nQ29udGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2NSw2ICsxNjUsMTMg QEAgbmFtZXNwYWNlIHsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAorICAgIGJvb2wg aXNQcmVmaXhSZXNlcnZlZChjb25zdCBTdHJpbmcmIG5hbWUpCisgICAgeworICAgICAgICBpZiAo bmFtZS5zdGFydHNXaXRoKCJnbF8iKSB8fCBuYW1lLnN0YXJ0c1dpdGgoIndlYmdsXyIpIHx8IG5h bWUuc3RhcnRzV2l0aCgiX3dlYmdsXyIpKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKICAgICAvLyBTdHJpcHMgY29tbWVudHMgZnJvbSBz aGFkZXIgdGV4dC4gVGhpcyBhbGxvd3Mgbm9uLUFTQ0lJIGNoYXJhY3RlcnMKICAgICAvLyB0byBi ZSB1c2VkIGluIGNvbW1lbnRzIHdpdGhvdXQgcG90ZW50aWFsbHkgYnJlYWtpbmcgT3BlbkdMCiAg ICAgLy8gaW1wbGVtZW50YXRpb25zIG5vdCBleHBlY3RpbmcgY2hhcmFjdGVycyBvdXRzaWRlIHRo ZSBHTFNMIEVTIHNldC4KQEAgLTg0Nyw2ICs4NTQsMTQgQEAgdm9pZCBXZWJHTFJlbmRlcmluZ0Nv bnRleHQ6OmJpbmRBdHRyaWJMbwogICAgICAgICByZXR1cm47CiAgICAgaWYgKCF2YWxpZGF0ZVN0 cmluZygiYmluZEF0dHJpYkxvY2F0aW9uIiwgbmFtZSkpCiAgICAgICAgIHJldHVybjsKKyAgICBp ZiAoaXNQcmVmaXhSZXNlcnZlZChuYW1lKSkgeworICAgICAgICBzeW50aGVzaXplR0xFcnJvcihH cmFwaGljc0NvbnRleHQzRDo6SU5WQUxJRF9PUEVSQVRJT04sICJiaW5kQXR0cmliTG9jYXRpb24i LCAicmVzZXJ2ZWQgcHJlZml4Iik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgaWYgKGlu ZGV4ID49IG1fbWF4VmVydGV4QXR0cmlicykgeworICAgICAgICBzeW50aGVzaXplR0xFcnJvcihH cmFwaGljc0NvbnRleHQzRDo6SU5WQUxJRF9WQUxVRSwgImJpbmRBdHRyaWJMb2NhdGlvbiIsICJp bmRleCBvdXQgb2YgcmFuZ2UiKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KICAgICBtX2NvbnRl eHQtPmJpbmRBdHRyaWJMb2NhdGlvbihvYmplY3RPclplcm8ocHJvZ3JhbSksIGluZGV4LCBuYW1l KTsKICAgICBjbGVhbnVwQWZ0ZXJHcmFwaGljc0NhbGwoZmFsc2UpOwogfQpAQCAtMjE3NiwxMiAr MjE5MSwxOCBAQCBib29sIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6Z2V0QXR0YWNoZWRTCiAKIEdD M0RpbnQgV2ViR0xSZW5kZXJpbmdDb250ZXh0OjpnZXRBdHRyaWJMb2NhdGlvbihXZWJHTFByb2dy YW0qIHByb2dyYW0sIGNvbnN0IFN0cmluZyYgbmFtZSkKIHsKLSAgICBpZiAoaXNDb250ZXh0TG9z dCgpKQorICAgIGlmIChpc0NvbnRleHRMb3N0KCkgfHwgIXZhbGlkYXRlV2ViR0xPYmplY3QoImdl dEF0dHJpYkxvY2F0aW9uIiwgcHJvZ3JhbSkpCiAgICAgICAgIHJldHVybiAtMTsKICAgICBpZiAo IXZhbGlkYXRlTG9jYXRpb25MZW5ndGgoImdldEF0dHJpYkxvY2F0aW9uIiwgbmFtZSkpCiAgICAg ICAgIHJldHVybiAtMTsKICAgICBpZiAoIXZhbGlkYXRlU3RyaW5nKCJnZXRBdHRyaWJMb2NhdGlv biIsIG5hbWUpKQogICAgICAgICByZXR1cm4gLTE7CisgICAgaWYgKGlzUHJlZml4UmVzZXJ2ZWQo bmFtZSkpCisgICAgICAgIHJldHVybiAtMTsKKyAgICBpZiAoIXByb2dyYW0tPmdldExpbmtTdGF0 dXMoKSkgeworICAgICAgICBzeW50aGVzaXplR0xFcnJvcihHcmFwaGljc0NvbnRleHQzRDo6SU5W QUxJRF9PUEVSQVRJT04sICJnZXRBdHRyaWJMb2NhdGlvbiIsICJwcm9ncmFtIG5vdCBsaW5rZWQi KTsKKyAgICAgICAgcmV0dXJuIDA7CisgICAgfQogICAgIHJldHVybiBtX2NvbnRleHQtPmdldEF0 dHJpYkxvY2F0aW9uKG9iamVjdE9yWmVybyhwcm9ncmFtKSwgbmFtZSk7CiB9CiAKQEAgLTI5NDQs NiArMjk2NSwxMiBAQCBQYXNzUmVmUHRyPFdlYkdMVW5pZm9ybUxvY2F0aW9uPiBXZWJHTFJlCiAg ICAgICAgIHJldHVybiAwOwogICAgIGlmICghdmFsaWRhdGVTdHJpbmcoImdldFVuaWZvcm1Mb2Nh dGlvbiIsIG5hbWUpKQogICAgICAgICByZXR1cm4gMDsKKyAgICBpZiAoaXNQcmVmaXhSZXNlcnZl ZChuYW1lKSkKKyAgICAgICAgcmV0dXJuIDA7CisgICAgaWYgKCFwcm9ncmFtLT5nZXRMaW5rU3Rh dHVzKCkpIHsKKyAgICAgICAgc3ludGhlc2l6ZUdMRXJyb3IoR3JhcGhpY3NDb250ZXh0M0Q6OklO VkFMSURfT1BFUkFUSU9OLCAiZ2V0VW5pZm9ybUxvY2F0aW9uIiwgInByb2dyYW0gbm90IGxpbmtl ZCIpOworICAgICAgICByZXR1cm4gMDsKKyAgICB9CiAgICAgV2ViR0xTdGF0ZVJlc3RvcmVyKHRo aXMsIGZhbHNlKTsKICAgICBHQzNEaW50IHVuaWZvcm1Mb2NhdGlvbiA9IG1fY29udGV4dC0+Z2V0 VW5pZm9ybUxvY2F0aW9uKG9iamVjdE9yWmVybyhwcm9ncmFtKSwgbmFtZSk7CiAgICAgaWYgKHVu aWZvcm1Mb2NhdGlvbiA9PSAtMSkKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMzU5MikKKysrIExheW91 dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA0 LTA2ICBaaGVueWFvIE1vICA8em1vQGdvb2dsZS5jb20+CisKKyAgICAgICAgYmluZEF0dHJpYkxv Y2F0aW9uIHNob3VsZCBjaGVjayB3ZWJnbCByZXNlcnZlZCBwcmVmaXgKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzNDA5CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L2NhbnZhcy93ZWJnbC93ZWJn bC1zcGVjaWZpYy1leHBlY3RlZC50eHQ6IEFkZGVkIHdlYmdsIHByZWZpeCB0ZXN0IGNhc2UgZm9y IGJpbmRBdHRyaWJMb2NhdGlvbi4KKyAgICAgICAgKiBmYXN0L2NhbnZhcy93ZWJnbC93ZWJnbC1z cGVjaWZpYy5odG1sOgorCiAyMDEyLTA0LTA5ICBSb2JlcnQgSG9nYW4gIDxyb2JlcnRAd2Via2l0 Lm9yZz4KIAogICAgICAgICBGaXggbGF5b3V0IHRlc3QgZm9yIHIxMTM1ODQgb24gUXQgYW5kIE1h YwpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvd2ViZ2wtc3BlY2lmaWMtZXhw ZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvY2FudmFzL3dlYmdsL3dl YmdsLXNwZWNpZmljLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMTEzNTkyKQorKysgTGF5b3V0VGVz dHMvZmFzdC9jYW52YXMvd2ViZ2wvd2ViZ2wtc3BlY2lmaWMtZXhwZWN0ZWQudHh0CSh3b3JraW5n IGNvcHkpCkBAIC02MCw2ICs2MCwxMCBAQCBQQVNTIGdldEVycm9yIHdhcyBleHBlY3RlZCB2YWx1 ZTogTk9fRVJSCiAKIFZlcmlmeSB0aGF0IGRyYXdpbmdCdWZmZXJXaWR0aCBhbmQgZHJhd2luZ0J1 ZmZlckhlaWdodHMgYXJlIGltcGxlbWVudGVkCiBQQVNTIGdsLmRyYXdpbmdCdWZmZXJXaWR0aCA+ PSAwICYmIGdsLmRyYXdpbmdCdWZmZXJIZWlnaHQgPj0gMCBpcyB0cnVlCisKK1ZlcmlmeSB0aGF0 IGJpbmRBdHRyaWJMb2NhdGlvbiByZWplY3RzIG5hbWVzIHN0YXJ0IHdpdGggd2ViZ2xfIG9yIF93 ZWJnbF8KK1BBU1MgZ2wuYmluZEF0dHJpYkxvY2F0aW9uKHByb2dyYW0sIDAsICd3ZWJnbF9hJykg Z2VuZXJhdGVkIGV4cGVjdGVkIEdMIGVycm9yOiBJTlZBTElEX09QRVJBVElPTi4KK1BBU1MgZ2wu YmluZEF0dHJpYkxvY2F0aW9uKHByb2dyYW0sIDAsICdfd2ViZ2xfYScpIGdlbmVyYXRlZCBleHBl Y3RlZCBHTCBlcnJvcjogSU5WQUxJRF9PUEVSQVRJT04uCiBQQVNTIHN1Y2Nlc3NmdWxseVBhcnNl ZCBpcyB0cnVlCiAKIFRFU1QgQ09NUExFVEUKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvY2FudmFz L3dlYmdsL3dlYmdsLXNwZWNpZmljLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFz dC9jYW52YXMvd2ViZ2wvd2ViZ2wtc3BlY2lmaWMuaHRtbAkocmV2aXNpb24gMTEzNTkyKQorKysg TGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvd2ViZ2wtc3BlY2lmaWMuaHRtbAkod29ya2lu ZyBjb3B5KQpAQCAtODksNiArODksMTMgQEAgZ2xFcnJvclNob3VsZEJlKGdsLCBnbC5OT19FUlJP UiwgInNldC9nZQogZGVidWcoIiIpOwogZGVidWcoIlZlcmlmeSB0aGF0IGRyYXdpbmdCdWZmZXJX aWR0aCBhbmQgZHJhd2luZ0J1ZmZlckhlaWdodHMgYXJlIGltcGxlbWVudGVkIik7CiBzaG91bGRC ZVRydWUoImdsLmRyYXdpbmdCdWZmZXJXaWR0aCA+PSAwICYmIGdsLmRyYXdpbmdCdWZmZXJIZWln aHQgPj0gMCIpOworCitkZWJ1ZygiIik7CitkZWJ1ZygiVmVyaWZ5IHRoYXQgYmluZEF0dHJpYkxv Y2F0aW9uIHJlamVjdHMgbmFtZXMgc3RhcnQgd2l0aCB3ZWJnbF8gb3IgX3dlYmdsXyIpOworc2hv dWxkR2VuZXJhdGVHTEVycm9yKGdsLCBnbC5JTlZBTElEX09QRVJBVElPTiwgImdsLmJpbmRBdHRy aWJMb2NhdGlvbihwcm9ncmFtLCAwLCAnd2ViZ2xfYScpIik7CitzaG91bGRHZW5lcmF0ZUdMRXJy b3IoZ2wsIGdsLklOVkFMSURfT1BFUkFUSU9OLCAiZ2wuYmluZEF0dHJpYkxvY2F0aW9uKHByb2dy YW0sIDAsICdfd2ViZ2xfYScpIik7CisKK3N1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7CiA8L3Nj cmlwdD4KIAogPHNjcmlwdCBzcmM9Ii4uLy4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMi Pjwvc2NyaXB0Pgo=