94755 2012-08-22 16:28:44 -0700 [CSS Shaders] Create constants for vertex attribute sizes and offsets 2012-10-09 14:23:18 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 71392 1 mvujovic mvujovic abarth achicu dino webkit.review.bot oldest_to_newest 702504 0 mvujovic 2012-08-22 16:28:44 -0700 Right now, vertex attribute sizes are literal constants in CustomFilterMesh.cpp like this: static const unsigned AttachedMeshVertexSize = 4 + // vec4 a_position 2 + // vec2 a_texCoord 2; // vec2 a_meshCoord It would be better to make them public members of CustomFilterMesh like this: static const unsigned PositionAttribSize = 4; static const unsigned TexAttribSize = 2; That way, we can use the constants when we bind the attributes in FECustomFilter::bindProgramAndBuffers. 737975 1 167797 mvujovic 2012-10-09 11:29:02 -0700 Created attachment 167797 Patch 738092 2 167797 webkit.review.bot 2012-10-09 12:49:01 -0700 Comment on attachment 167797 Patch Clearing flags on attachment: 167797 Committed r130797: <http://trac.webkit.org/changeset/130797> 738093 3 webkit.review.bot 2012-10-09 12:49:04 -0700 All reviewed patches have been landed. Closing bug. 738145 4 mvujovic 2012-10-09 13:36:40 -0700 Thanks for the review, Dean! 738167 5 abarth 2012-10-09 14:06:18 -0700 The path for CustomFilterConstants.h in the build system doesn't match the path where you placed the file. Which is right? 738170 6 abarth 2012-10-09 14:07:44 -0700 I'm going to move the file to the filters directory. Please fix if that's not the right thing to do. 738181 7 mvujovic 2012-10-09 14:23:18 -0700 (In reply to comment #6) > I'm going to move the file to the filters directory. Please fix if that's not the right thing to do. You're right. Thanks Adam! 167797 2012-10-09 11:29:02 -0700 2012-10-09 12:49:01 -0700 Patch 94755-1.patch text/plain 13600 mvujovic ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhNzdlNWRiLi5kMjY1YzU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUg QEAKKzIwMTItMTAtMDkgIE1heCBWdWpvdmljICA8bXZ1am92aWNAYWRvYmUuY29tPgorCisgICAg ICAgIFtDU1MgU2hhZGVyc10gQ3JlYXRlIGNvbnN0YW50cyBmb3IgdmVydGV4IGF0dHJpYnV0ZSBz aXplcyBhbmQgb2Zmc2V0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTQ3NTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBGYWN0b3Igb3V0IHRoZSB2ZXJ0ZXggYXR0cmlidXRlIHNpemUgYW5kIG9mZnNldCBj b25zdGFudHMgaW50byBhIG5ldyBmaWxlLAorICAgICAgICBDdXN0b21GaWx0ZXJDb25zdGFudHMu aC4gUmVwbGFjZSBsaXRlcmFscyBpbiBDdXN0b21GaWx0ZXJNZXNoR2VuZXJhdG9yIHdpdGggdGhl IGNvbnN0YW50cy4KKworICAgICAgICBJIGNvdWxkIGhhdmUgYWRkZWQgdGhlIGNvbnN0YW50cyB0 byBDdXN0b21GaWx0ZXJNZXNoR2VuZXJhdG9yLmgsIGJ1dCB0aGlzIHdvdWxkIG1ha2UKKyAgICAg ICAgRkVDdXN0b21GaWx0ZXIgZGVwZW5kIG9uIEN1c3RvbUZpbHRlck1lc2hHZW5lcmF0b3IuCisK KyAgICAgICAgSSBhbHNvIGNvdWxkIGhhdmUgYWRkZWQgdGhlIGNvbnN0YW50cyB0byBDdXN0b21G aWx0ZXJNZXNoLmgsIGJ1dCB0aGlzIHdvdWxkIG1ha2UKKyAgICAgICAgQ3VzdG9tRmlsdGVyTWVz aEdlbmVyYXRvciBkZXBlbmQgb24gQ3VzdG9tRmlsdGVyTWVzaC4KKworICAgICAgICBObyBuZXcg dGVzdHMuIE5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIEdOVW1ha2VmaWxlLmxp c3QuYW06CisgICAgICAgICogVGFyZ2V0LnByaToKKyAgICAgICAgKiBXZWJDb3JlLmd5cGk6Cisg ICAgICAgICogV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2o6CisgICAgICAgICogV2ViQ29y ZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L0N1c3RvbUZpbHRlckNvbnN0YW50cy5oOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmUpOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvQ3VzdG9tRmlsdGVyTWVzaEdlbmVyYXRv ci5oOgorICAgICAgICAoV2ViQ29yZTo6Q3VzdG9tRmlsdGVyTWVzaEdlbmVyYXRvcjo6ZmxvYXRz UGVyVmVydGV4KToKKyAgICAgICAgICAgIFVzZSB0aGUgbmV3IGNvbnN0YW50cyBpbnN0ZWFkIG9m IGxpdGVyYWwgdmFsdWVzLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVD dXN0b21GaWx0ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RkVDdXN0b21GaWx0ZXI6OmJpbmRQ cm9ncmFtQW5kQnVmZmVycyk6CisgICAgICAgICAgICBQdWxsIHRoZSBjb25zdGFudCBkZWZpbml0 aW9ucyBvdXQgb2YgaGVyZS4KKwogMjAxMi0xMC0wOSAgSGFyYWxkIEFsdmVzdHJhbmQgIDxodGFA Z29vZ2xlLmNvbT4KIAogICAgICAgICBDaGFuZ2UgUGVlckNvbm5lY3Rpb24gZ2V0U3RhdHMgZnVu Y3Rpb24gdG8gc2luZ2xlIHZhbHVlIGxvY2FsIC8gcmVtb3RlCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9HTlVtYWtlZmlsZS5saXN0LmFtIGIvU291cmNlL1dlYkNvcmUvR05VbWFrZWZpbGUu bGlzdC5hbQppbmRleCBhODJiM2MyLi40Y2FlMGNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9HTlVtYWtlZmlsZS5saXN0LmFtCisrKyBiL1NvdXJjZS9XZWJDb3JlL0dOVW1ha2VmaWxlLmxp c3QuYW0KQEAgLTQyODksNiArNDI4OSw3IEBAIHdlYmNvcmVfc291cmNlcyArPSBcCiAJU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vUmVmUHRyQ2Fpcm8uaCBcCiAJU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vVHJhbnNmb3JtYXRpb25NYXRyaXhDYWly by5jcHAgXAogCVNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvQ3VzdG9t RmlsdGVyQXJyYXlQYXJhbWV0ZXIuaCBcCisJU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZmlsdGVycy9DdXN0b21GaWx0ZXJDb25zdGFudHMuaCBcCiAJU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9DdXN0b21GaWx0ZXJHbG9iYWxDb250ZXh0LmNwcCBcCiAJ U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9DdXN0b21GaWx0ZXJHbG9i YWxDb250ZXh0LmggXAogCVNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMv Q3VzdG9tRmlsdGVyTWVzaC5jcHAgXApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvVGFyZ2V0 LnByaSBiL1NvdXJjZS9XZWJDb3JlL1RhcmdldC5wcmkKaW5kZXggZmRmMjcwNi4uMzhjMDkzMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvVGFyZ2V0LnByaQorKysgYi9Tb3VyY2UvV2ViQ29y ZS9UYXJnZXQucHJpCkBAIC0yMDYwLDYgKzIwNjAsNyBAQCBIRUFERVJTICs9IFwKICAgICBwbGF0 Zm9ybS9ncmFwaGljcy9Db2xvci5oIFwKICAgICBwbGF0Zm9ybS9ncmFwaGljcy9Dcm9zc2ZhZGVH ZW5lcmF0ZWRJbWFnZS5oIFwKICAgICBwbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0N1c3RvbUZp bHRlckFycmF5UGFyYW1ldGVyLmggXAorICAgIHBsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvQ3Vz dG9tRmlsdGVyQ29uc3RhbnRzLmggXAogICAgIHBsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvQ3Vz dG9tRmlsdGVyR2xvYmFsQ29udGV4dC5oIFwKICAgICBwbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJz L0N1c3RvbUZpbHRlck1lc2guaCBcCiAgICAgcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9DdXN0 b21GaWx0ZXJNZXNoR2VuZXJhdG9yLmggXApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2Vi Q29yZS5neXBpIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBpCmluZGV4IDQ5MGQyMTQuLjgx ZWYzYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaQorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKQEAgLTQ5MzAsNiArNDkzMCw3IEBACiAgICAgICAgICAg ICAncGxhdGZvcm0vZ3JhcGhpY3MvZWZsL0ludFBvaW50RWZsLmNwcCcsCiAgICAgICAgICAgICAn cGxhdGZvcm0vZ3JhcGhpY3MvZWZsL0ludFJlY3RFZmwuY3BwJywKICAgICAgICAgICAgICdwbGF0 Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0N1c3RvbUZpbHRlckFycmF5UGFyYW1ldGVyLmgnLAorICAg ICAgICAgICAgJ3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvQ3VzdG9tRmlsdGVyQ29uc3RhbnRz LmgnLAogICAgICAgICAgICAgJ3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvQ3VzdG9tRmlsdGVy R2xvYmFsQ29udGV4dC5jcHAnLAogICAgICAgICAgICAgJ3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRl cnMvQ3VzdG9tRmlsdGVyR2xvYmFsQ29udGV4dC5oJywKICAgICAgICAgICAgICdwbGF0Zm9ybS9n cmFwaGljcy9maWx0ZXJzL0N1c3RvbUZpbHRlck1lc2guaCcsCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCmluZGV4IDRjOTkyMjcuLjUzZjM1YTcgMTAwNzU1 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCisrKyBi L1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCkBAIC0zMTg0MSw2 ICszMTg0MSwxMCBAQAogCQkJCQkJPgogCQkJCQk8L0ZpbGU+CiAJCQkJCTxGaWxlCisJCQkJCQlS ZWxhdGl2ZVBhdGg9Ii4uXHBsYXRmb3JtXGdyYXBoaWNzXGZpbHRlcnNcQ3VzdG9tRmlsdGVyQ29u c3RhbnRzLmgiCisJCQkJCQk+CisJCQkJCTwvRmlsZT4KKwkJCQkJPEZpbGUKIAkJCQkJCVJlbGF0 aXZlUGF0aD0iLi5ccGxhdGZvcm1cZ3JhcGhpY3NcZmlsdGVyc1xDdXN0b21GaWx0ZXJHbG9iYWxD b250ZXh0LmNwcCIKIAkJCQkJCT4KIAkJCQkJPC9GaWxlPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL1dlYkNvcmUv V2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IDEwZWQ1OWYuLmM3NDBhZDUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4 cHJvagorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHBy b2oKQEAgLTM3ODEsNiArMzc4MSw3IEBACiAJCUExRTExNTQ0MTMwMTVDM0QwMDU0QUM4QyAvKiBE aXN0YW50TGlnaHRTb3VyY2UuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gQTFFMTE1NDMxMzAxNUMzRDAwNTRBQzhDIC8qIERpc3RhbnRMaWdodFNvdXJj ZS5jcHAgKi87IH07CiAJCUExRTExNTQ2MTMwMTVDNEUwMDU0QUM4QyAvKiBQb2ludExpZ2h0U291 cmNlLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEEx RTExNTQ1MTMwMTVDNEUwMDU0QUM4QyAvKiBQb2ludExpZ2h0U291cmNlLmNwcCAqLzsgfTsKIAkJ QTFFMTE1NDgxMzAxNUM1RDAwNTRBQzhDIC8qIFNwb3RMaWdodFNvdXJjZS5jcHAgaW4gU291cmNl cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBMUUxMTU0NzEzMDE1QzVEMDA1 NEFDOEMgLyogU3BvdExpZ2h0U291cmNlLmNwcCAqLzsgfTsKKwkJQTI0QTNBOUQxNjI0OTlGRjAw NTIyNzQ1IC8qIEN1c3RvbUZpbHRlckNvbnN0YW50cy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQTI0QTNBOUMxNjI0OTlGRjAwNTIyNzQ1IC8qIEN1c3Rv bUZpbHRlckNvbnN0YW50cy5oICovOyB9OwogCQlBMjRCRjc3QjE1Q0MzQkFGMDAzMTkxRjIgLyog V2ViS2l0Q1NTTWl4RnVuY3Rpb25WYWx1ZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gQTI0QkY3NzkxNUNDM0JBRjAwMzE5MUYyIC8qIFdlYktpdENTU01p eEZ1bmN0aW9uVmFsdWUuaCAqLzsgfTsKIAkJQTI0QkY3N0MxNUNDM0JBRjAwMzE5MUYyIC8qIFdl YktpdENTU01peEZ1bmN0aW9uVmFsdWUuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gQTI0QkY3N0ExNUNDM0JBRjAwMzE5MUYyIC8qIFdlYktpdENTU01p eEZ1bmN0aW9uVmFsdWUuY3BwICovOyB9OwogCQlBMjk1MzJDRjE1REQ1RTE3MDA0NjlFQkMgLyog Q3VzdG9tRmlsdGVyVmFsaWRhdGVkUHJvZ3JhbS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBMjk1MzJDRDE1REQ1RTE3MDA0NjlFQkMgLyogQ3VzdG9t RmlsdGVyVmFsaWRhdGVkUHJvZ3JhbS5jcHAgKi87IH07CkBAIC0xMTAyMiw2ICsxMTAyMyw3IEBA CiAJCUExRTExNTQzMTMwMTVDM0QwMDU0QUM4QyAvKiBEaXN0YW50TGlnaHRTb3VyY2UuY3BwICov ID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZp bGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBuYW1lID0gRGlzdGFudExpZ2h0U291cmNlLmNw cDsgcGF0aCA9IGZpbHRlcnMvRGlzdGFudExpZ2h0U291cmNlLmNwcDsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKIAkJQTFFMTE1NDUxMzAxNUM0RTAwNTRBQzhDIC8qIFBvaW50TGlnaHRTb3Vy Y2UuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBuYW1lID0gUG9pbnRMaWdodFNv dXJjZS5jcHA7IHBhdGggPSBmaWx0ZXJzL1BvaW50TGlnaHRTb3VyY2UuY3BwOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OwogCQlBMUUxMTU0NzEzMDE1QzVEMDA1NEFDOEMgLyogU3BvdExpZ2h0 U291cmNlLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgbmFtZSA9IFNwb3RMaWdo dFNvdXJjZS5jcHA7IHBhdGggPSBmaWx0ZXJzL1Nwb3RMaWdodFNvdXJjZS5jcHA7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CisJCUEyNEEzQTlDMTYyNDk5RkYwMDUyMjc0NSAvKiBDdXN0b21G aWx0ZXJDb25zdGFudHMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gQ3VzdG9t RmlsdGVyQ29uc3RhbnRzLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUEyNEJGNzc5 MTVDQzNCQUYwMDMxOTFGMiAvKiBXZWJLaXRDU1NNaXhGdW5jdGlvblZhbHVlLmggKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdlYktpdENTU01peEZ1bmN0aW9uVmFsdWUuaDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQTI0QkY3N0ExNUNDM0JBRjAwMzE5MUYyIC8qIFdl YktpdENTU01peEZ1bmN0aW9uVmFsdWUuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7 IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3Bw OyBwYXRoID0gV2ViS2l0Q1NTTWl4RnVuY3Rpb25WYWx1ZS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdy b3VwPiI7IH07CiAJCUEyOTUzMkNEMTVERDVFMTcwMDQ2OUVCQyAvKiBDdXN0b21GaWx0ZXJWYWxp ZGF0ZWRQcm9ncmFtLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgbmFtZSA9IEN1 c3RvbUZpbHRlclZhbGlkYXRlZFByb2dyYW0uY3BwOyBwYXRoID0gZmlsdGVycy9DdXN0b21GaWx0 ZXJWYWxpZGF0ZWRQcm9ncmFtLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTE4 MTcxLDYgKzE4MTczLDcgQEAKIAkJCQkxNUIzRkMxNzE1RkIyMTc4MDBBODFCQ0IgLyogQ3VzdG9t RmlsdGVyQXJyYXlQYXJhbWV0ZXIuaCAqLywKIAkJCQk1MEQ0MDYwRjE0N0Q0OURFMDBEMzBCQjUg LyogQ3VzdG9tRmlsdGVyQ29tcGlsZWRQcm9ncmFtLmNwcCAqLywKIAkJCQk1MEQ0MDYxMDE0N0Q0 OURFMDBEMzBCQjUgLyogQ3VzdG9tRmlsdGVyQ29tcGlsZWRQcm9ncmFtLmggKi8sCisJCQkJQTI0 QTNBOUMxNjI0OTlGRjAwNTIyNzQ1IC8qIEN1c3RvbUZpbHRlckNvbnN0YW50cy5oICovLAogCQkJ CTUwOTg3QzI0MTU3RDY3NkQwMEJEQTgzNSAvKiBDdXN0b21GaWx0ZXJHbG9iYWxDb250ZXh0LmNw cCAqLywKIAkJCQk1MDk4N0MyNTE1N0Q2NzZEMDBCREE4MzUgLyogQ3VzdG9tRmlsdGVyR2xvYmFs Q29udGV4dC5oICovLAogCQkJCTUwRDQwNUY3MTQ3RDMxRjMwMEQzMEJCNSAvKiBDdXN0b21GaWx0 ZXJNZXNoLmNwcCAqLywKQEAgLTIyNTkxLDYgKzIyNTk0LDcgQEAKIAkJCQk2MkNEMzI1QTExNTdF NTdDMDA2M0IwQTcgLyogQ3VzdG9tRXZlbnQuaCBpbiBIZWFkZXJzICovLAogCQkJCTE1QjNGQzE5 MTVGQjIxNzgwMEE4MUJDQiAvKiBDdXN0b21GaWx0ZXJBcnJheVBhcmFtZXRlci5oIGluIEhlYWRl cnMgKi8sCiAJCQkJNTBENDA2MTIxNDdENDlERTAwRDMwQkI1IC8qIEN1c3RvbUZpbHRlckNvbXBp bGVkUHJvZ3JhbS5oIGluIEhlYWRlcnMgKi8sCisJCQkJQTI0QTNBOUQxNjI0OTlGRjAwNTIyNzQ1 IC8qIEN1c3RvbUZpbHRlckNvbnN0YW50cy5oIGluIEhlYWRlcnMgKi8sCiAJCQkJNTA5ODdDMjcx NTdENjc2RDAwQkRBODM1IC8qIEN1c3RvbUZpbHRlckdsb2JhbENvbnRleHQuaCBpbiBIZWFkZXJz ICovLAogCQkJCTUwRDQwNUZBMTQ3RDMxRjMwMEQzMEJCNSAvKiBDdXN0b21GaWx0ZXJNZXNoLmgg aW4gSGVhZGVycyAqLywKIAkJCQk3RTEyRTkwRjE1RkE1RDNBMDA1RTQxMjYgLyogQ3VzdG9tRmls dGVyTWVzaEdlbmVyYXRvci5oIGluIEhlYWRlcnMgKi8sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9DdXN0b21GaWx0ZXJDb25zdGFudHMuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0N1c3RvbUZpbHRlckNvbnN0YW50cy5oCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjYwODBjMzgKLS0tIC9kZXYvbnVsbAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9DdXN0b21GaWx0ZXJDb25zdGFudHMuaApA QCAtMCwwICsxLDUwIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDEyIEFkb2JlIFN5c3RlbXMg SW5jb3Jwb3JhdGVkLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9u IGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICog bW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBj b25kaXRpb25zCisgKiBhcmUgbWV0OgorICoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3Vy Y2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUKKyAqICAgIGNvcHlyaWdodCBub3RpY2UsIHRo aXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nCisgKiAgICBkaXNjbGFpbWVy LgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRo ZSBhYm92ZQorICogICAgY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMg YW5kIHRoZSBmb2xsb3dpbmcKKyAqICAgIGRpc2NsYWltZXIgaW4gdGhlIGRvY3VtZW50YXRpb24g YW5kL29yIG90aGVyIG1hdGVyaWFscworICogICAgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0 aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBI T0xERVIg4oCcQVMgSVPigJ0gQU5EIEFOWQorICogRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJ RVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUKKyAqIElNUExJRUQgV0FSUkFO VElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICog UFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVCBI T0xERVIgQkUKKyAqIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUws IFNQRUNJQUwsIEVYRU1QTEFSWSwKKyAqIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVE SU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdP T0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IKKyAqIFBST0ZJVFM7IE9SIEJV U0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWQorICogVEhFT1JZ IE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IK KyAqIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBB TlkgV0FZIE9VVCBPRgorICogVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklT RUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GCisgKiBTVUNIIERBTUFHRS4KKyAqLworCisjaWZuZGVm IEN1c3RvbUZpbHRlckNvbnN0YW50c19oCisjZGVmaW5lIEN1c3RvbUZpbHRlckNvbnN0YW50c19o CisKK25hbWVzcGFjZSBXZWJDb3JlIHsKKworZW51bSBDdXN0b21GaWx0ZXJNZXNoQ29uc3RhbnRz IHsKKyAgICAvLyBWZXJ0ZXggYXR0cmlidXRlIHNpemVzCisgICAgUG9zaXRpb25BdHRyaWJTaXpl ID0gNCwKKyAgICBUZXhBdHRyaWJTaXplID0gMiwKKyAgICBNZXNoQXR0cmliU2l6ZSA9IDIsCisg ICAgVHJpYW5nbGVBdHRyaWJTaXplID0gMywKKyAgICAvLyBWZXJ0ZXggYXR0cmlidXRlIG9mZnNl dHMKKyAgICBQb3NpdGlvbkF0dHJpYk9mZnNldCA9IDAsCisgICAgVGV4QXR0cmliT2Zmc2V0ID0g UG9zaXRpb25BdHRyaWJPZmZzZXQgKyBQb3NpdGlvbkF0dHJpYlNpemUgKiBzaXplb2YoZmxvYXQp LAorICAgIE1lc2hBdHRyaWJPZmZzZXQgPSBUZXhBdHRyaWJPZmZzZXQgKyBUZXhBdHRyaWJTaXpl ICogc2l6ZW9mKGZsb2F0KSwKKyAgICBUcmlhbmdsZUF0dHJpYk9mZnNldCA9IE1lc2hBdHRyaWJP ZmZzZXQgKyBNZXNoQXR0cmliU2l6ZSAqIHNpemVvZihmbG9hdCkKK307CisKK30gLy8gbmFtZXNw YWNlIFdlYkNvcmUKKworI2VuZGlmIC8vIEN1c3RvbUZpbHRlckNvbnN0YW50c19oCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0N1c3RvbUZpbHRl ck1lc2hHZW5lcmF0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRl cnMvQ3VzdG9tRmlsdGVyTWVzaEdlbmVyYXRvci5oCmluZGV4IDA5Zjc1NjIuLmIzYTE4NDcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvQ3VzdG9t RmlsdGVyTWVzaEdlbmVyYXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2ZpbHRlcnMvQ3VzdG9tRmlsdGVyTWVzaEdlbmVyYXRvci5oCkBAIC0zMiw2ICszMiw3IEBA CiAKICNpZiBFTkFCTEUoQ1NTX1NIQURFUlMpICYmIFVTRSgzRF9HUkFQSElDUykKIAorI2luY2x1 ZGUgIkN1c3RvbUZpbHRlckNvbnN0YW50cy5oIgogI2luY2x1ZGUgIkN1c3RvbUZpbHRlck9wZXJh dGlvbi5oIgogI2luY2x1ZGUgIkZsb2F0UmVjdC5oIgogCkBAIC02MywxMyArNjQsOCBAQCBwdWJs aWM6CiAKICAgICB1bnNpZ25lZCBmbG9hdHNQZXJWZXJ0ZXgoKSBjb25zdAogICAgIHsKLSAgICAg ICAgc3RhdGljIGNvbnN0IHVuc2lnbmVkIEF0dGFjaGVkTWVzaFZlcnRleFNpemUgPSA0ICsgLy8g dmVjNCBhX3Bvc2l0aW9uCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgMiArIC8vIHZlYzIgYV90ZXhDb29yZAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDI7IC8vIHZlYzIgYV9tZXNoQ29v cmQKLQotICAgICAgICBzdGF0aWMgY29uc3QgdW5zaWduZWQgRGV0YWNoZWRNZXNoVmVydGV4U2l6 ZSA9IEF0dGFjaGVkTWVzaFZlcnRleFNpemUgKwotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIDM7IC8vIHZlYzMgYV90cmlhbmdsZUNvb3JkCi0K KyAgICAgICAgc3RhdGljIGNvbnN0IHVuc2lnbmVkIEF0dGFjaGVkTWVzaFZlcnRleFNpemUgPSBQ b3NpdGlvbkF0dHJpYlNpemUgKyBUZXhBdHRyaWJTaXplICsgTWVzaEF0dHJpYlNpemU7CisgICAg ICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBEZXRhY2hlZE1lc2hWZXJ0ZXhTaXplID0gQXR0YWNo ZWRNZXNoVmVydGV4U2l6ZSArIFRyaWFuZ2xlQXR0cmliU2l6ZTsKICAgICAgICAgcmV0dXJuIG1f bWVzaFR5cGUgPT0gQ3VzdG9tRmlsdGVyT3BlcmF0aW9uOjpBVFRBQ0hFRCA/IEF0dGFjaGVkTWVz aFZlcnRleFNpemUgOiBEZXRhY2hlZE1lc2hWZXJ0ZXhTaXplOwogICAgIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRUN1c3RvbUZpbHRl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFQ3VzdG9t RmlsdGVyLmNwcAppbmRleCAzY2ViN2ZhLi5kOWEzYzc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFQ3VzdG9tRmlsdGVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFQ3VzdG9tRmlsdGVyLmNw cApAQCAtMzUsNiArMzUsNyBAQAogCiAjaW5jbHVkZSAiQ3VzdG9tRmlsdGVyQXJyYXlQYXJhbWV0 ZXIuaCIKICNpbmNsdWRlICJDdXN0b21GaWx0ZXJDb21waWxlZFByb2dyYW0uaCIKKyNpbmNsdWRl ICJDdXN0b21GaWx0ZXJDb25zdGFudHMuaCIKICNpbmNsdWRlICJDdXN0b21GaWx0ZXJHbG9iYWxD b250ZXh0LmgiCiAjaW5jbHVkZSAiQ3VzdG9tRmlsdGVyTWVzaC5oIgogI2luY2x1ZGUgIkN1c3Rv bUZpbHRlck51bWJlclBhcmFtZXRlci5oIgpAQCAtNTcwLDE4ICs1NzEsNiBAQCB2b2lkIEZFQ3Vz dG9tRmlsdGVyOjpiaW5kUHJvZ3JhbUFuZEJ1ZmZlcnMoUGxhdGZvcm0zRE9iamVjdCBpbnB1dFRl eHR1cmUpCiAgICAgbV9jb250ZXh0LT5iaW5kQnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpBUlJB WV9CVUZGRVIsIG1fbWVzaC0+dmVydGljZXNCdWZmZXJPYmplY3QoKSk7CiAgICAgbV9jb250ZXh0 LT5iaW5kQnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpFTEVNRU5UX0FSUkFZX0JVRkZFUiwgbV9t ZXNoLT5lbGVtZW50c0J1ZmZlck9iamVjdCgpKTsKIAotICAgIC8vIEZJWE1FOiBJZGVhbGx5LCB0 aGVzZSBzaG91bGQgYmUgcHVibGljIG1lbWJlcnMgb2YgQ3VzdG9tRmlsdGVyTWVzaC4KLSAgICAv LyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQ3NTUKLSAgICBzdGF0 aWMgY29uc3QgdW5zaWduZWQgUG9zaXRpb25BdHRyaWJTaXplID0gNDsKLSAgICBzdGF0aWMgY29u c3QgdW5zaWduZWQgVGV4QXR0cmliU2l6ZSA9IDI7Ci0gICAgc3RhdGljIGNvbnN0IHVuc2lnbmVk IE1lc2hBdHRyaWJTaXplID0gMjsKLSAgICBzdGF0aWMgY29uc3QgdW5zaWduZWQgVHJpYW5nbGVB dHRyaWJTaXplID0gMzsKLQotICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBQb3NpdGlvbkF0dHJp Yk9mZnNldCA9IDA7Ci0gICAgc3RhdGljIGNvbnN0IHVuc2lnbmVkIFRleEF0dHJpYk9mZnNldCA9 IFBvc2l0aW9uQXR0cmliT2Zmc2V0ICsgUG9zaXRpb25BdHRyaWJTaXplICogc2l6ZW9mKGZsb2F0 KTsKLSAgICBzdGF0aWMgY29uc3QgdW5zaWduZWQgTWVzaEF0dHJpYk9mZnNldCA9IFRleEF0dHJp Yk9mZnNldCArIFRleEF0dHJpYlNpemUgKiBzaXplb2YoZmxvYXQpOwotICAgIHN0YXRpYyBjb25z dCB1bnNpZ25lZCBUcmlhbmdsZUF0dHJpYk9mZnNldCA9IE1lc2hBdHRyaWJPZmZzZXQgKyBNZXNo QXR0cmliU2l6ZSAqIHNpemVvZihmbG9hdCk7Ci0KICAgICBiaW5kVmVydGV4QXR0cmlidXRlKG1f Y29tcGlsZWRQcm9ncmFtLT5wb3NpdGlvbkF0dHJpYkxvY2F0aW9uKCksIFBvc2l0aW9uQXR0cmli U2l6ZSwgUG9zaXRpb25BdHRyaWJPZmZzZXQpOwogICAgIGJpbmRWZXJ0ZXhBdHRyaWJ1dGUobV9j b21waWxlZFByb2dyYW0tPnRleEF0dHJpYkxvY2F0aW9uKCksIFRleEF0dHJpYlNpemUsIFRleEF0 dHJpYk9mZnNldCk7CiAgICAgLy8gRklYTUU6IEdldCByaWQgb2YgdGhlIGludGVybmFsIHRleCBj b29yZCBhdHRyaWJ1dGUgImNzc19hX3RleENvb3JkIi4gCg==