112757 2013-03-19 17:28:46 -0700 [BlackBerry] Enable appropriate vertex attribute arrays in LayerRenderer::useProgram() 2013-03-20 07:35:16 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 anilsson anilsson anilsson jpetsovits mifenton rwlbuis tonikitoo webkit.review.bot oldest_to_newest 858896 0 anilsson 2013-03-19 17:28:46 -0700 This should make the enabling of vertex attribute arrays more foolproof. PR 306465, 313099 859250 1 194020 anilsson 2013-03-20 04:37:33 -0700 Created attachment 194020 Patch 859355 2 194020 rwlbuis 2013-03-20 06:49:54 -0700 Comment on attachment 194020 Patch LGTM. 859358 3 194020 anilsson 2013-03-20 06:54:20 -0700 Comment on attachment 194020 Patch Thank you Rob =) 859387 4 194020 webkit.review.bot 2013-03-20 07:35:13 -0700 Comment on attachment 194020 Patch Clearing flags on attachment: 194020 Committed r146343: <http://trac.webkit.org/changeset/146343> 859388 5 webkit.review.bot 2013-03-20 07:35:16 -0700 All reviewed patches have been landed. Closing bug. 194020 2013-03-20 04:37:33 -0700 2013-03-20 07:35:13 -0700 Patch bug-112757-20130320123322.patch text/plain 7903 anilsson U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MzIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTA1ZWMzMTg4ZTRhZGIz ZWE0Yzk0MjYxYzdjOGRkODc4NmY2ODBhNC4uMWI5YzVmY2Q3Nzg3NWIzNzM1NWJjNTM5OTU3ZDA5 ZDZlODBjOGZjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEzLTAzLTIwICBBcnZp ZCBOaWxzc29uICA8YW5pbHNzb25AcmltLmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gRW5h YmxlIGFwcHJvcHJpYXRlIHZlcnRleCBhdHRyaWJ1dGUgYXJyYXlzIGluIExheWVyUmVuZGVyZXI6 OnVzZVByb2dyYW0oKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTEyNzU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgUFIgMzA2NDY1CisKKyAgICAgICAgTWFrZSB0aGUgTGF5ZXJSZW5kZXJlciBhbmQgYXNz b2NpYXRlZCBjb2RlIG1vcmUgYnVsbGV0LXByb29mIHdoZW4gaXQKKyAgICAgICAgY29tZXMgdG8g ZW5hYmxpbmcgdmVydGV4IGF0dHJpYnV0ZSBhcnJheXMsIGJ5IGVuYWJsaW5nIHRoZW0gYWxyZWFk eQorICAgICAgICB3aGVuIExheWVyUmVuZGVyZXI6OnVzZVByb2dyYW0oKSBpcyBjYWxsZWQuIFRo aXMgZml4ZXMgYSBidWcgd2hlcmUgdGhlCisgICAgICAgIHZpZGVvIGhvbGUgcHVuY2ggcmVjdGFu Z2xlIHdhc24ndCBwdW5jaGVkIHdoZW4gcHJlY2VkaW5nIHJlbmRlcmluZworICAgICAgICBjYXVz ZWQgdGhlIHZlcnRleCBhdHRyaWJ1dGUgYXJyYXkgYXQgaW5kZXggMCB0byBiZSBkaXNhYmxlZCwg c3VjaCBhcworICAgICAgICB3aGVuIHJlbmRlcmluZyB0aGUgdGV4dCBzZWxlY3Rpb24gb3Zlcmxh eSBpbW1lZGlhdGVseSBiZWZvcmUgdmlkZW8uCisKKyAgICAgICAgQSBudW1iZXIgb2YgcGxhY2Vz IHdoZXJlIHRoZSBwb3NpdGlvbiBhdHRyaWJ1dGUgaW5kZXggd2FzIGhhcmQtY29kZWQKKyAgICAg ICAgdG8gMCB3ZXJlIGFsc28gZml4ZWQuIFRoaXMgY2F1c2VzIG5vIGNoYW5nZSBpbiBiZWhhdmlv ciwgdGhlIHBvc2l0aW9uCisgICAgICAgIGF0dHJpYnV0ZSB3YXMgcmVhbGx5IGF0IDAsIGJ1dCBu b25ldGhlbGVzcyB0aGF0IHNob3VsZG4ndCBiZSBoYXJkY29kZWQuCisKKyAgICAgICAgVGhlIGVm ZmVjdHMgb2YgdGhpcyBwYXRjaCBhcmUgb25seSBtYW51YWxseSB0ZXN0YWJsZS4KKworICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJDb21wb3NpdGluZ1RocmVhZC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMYXllckNvbXBvc2l0aW5nVGhyZWFkOjpkcmF3VGV4dHVy ZXMpOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJDb21wb3NpdGluZ1RocmVhZDo6ZHJhd1N1cmZh Y2UpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJSZW5kZXJl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXllclJlbmRlcmVyOjpjb21wb3NpdGVCdWZmZXIp OgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJSZW5kZXJlcjo6ZHJhd0NvbG9yKToKKyAgICAgICAg KFdlYkNvcmU6OkxheWVyUmVuZGVyZXI6OmRyYXdEZWJ1Z0JvcmRlcik6CisgICAgICAgIChXZWJD b3JlOjpMYXllclJlbmRlcmVyOjpkcmF3SG9sZVB1bmNoUmVjdCk6CisgICAgICAgIChXZWJDb3Jl OjpMYXllclJlbmRlcmVyOjpjb21wb3NpdGVMYXllcnNSZWN1cnNpdmUpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5ZXJSZW5kZXJlcjo6dXNlUHJvZ3JhbSk6CisKIDIwMTMtMDMtMjAgIEFsZXhlaSBG aWxpcHBvdiAgPGFscGhAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEFs bG93IHRvb2xiYXIgY3VzdG9taXphdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9MYXllckNvbXBvc2l0aW5nVGhyZWFkLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJDb21wb3NpdGlu Z1RocmVhZC5jcHAKaW5kZXggNTg2MTRhYmQ2ZTdlZDBhMzM3YTA1ZTg2NGNmZWFkOWQxNDM4NzBh Ni4uZDcxNWFhNDYxMWY2ZWRlMjhhNGMwZDY2YzczYjllNDlhNTIzZWZmMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9MYXllckNvbXBvc2l0 aW5nVGhyZWFkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFj a2JlcnJ5L0xheWVyQ29tcG9zaXRpbmdUaHJlYWQuY3BwCkBAIC0yMzIsOCArMjMyLDYgQEAgdm9p ZCBMYXllckNvbXBvc2l0aW5nVGhyZWFkOjpkcmF3VGV4dHVyZXMoZG91YmxlIHNjYWxlLCBjb25z dCBHTEVTMlByb2dyYW0mIHByb2cKIAogICAgICAgICAgICAgZ2xFbmFibGUoR0xfQkxFTkQpOwog ICAgICAgICAgICAgZ2xCbGVuZEZ1bmMoR0xfT05FLCBHTF9PTkVfTUlOVVNfU1JDX0FMUEhBKTsK LSAgICAgICAgICAgIGdsRW5hYmxlVmVydGV4QXR0cmliQXJyYXkocHJvZ3JhbS5wb3NpdGlvbkxv Y2F0aW9uKCkpOwotICAgICAgICAgICAgZ2xFbmFibGVWZXJ0ZXhBdHRyaWJBcnJheShwcm9ncmFt LnRleENvb3JkTG9jYXRpb24oKSk7CiAgICAgICAgICAgICBnbFVuaWZvcm0xZihwcm9ncmFtLm9w YWNpdHlMb2NhdGlvbigpLCBkcmF3T3BhY2l0eSgpKTsKICAgICAgICAgICAgIGdsVmVydGV4QXR0 cmliUG9pbnRlcihwcm9ncmFtLnBvc2l0aW9uTG9jYXRpb24oKSwgMiwgR0xfRkxPQVQsIEdMX0ZB TFNFLCAwLCAmbV90cmFuc2Zvcm1lZEJvdW5kcyk7CiAgICAgICAgICAgICBnbFZlcnRleEF0dHJp YlBvaW50ZXIocHJvZ3JhbS50ZXhDb29yZExvY2F0aW9uKCksIDIsIEdMX0ZMT0FULCBHTF9GQUxT RSwgMCwgdGV4Y29vcmRzKTsKQEAgLTMxMyw4ICszMTEsNiBAQCB2b2lkIExheWVyQ29tcG9zaXRp bmdUaHJlYWQ6OmRyYXdTdXJmYWNlKGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4JiBkcmF3VHJh bnNmbwogICAgICAgICBnbEJpbmRUZXh0dXJlKEdMX1RFWFRVUkVfMkQsIHN1cmZhY2VUZXhJRCk7 CiAKICAgICAgICAgRmxvYXRRdWFkIHN1cmZhY2VRdWFkID0gZ2V0VHJhbnNmb3JtZWRSZWN0KG1f Ym91bmRzLCBJbnRSZWN0KEludFBvaW50Ojp6ZXJvKCksIG1fYm91bmRzKSwgZHJhd1RyYW5zZm9y bSk7Ci0gICAgICAgIGdsRW5hYmxlVmVydGV4QXR0cmliQXJyYXkocHJvZ3JhbS5wb3NpdGlvbkxv Y2F0aW9uKCkpOwotICAgICAgICBnbEVuYWJsZVZlcnRleEF0dHJpYkFycmF5KHByb2dyYW0udGV4 Q29vcmRMb2NhdGlvbigpKTsKICAgICAgICAgZ2xVbmlmb3JtMWYocHJvZ3JhbS5vcGFjaXR5TG9j YXRpb24oKSwgbGF5ZXJSZW5kZXJlclN1cmZhY2UoKS0+ZHJhd09wYWNpdHkoKSk7CiAgICAgICAg IGdsVmVydGV4QXR0cmliUG9pbnRlcihwcm9ncmFtLnBvc2l0aW9uTG9jYXRpb24oKSwgMiwgR0xf RkxPQVQsIEdMX0ZBTFNFLCAwLCAmc3VyZmFjZVF1YWQpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVyUmVuZGVyZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9MYXllclJlbmRlcmVy LmNwcAppbmRleCBjMDQxNzIzZmY4ODVhZTA2NjBiNGQ2ZDkwNjdhMGViOTRlOTNiOTkyLi4zMzU1 ZWQwMzMxYWRiNWU0NzM4MDYwMWZmMmMyNGJjMzE2NmU3MjUzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVyUmVuZGVyZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJSZW5k ZXJlci5jcHAKQEAgLTQwMyw4ICs0MDMsNiBAQCB2b2lkIExheWVyUmVuZGVyZXI6OmNvbXBvc2l0 ZUJ1ZmZlcihjb25zdCBUcmFuc2Zvcm1hdGlvbk1hdHJpeCYgdHJhbnNmb3JtLCBjb25zdAogICAg ICAgICBjb25zdCBHTEVTMlByb2dyYW0mIHByb2dyYW0gPSB1c2VQcm9ncmFtKExheWVyUHJvZ3Jh bVJHQkEpOwogICAgICAgICBnbFVuaWZvcm0xZihwcm9ncmFtLm9wYWNpdHlMb2NhdGlvbigpLCBv cGFjaXR5KTsKIAotICAgICAgICBnbEVuYWJsZVZlcnRleEF0dHJpYkFycmF5KHByb2dyYW0ucG9z aXRpb25Mb2NhdGlvbigpKTsKLSAgICAgICAgZ2xFbmFibGVWZXJ0ZXhBdHRyaWJBcnJheShwcm9n cmFtLnRleENvb3JkTG9jYXRpb24oKSk7CiAgICAgICAgIGdsVmVydGV4QXR0cmliUG9pbnRlcihw cm9ncmFtLnBvc2l0aW9uTG9jYXRpb24oKSwgMiwgR0xfRkxPQVQsIEdMX0ZBTFNFLCAwLCAmdmVy dGljZXMpOwogICAgICAgICBnbFZlcnRleEF0dHJpYlBvaW50ZXIocHJvZ3JhbS50ZXhDb29yZExv Y2F0aW9uKCksIDIsIEdMX0ZMT0FULCBHTF9GQUxTRSwgMCwgdGV4Y29vcmRzKTsKIApAQCAtNDMx LDcgKzQyOSw2IEBAIHZvaWQgTGF5ZXJSZW5kZXJlcjo6ZHJhd0NvbG9yKGNvbnN0IFRyYW5zZm9y bWF0aW9uTWF0cml4JiB0cmFuc2Zvcm0sIGNvbnN0IEZsb2F0CiAgICAgfSBlbHNlCiAgICAgICAg IGdsRGlzYWJsZShHTF9CTEVORCk7CiAKLSAgICBnbEVuYWJsZVZlcnRleEF0dHJpYkFycmF5KHBy b2dyYW0ucG9zaXRpb25Mb2NhdGlvbigpKTsKICAgICBnbFVuaWZvcm00ZihtX2NvbG9yQ29sb3JM b2NhdGlvbiwgY29sb3IucmVkKCkgLyAyNTUuMCwgY29sb3IuZ3JlZW4oKSAvIDI1NS4wLCBjb2xv ci5ibHVlKCkgLyAyNTUuMCwgY29sb3IuYWxwaGEoKSAvIDI1NS4wKTsKICAgICBnbFZlcnRleEF0 dHJpYlBvaW50ZXIocHJvZ3JhbS5wb3NpdGlvbkxvY2F0aW9uKCksIDIsIEdMX0ZMT0FULCBHTF9G QUxTRSwgMCwgJnZlcnRpY2VzKTsKIApAQCAtNTk0LDggKzU5MSw4IEBAIHZvaWQgTGF5ZXJSZW5k ZXJlcjo6ZHJhd0RlYnVnQm9yZGVyKExheWVyQ29tcG9zaXRpbmdUaHJlYWQqIGxheWVyKQogICAg IH0gZWxzZQogICAgICAgICBnbERpc2FibGUoR0xfQkxFTkQpOwogCi0gICAgdXNlUHJvZ3JhbShD b2xvclByb2dyYW0pOwotICAgIGdsVmVydGV4QXR0cmliUG9pbnRlcigwLCAyLCBHTF9GTE9BVCwg R0xfRkFMU0UsIDAsICZsYXllci0+Z2V0VHJhbnNmb3JtZWRCb3VuZHMoKSk7CisgICAgY29uc3Qg R0xFUzJQcm9ncmFtJiBwcm9ncmFtID0gdXNlUHJvZ3JhbShDb2xvclByb2dyYW0pOworICAgIGds VmVydGV4QXR0cmliUG9pbnRlcihwcm9ncmFtLnBvc2l0aW9uTG9jYXRpb24oKSwgMiwgR0xfRkxP QVQsIEdMX0ZBTFNFLCAwLCAmbGF5ZXItPmdldFRyYW5zZm9ybWVkQm91bmRzKCkpOwogICAgIGds VW5pZm9ybTRmKG1fY29sb3JDb2xvckxvY2F0aW9uLCBib3JkZXJDb2xvci5yZWQoKSAvIDI1NS4w LCBib3JkZXJDb2xvci5ncmVlbigpIC8gMjU1LjAsIGJvcmRlckNvbG9yLmJsdWUoKSAvIDI1NS4w LCAxKTsKIAogICAgIGdsTGluZVdpZHRoKHN0ZDo6bWF4KDEuMGYsIGxheWVyLT5ib3JkZXJXaWR0 aCgpKSk7CkBAIC02MDUsMTMgKzYwMiwxMyBAQCB2b2lkIExheWVyUmVuZGVyZXI6OmRyYXdEZWJ1 Z0JvcmRlcihMYXllckNvbXBvc2l0aW5nVGhyZWFkKiBsYXllcikKIC8vIENsZWFycyBhIHJlY3Rh bmdsZSBpbnNpZGUgdGhlIGxheWVyJ3MgYm91bmRzLgogdm9pZCBMYXllclJlbmRlcmVyOjpkcmF3 SG9sZVB1bmNoUmVjdChMYXllckNvbXBvc2l0aW5nVGhyZWFkKiBsYXllcikKIHsKLSAgICB1c2VQ cm9ncmFtKENvbG9yUHJvZ3JhbSk7CisgICAgY29uc3QgR0xFUzJQcm9ncmFtJiBwcm9ncmFtID0g dXNlUHJvZ3JhbShDb2xvclByb2dyYW0pOwogICAgIGdsVW5pZm9ybTRmKG1fY29sb3JDb2xvckxv Y2F0aW9uLCAwLCAwLCAwLCAwKTsKIAogICAgIGdsRW5hYmxlKEdMX0JMRU5EKTsKICAgICBnbEJs ZW5kRnVuYyhHTF9PTkUsIEdMX1pFUk8pOwogICAgIEZsb2F0UXVhZCBob2xlID0gbGF5ZXItPmdl dFRyYW5zZm9ybWVkSG9sZVB1bmNoUmVjdCgpOwotICAgIGdsVmVydGV4QXR0cmliUG9pbnRlcigw LCAyLCBHTF9GTE9BVCwgR0xfRkFMU0UsIDAsICZob2xlKTsKKyAgICBnbFZlcnRleEF0dHJpYlBv aW50ZXIocHJvZ3JhbS5wb3NpdGlvbkxvY2F0aW9uKCksIDIsIEdMX0ZMT0FULCBHTF9GQUxTRSwg MCwgJmhvbGUpOwogICAgIGdsRHJhd0FycmF5cyhHTF9UUklBTkdMRV9GQU4sIDAsIDQpOwogICAg IGNoZWNrR0xFcnJvcigpOwogfQpAQCAtOTQzLDkgKzk0MCw5IEBAIHZvaWQgTGF5ZXJSZW5kZXJl cjo6Y29tcG9zaXRlTGF5ZXJzUmVjdXJzaXZlKExheWVyQ29tcG9zaXRpbmdUaHJlYWQqIGxheWVy LCBpbnQKICAgICAgICAgZ2xTdGVuY2lsT3AoR0xfS0VFUCwgR0xfSU5DUiwgR0xfSU5DUik7CiAK ICAgICAgICAgdXBkYXRlU2Npc3NvcklmTmVlZGVkKGNsaXBSZWN0KTsKLSAgICAgICAgdXNlUHJv Z3JhbShDb2xvclByb2dyYW0pOworICAgICAgICBjb25zdCBHTEVTMlByb2dyYW0mIHByb2dyYW0g PSB1c2VQcm9ncmFtKENvbG9yUHJvZ3JhbSk7CiAgICAgICAgIGdsQ29sb3JNYXNrKEdMX0ZBTFNF LCBHTF9GQUxTRSwgR0xfRkFMU0UsIEdMX0ZBTFNFKTsKLSAgICAgICAgZ2xWZXJ0ZXhBdHRyaWJQ b2ludGVyKDAsIDIsIEdMX0ZMT0FULCBHTF9GQUxTRSwgMCwgJmxheWVyLT5nZXRUcmFuc2Zvcm1l ZEJvdW5kcygpKTsKKyAgICAgICAgZ2xWZXJ0ZXhBdHRyaWJQb2ludGVyKHByb2dyYW0ucG9zaXRp b25Mb2NhdGlvbigpLCAyLCBHTF9GTE9BVCwgR0xfRkFMU0UsIDAsICZsYXllci0+Z2V0VHJhbnNm b3JtZWRCb3VuZHMoKSk7CiAgICAgICAgIGdsRHJhd0FycmF5cyhHTF9UUklBTkdMRV9GQU4sIDAs IDQpOwogICAgICAgICBnbENvbG9yTWFzayhHTF9UUlVFLCBHTF9UUlVFLCBHTF9UUlVFLCBHTF9U UlVFKTsKICAgICB9CkBAIC05ODYsOSArOTgzLDkgQEAgdm9pZCBMYXllclJlbmRlcmVyOjpjb21w b3NpdGVMYXllcnNSZWN1cnNpdmUoTGF5ZXJDb21wb3NpdGluZ1RocmVhZCogbGF5ZXIsIGludAog ICAgICAgICBnbFN0ZW5jaWxPcChHTF9LRUVQLCBHTF9SRVBMQUNFLCBHTF9SRVBMQUNFKTsKIAog ICAgICAgICB1cGRhdGVTY2lzc29ySWZOZWVkZWQoY2xpcFJlY3QpOwotICAgICAgICB1c2VQcm9n cmFtKENvbG9yUHJvZ3JhbSk7CisgICAgICAgIGNvbnN0IEdMRVMyUHJvZ3JhbSYgcHJvZ3JhbSA9 IHVzZVByb2dyYW0oQ29sb3JQcm9ncmFtKTsKICAgICAgICAgZ2xDb2xvck1hc2soR0xfRkFMU0Us IEdMX0ZBTFNFLCBHTF9GQUxTRSwgR0xfRkFMU0UpOwotICAgICAgICBnbFZlcnRleEF0dHJpYlBv aW50ZXIoMCwgMiwgR0xfRkxPQVQsIEdMX0ZBTFNFLCAwLCAmbGF5ZXItPmdldFRyYW5zZm9ybWVk Qm91bmRzKCkpOworICAgICAgICBnbFZlcnRleEF0dHJpYlBvaW50ZXIocHJvZ3JhbS5wb3NpdGlv bkxvY2F0aW9uKCksIDIsIEdMX0ZMT0FULCBHTF9GQUxTRSwgMCwgJmxheWVyLT5nZXRUcmFuc2Zv cm1lZEJvdW5kcygpKTsKICAgICAgICAgZ2xEcmF3QXJyYXlzKEdMX1RSSUFOR0xFX0ZBTiwgMCwg NCk7CiAgICAgICAgIGdsQ29sb3JNYXNrKEdMX1RSVUUsIEdMX1RSVUUsIEdMX1RSVUUsIEdMX1RS VUUpOwogCkBAIC0xMTk3LDYgKzExOTQsMTAgQEAgY29uc3QgR0xFUzJQcm9ncmFtJiBMYXllclJl bmRlcmVyOjp1c2VQcm9ncmFtKFByb2dyYW1JbmRleCBpbmRleCkKIAogICAgIGdsVXNlUHJvZ3Jh bShwcm9ncmFtLm1fcHJvZ3JhbSk7CiAKKyAgICBnbEVuYWJsZVZlcnRleEF0dHJpYkFycmF5KHBy b2dyYW0ucG9zaXRpb25Mb2NhdGlvbigpKTsKKyAgICBpZiAoaW5kZXggIT0gQ29sb3JQcm9ncmFt KQorICAgICAgICBnbEVuYWJsZVZlcnRleEF0dHJpYkFycmF5KHByb2dyYW0udGV4Q29vcmRMb2Nh dGlvbigpKTsKKwogICAgIHJldHVybiBwcm9ncmFtOwogfQogCg==