213634 2020-06-25 20:38:53 -0700 Clean up some PaintBehavior-related code in RenderLayer 2020-06-26 09:39:20 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser bfulgham changseok esprehn+autocc ews-watchlist fred.wang glenn kondapallykalyan pdr sam simon.fraser webkit-bug-importer zalan oldest_to_newest 1666358 0 simon.fraser 2020-06-25 20:38:53 -0700 Clean up some PaintBehavior-related code in RenderLayer 1666359 1 402845 simon.fraser 2020-06-25 20:47:59 -0700 Created attachment 402845 Patch 1666482 2 ews-feeder 2020-06-26 09:38:50 -0700 Committed r263562: <https://trac.webkit.org/changeset/263562> All reviewed patches have been landed. Closing bug and clearing flags on attachment 402845. 1666483 3 webkit-bug-importer 2020-06-26 09:39:20 -0700 <rdar://problem/64809624> 402845 2020-06-25 20:47:59 -0700 2020-06-26 09:38:51 -0700 Patch bug-213634-20200625204758.patch text/plain 10597 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzNTMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDMxYjYwYmMzZGY1NGEw ODRiNTQ0NzNkMTQwODZkMTNkNzYyMzcyOC4uZGE0ZThmMmI2ZTZkYzAxMjg2ZGJlYjY5Y2FmMjA3 Yjc1OTkwMzFkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTA2LTI1ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENsZWFuIHVwIHNv bWUgUGFpbnRCZWhhdmlvci1yZWxhdGVkIGNvZGUgaW4gUmVuZGVyTGF5ZXIKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzYzNAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgdGhlIGNvbXB1dGF0aW9u IG9mIHBhaW50QmVoYXZpb3IgaW50byBhIGxhbWJkYSwgYW5kIHNoYXJlIHRoZSBmbGFncyBiZXR3 ZWVuCisgICAgICAgIG5vcm1hbCBwYWludGluZyBhbmQgbWFzayBwYWludGluZy4KKworICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM YXllcjo6cGFpbnRMYXllckNvbnRlbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVy OjpjYWxjdWxhdGVDbGlwUmVjdHMgY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJM YXllci5oOgorCiAyMDIwLTA2LTI1ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUu Y29tPgogCiAgICAgICAgIENvbnZlcnQgdGhlIFBhaW50TGF5ZXJGbGFnIGVudW0gdG8gYW4gZW51 bSBjbGFzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggZWZi YzI0M2ViNTIxYTZmNTVmMmY5YjE1NWI4MTc2NGRhMDgzZTUyMi4uODljMGNkOTQ2Yzc0NTY2NjI0 MTUwNzZiNDBjNWQyN2RkMWI2MmU4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXIuY3BwCkBAIC00NTM0LDE0ICs0NTM0LDE3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50 TGF5ZXJDb250ZW50cyhHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IExheWVyUGFpbnRp CiAgICAgICAgIHJldHVybjsKIAogICAgIGF1dG8gbG9jYWxQYWludEZsYWdzID0gcGFpbnRGbGFn cyAtIFBhaW50TGF5ZXJGbGFnOjpBcHBsaWVkVHJhbnNmb3JtOworCiAgICAgYm9vbCBoYXZlVHJh bnNwYXJlbmN5ID0gbG9jYWxQYWludEZsYWdzLmNvbnRhaW5zKFBhaW50TGF5ZXJGbGFnOjpIYXZl VHJhbnNwYXJlbmN5KTsKKyAgICBib29sIGlzUGFpbnRpbmdPdmVybGF5U2Nyb2xsYmFycyA9IGxv Y2FsUGFpbnRGbGFncy5jb250YWlucyhQYWludExheWVyRmxhZzo6UGFpbnRpbmdPdmVybGF5U2Ny b2xsYmFycyk7CisgICAgYm9vbCBpc1BhaW50aW5nU2Nyb2xsaW5nQ29udGVudCA9IGxvY2FsUGFp bnRGbGFncy5jb250YWlucyhQYWludExheWVyRmxhZzo6UGFpbnRpbmdDb21wb3NpdGluZ1Njcm9s bGluZ1BoYXNlKTsKKyAgICBib29sIGlzUGFpbnRpbmdDb21wb3NpdGVkRm9yZWdyb3VuZCA9IGxv Y2FsUGFpbnRGbGFncy5jb250YWlucyhQYWludExheWVyRmxhZzo6UGFpbnRpbmdDb21wb3NpdGlu Z0ZvcmVncm91bmRQaGFzZSk7CisgICAgYm9vbCBpc1BhaW50aW5nQ29tcG9zaXRlZEJhY2tncm91 bmQgPSBsb2NhbFBhaW50RmxhZ3MuY29udGFpbnMoUGFpbnRMYXllckZsYWc6OlBhaW50aW5nQ29t cG9zaXRpbmdCYWNrZ3JvdW5kUGhhc2UpOworICAgIGJvb2wgaXNQYWludGluZ092ZXJmbG93Q29u dGVudHMgPSBsb2NhbFBhaW50RmxhZ3MuY29udGFpbnMoUGFpbnRMYXllckZsYWc6OlBhaW50aW5n T3ZlcmZsb3dDb250ZW50cyk7CisgICAgYm9vbCBpc0NvbGxlY3RpbmdFdmVudFJlZ2lvbiA9IGxv Y2FsUGFpbnRGbGFncy5jb250YWlucyhQYWludExheWVyRmxhZzo6Q29sbGVjdGluZ0V2ZW50UmVn aW9uKTsKKwogICAgIGJvb2wgaXNTZWxmUGFpbnRpbmdMYXllciA9IHRoaXMtPmlzU2VsZlBhaW50 aW5nTGF5ZXIoKTsKLSAgICBib29sIGlzUGFpbnRpbmdPdmVybGF5U2Nyb2xsYmFycyA9IHBhaW50 RmxhZ3MuY29udGFpbnMoUGFpbnRMYXllckZsYWc6OlBhaW50aW5nT3ZlcmxheVNjcm9sbGJhcnMp OwotICAgIGJvb2wgaXNQYWludGluZ1Njcm9sbGluZ0NvbnRlbnQgPSBwYWludEZsYWdzLmNvbnRh aW5zKFBhaW50TGF5ZXJGbGFnOjpQYWludGluZ0NvbXBvc2l0aW5nU2Nyb2xsaW5nUGhhc2UpOwot ICAgIGJvb2wgaXNQYWludGluZ0NvbXBvc2l0ZWRGb3JlZ3JvdW5kID0gcGFpbnRGbGFncy5jb250 YWlucyhQYWludExheWVyRmxhZzo6UGFpbnRpbmdDb21wb3NpdGluZ0ZvcmVncm91bmRQaGFzZSk7 Ci0gICAgYm9vbCBpc1BhaW50aW5nQ29tcG9zaXRlZEJhY2tncm91bmQgPSBwYWludEZsYWdzLmNv bnRhaW5zKFBhaW50TGF5ZXJGbGFnOjpQYWludGluZ0NvbXBvc2l0aW5nQmFja2dyb3VuZFBoYXNl KTsKLSAgICBib29sIGlzUGFpbnRpbmdPdmVyZmxvd0NvbnRlbnRzID0gcGFpbnRGbGFncy5jb250 YWlucyhQYWludExheWVyRmxhZzo6UGFpbnRpbmdPdmVyZmxvd0NvbnRlbnRzKTsKLSAgICBib29s IGlzQ29sbGVjdGluZ0V2ZW50UmVnaW9uID0gcGFpbnRGbGFncy5jb250YWlucyhQYWludExheWVy RmxhZzo6Q29sbGVjdGluZ0V2ZW50UmVnaW9uKTsKKwogICAgIC8vIE91dGxpbmUgYWx3YXlzIG5l ZWRzIHRvIGJlIHBhaW50ZWQgZXZlbiBpZiB3ZSBoYXZlIG5vIHZpc2libGUgY29udGVudC4gQWxz bywKICAgICAvLyB0aGUgb3V0bGluZSBpcyBwYWludGVkIGluIHRoZSBiYWNrZ3JvdW5kIHBoYXNl IGR1cmluZyBjb21wb3NpdGVkIHNjcm9sbGluZy4KICAgICAvLyBJZiBpdCB3ZXJlIHBhaW50ZWQg aW4gdGhlIGZvcmVncm91bmQgcGhhc2UsIGl0IHdvdWxkIG1vdmUgd2l0aCB0aGUgc2Nyb2xsZWQK QEAgLTQ1NTQsNyArNDU1Nyw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50TGF5ZXJDb250ZW50 cyhHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IExheWVyUGFpbnRpCiAgICAgICAgIHx8 ICghaXNQYWludGluZ1Njcm9sbGluZ0NvbnRlbnQgJiYgaXNQYWludGluZ0NvbXBvc2l0ZWRGb3Jl Z3JvdW5kKSk7CiAgICAgYm9vbCBzaG91bGRQYWludENvbnRlbnQgPSBtX2hhc1Zpc2libGVDb250 ZW50ICYmIGlzU2VsZlBhaW50aW5nTGF5ZXIgJiYgIWlzUGFpbnRpbmdPdmVybGF5U2Nyb2xsYmFy cyAmJiAhaXNDb2xsZWN0aW5nRXZlbnRSZWdpb247CiAKLSAgICBpZiAobG9jYWxQYWludEZsYWdz ICYgUGFpbnRMYXllckZsYWc6OlBhaW50aW5nUm9vdEJhY2tncm91bmRPbmx5ICYmICFyZW5kZXJl cigpLmlzUmVuZGVyVmlldygpICYmICFyZW5kZXJlcigpLmlzRG9jdW1lbnRFbGVtZW50UmVuZGVy ZXIoKSkgeworICAgIGlmIChsb2NhbFBhaW50RmxhZ3MuY29udGFpbnMoUGFpbnRMYXllckZsYWc6 OlBhaW50aW5nUm9vdEJhY2tncm91bmRPbmx5KSAmJiAhcmVuZGVyZXIoKS5pc1JlbmRlclZpZXco KSAmJiAhcmVuZGVyZXIoKS5pc0RvY3VtZW50RWxlbWVudFJlbmRlcmVyKCkpIHsKICAgICAgICAg Ly8gSWYgYmVnaW5UcmFuc3BhcmVuY3lMYXllcnMgd2FzIGNhbGxlZCBwcmlvciB0byB0aGlzLCBl bnN1cmUgdGhlIHRyYW5zcGFyZW5jeSBzdGF0ZSBpcyBjbGVhbmVkIHVwIGJlZm9yZSByZXR1cm5p bmcuCiAgICAgICAgIGlmIChoYXZlVHJhbnNwYXJlbmN5ICYmIG1fdXNlZFRyYW5zcGFyZW5jeSAm JiAhbV9wYWludGluZ0luc2lkZVJlZmxlY3Rpb24pIHsKICAgICAgICAgICAgIGNvbnRleHQuZW5k VHJhbnNwYXJlbmN5TGF5ZXIoKTsKQEAgLTQ1OTIsNiArNDU5NSwyNSBAQCB2b2lkIFJlbmRlckxh eWVyOjpwYWludExheWVyQ29udGVudHMoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBM YXllclBhaW50aQogICAgIExheWVyRnJhZ21lbnRzIGxheWVyRnJhZ21lbnRzOwogICAgIFJlbmRl ck9iamVjdCogc3VidHJlZVBhaW50Um9vdEZvclJlbmRlcmVyID0gbnVsbHB0cjsKIAorICAgIGF1 dG8gcGFpbnRCZWhhdmlvciA9IFsmXSgpIHsKKyAgICAgICAgY29uc3RleHByIE9wdGlvblNldDxQ YWludEJlaGF2aW9yPiBmbGFnc1RvQ29weSA9IHsgUGFpbnRCZWhhdmlvcjo6RmxhdHRlbkNvbXBv c2l0aW5nTGF5ZXJzLCBQYWludEJlaGF2aW9yOjpTbmFwc2hvdHRpbmcsIFBhaW50QmVoYXZpb3I6 OkV4Y2x1ZGVTZWxlY3Rpb24gfTsKKyAgICAgICAgT3B0aW9uU2V0PFBhaW50QmVoYXZpb3I+IHBh aW50QmVoYXZpb3IgPSBwYWludGluZ0luZm8ucGFpbnRCZWhhdmlvciAmIGZsYWdzVG9Db3B5Owor CisgICAgICAgIGlmIChsb2NhbFBhaW50RmxhZ3MuY29udGFpbnMoUGFpbnRMYXllckZsYWc6OlBh aW50aW5nU2tpcFJvb3RCYWNrZ3JvdW5kKSkKKyAgICAgICAgICAgIHBhaW50QmVoYXZpb3IuYWRk KFBhaW50QmVoYXZpb3I6OlNraXBSb290QmFja2dyb3VuZCk7CisgICAgICAgIGVsc2UgaWYgKGxv Y2FsUGFpbnRGbGFncy5jb250YWlucyhQYWludExheWVyRmxhZzo6UGFpbnRpbmdSb290QmFja2dy b3VuZE9ubHkpKQorICAgICAgICAgICAgcGFpbnRCZWhhdmlvci5hZGQoUGFpbnRCZWhhdmlvcjo6 Um9vdEJhY2tncm91bmRPbmx5KTsKKworICAgICAgICAvLyBGSVhNRTogVGhpcyBzZWVtcyB3cm9u Zy4gV2Ugc2hvdWxkIHJldGFpbiB0aGUgVGlsZUZpcnN0UGFpbnQgZmxhZyBmb3IgYWxsIFJlbmRl ckxheWVycyBwYWludGVkIGludG8gdGhlIHJvb3QgdGlsZSBjYWNoZS4KKyAgICAgICAgaWYgKChw YWludGluZ0luZm8ucGFpbnRCZWhhdmlvciAmIFBhaW50QmVoYXZpb3I6OlRpbGVGaXJzdFBhaW50 KSAmJiBpc1JlbmRlclZpZXdMYXllcigpKQorICAgICAgICAgICAgcGFpbnRCZWhhdmlvci5hZGQo UGFpbnRCZWhhdmlvcjo6VGlsZUZpcnN0UGFpbnQpOworCisgICAgICAgIGlmIChpc1BhaW50aW5n U2Nyb2xsaW5nQ29udGVudCAmJiBpc1BhaW50aW5nT3ZlcmZsb3dDb250ZW50cykKKyAgICAgICAg ICAgIHBhaW50QmVoYXZpb3IuYWRkKFBhaW50QmVoYXZpb3I6OkNvbXBvc2l0ZWRPdmVyZmxvd1Nj cm9sbENvbnRlbnQpOworCisgICAgICAgIHJldHVybiBwYWludEJlaGF2aW9yOworICAgIH0oKTsK KwogICAgIHsgLy8gU2NvcGUgZm9yIGZpbHRlci1yZWxhdGVkIHN0YXRlIGNoYW5nZXMuCiAgICAg ICAgIExheWVyUGFpbnRpbmdJbmZvIGxvY2FsUGFpbnRpbmdJbmZvKHBhaW50aW5nSW5mbyk7CiAg ICAgICAgIEdyYXBoaWNzQ29udGV4dCogZmlsdGVyQ29udGV4dCA9IHNldHVwRmlsdGVycyhjb250 ZXh0LCBsb2NhbFBhaW50aW5nSW5mbywgcGFpbnRGbGFncywgY29sdW1uQXdhcmVPZmZzZXRGcm9t Um9vdCwgcm9vdFJlbGF0aXZlQm91bmRzKTsKQEAgLTQ2MTEsMjcgKzQ2MzMsNiBAQCB2b2lkIFJl bmRlckxheWVyOjpwYWludExheWVyQ29udGVudHMoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBj b25zdCBMYXllclBhaW50aQogICAgICAgICBpZiAobG9jYWxQYWludGluZ0luZm8ub3ZlcmxhcFRl c3RSZXF1ZXN0cyAmJiBpc1NlbGZQYWludGluZ0xheWVyKQogICAgICAgICAgICAgcGVyZm9ybU92 ZXJsYXBUZXN0cygqbG9jYWxQYWludGluZ0luZm8ub3ZlcmxhcFRlc3RSZXF1ZXN0cywgbG9jYWxQ YWludGluZ0luZm8ucm9vdExheWVyLCB0aGlzKTsKIAotICAgICAgICBPcHRpb25TZXQ8UGFpbnRC ZWhhdmlvcj4gcGFpbnRCZWhhdmlvciA9IFBhaW50QmVoYXZpb3I6Ok5vcm1hbDsKLSAgICAgICAg aWYgKGxvY2FsUGFpbnRGbGFncyAmIFBhaW50TGF5ZXJGbGFnOjpQYWludGluZ1NraXBSb290QmFj a2dyb3VuZCkKLSAgICAgICAgICAgIHBhaW50QmVoYXZpb3IuYWRkKFBhaW50QmVoYXZpb3I6OlNr aXBSb290QmFja2dyb3VuZCk7Ci0gICAgICAgIGVsc2UgaWYgKGxvY2FsUGFpbnRGbGFncyAmIFBh aW50TGF5ZXJGbGFnOjpQYWludGluZ1Jvb3RCYWNrZ3JvdW5kT25seSkKLSAgICAgICAgICAgIHBh aW50QmVoYXZpb3IuYWRkKFBhaW50QmVoYXZpb3I6OlJvb3RCYWNrZ3JvdW5kT25seSk7Ci0KLSAg ICAgICAgaWYgKHBhaW50aW5nSW5mby5wYWludEJlaGF2aW9yICYgUGFpbnRCZWhhdmlvcjo6Rmxh dHRlbkNvbXBvc2l0aW5nTGF5ZXJzKQotICAgICAgICAgICAgcGFpbnRCZWhhdmlvci5hZGQoUGFp bnRCZWhhdmlvcjo6RmxhdHRlbkNvbXBvc2l0aW5nTGF5ZXJzKTsKLSAgICAgICAgCi0gICAgICAg IGlmIChwYWludGluZ0luZm8ucGFpbnRCZWhhdmlvciAmIFBhaW50QmVoYXZpb3I6OlNuYXBzaG90 dGluZykKLSAgICAgICAgICAgIHBhaW50QmVoYXZpb3IuYWRkKFBhaW50QmVoYXZpb3I6OlNuYXBz aG90dGluZyk7Ci0gICAgICAgIAotICAgICAgICBpZiAoKHBhaW50aW5nSW5mby5wYWludEJlaGF2 aW9yICYgUGFpbnRCZWhhdmlvcjo6VGlsZUZpcnN0UGFpbnQpICYmIGlzUmVuZGVyVmlld0xheWVy KCkpCi0gICAgICAgICAgICBwYWludEJlaGF2aW9yLmFkZChQYWludEJlaGF2aW9yOjpUaWxlRmly c3RQYWludCk7Ci0KLSAgICAgICAgaWYgKHBhaW50aW5nSW5mby5wYWludEJlaGF2aW9yICYgUGFp bnRCZWhhdmlvcjo6RXhjbHVkZVNlbGVjdGlvbikKLSAgICAgICAgICAgIHBhaW50QmVoYXZpb3Iu YWRkKFBhaW50QmVoYXZpb3I6OkV4Y2x1ZGVTZWxlY3Rpb24pOwotCi0gICAgICAgIGlmIChpc1Bh aW50aW5nU2Nyb2xsaW5nQ29udGVudCAmJiBpc1BhaW50aW5nT3ZlcmZsb3dDb250ZW50cykKLSAg ICAgICAgICAgIHBhaW50QmVoYXZpb3IuYWRkKFBhaW50QmVoYXZpb3I6OkNvbXBvc2l0ZWRPdmVy Zmxvd1Njcm9sbENvbnRlbnQpOwotCiAgICAgICAgIExheW91dFJlY3QgcGFpbnREaXJ0eVJlY3Qg PSBsb2NhbFBhaW50aW5nSW5mby5wYWludERpcnR5UmVjdDsKICAgICAgICAgaWYgKHNob3VsZFBh aW50Q29udGVudCB8fCBzaG91bGRQYWludE91dGxpbmUgfHwgaXNQYWludGluZ092ZXJsYXlTY3Jv bGxiYXJzIHx8IGlzQ29sbGVjdGluZ0V2ZW50UmVnaW9uKSB7CiAgICAgICAgICAgICAvLyBDb2xs ZWN0IHRoZSBmcmFnbWVudHMuIFRoaXMgd2lsbCBjb21wdXRlIHRoZSBjbGlwIHJlY3RhbmdsZXMg YW5kIHBhaW50IG9mZnNldHMgZm9yIGVhY2ggbGF5ZXIgZnJhZ21lbnQsIGFzIHdlbGwgYXMgd2hl dGhlciBvciBub3QgdGhlIGNvbnRlbnQgb2YgZWFjaApAQCAtNDY5OSwxOSArNDcwMCw2IEBAIHZv aWQgUmVuZGVyTGF5ZXI6OnBhaW50TGF5ZXJDb250ZW50cyhHcmFwaGljc0NvbnRleHQmIGNvbnRl eHQsIGNvbnN0IExheWVyUGFpbnRpCiAgICAgfQogICAgIAogICAgIGlmIChzaG91bGRQYWludENv bnRlbnQgJiYgIShzZWxlY3Rpb25Pbmx5IHx8IHNlbGVjdGlvbkFuZEJhY2tncm91bmRzT25seSkp IHsKLSAgICAgICAgT3B0aW9uU2V0PFBhaW50QmVoYXZpb3I+IHBhaW50QmVoYXZpb3IgPSBQYWlu dEJlaGF2aW9yOjpOb3JtYWw7Ci0gICAgICAgIGlmIChwYWludGluZ0luZm8ucGFpbnRCZWhhdmlv ciAmIFBhaW50QmVoYXZpb3I6OkZsYXR0ZW5Db21wb3NpdGluZ0xheWVycykKLSAgICAgICAgICAg IHBhaW50QmVoYXZpb3IuYWRkKFBhaW50QmVoYXZpb3I6OkZsYXR0ZW5Db21wb3NpdGluZ0xheWVy cyk7Ci0gICAgICAgIAotICAgICAgICBpZiAocGFpbnRpbmdJbmZvLnBhaW50QmVoYXZpb3IgJiBQ YWludEJlaGF2aW9yOjpTbmFwc2hvdHRpbmcpCi0gICAgICAgICAgICBwYWludEJlaGF2aW9yLmFk ZChQYWludEJlaGF2aW9yOjpTbmFwc2hvdHRpbmcpOwotICAgICAgICAKLSAgICAgICAgaWYgKHBh aW50aW5nSW5mby5wYWludEJlaGF2aW9yICYgUGFpbnRCZWhhdmlvcjo6VGlsZUZpcnN0UGFpbnQp Ci0gICAgICAgICAgICBwYWludEJlaGF2aW9yLmFkZChQYWludEJlaGF2aW9yOjpUaWxlRmlyc3RQ YWludCk7Ci0KLSAgICAgICAgaWYgKGlzUGFpbnRpbmdTY3JvbGxpbmdDb250ZW50ICYmIGlzUGFp bnRpbmdPdmVyZmxvd0NvbnRlbnRzKQotICAgICAgICAgICAgcGFpbnRCZWhhdmlvci5hZGQoUGFp bnRCZWhhdmlvcjo6Q29tcG9zaXRlZE92ZXJmbG93U2Nyb2xsQ29udGVudCk7Ci0KICAgICAgICAg aWYgKHNob3VsZFBhaW50TWFzayhwYWludGluZ0luZm8ucGFpbnRCZWhhdmlvciwgbG9jYWxQYWlu dEZsYWdzKSkgewogICAgICAgICAgICAgLy8gUGFpbnQgdGhlIG1hc2sgZm9yIHRoZSBmcmFnbWVu dHMuCiAgICAgICAgICAgICBwYWludE1hc2tGb3JGcmFnbWVudHMobGF5ZXJGcmFnbWVudHMsIGNv bnRleHQsIHBhaW50aW5nSW5mbywgcGFpbnRCZWhhdmlvciwgc3VidHJlZVBhaW50Um9vdEZvclJl bmRlcmVyKTsKQEAgLTcwNjgsNiArNzA1NiwyOSBAQCBUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRl eHRTdHJlYW0mIHRzLCBJbmRpcmVjdENvbXBvc2l0aW5nUmVhc29uIHJlYXNvbikKICAgICByZXR1 cm4gdHM7CiB9CiAKK1RleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYgdHMsIFBhaW50 QmVoYXZpb3IgYmVoYXZpb3IpCit7CisgICAgc3dpdGNoIChiZWhhdmlvcikgeworICAgIGNhc2Ug UGFpbnRCZWhhdmlvcjo6Tm9ybWFsOiB0cyA8PCAiTm9ybWFsIjsgYnJlYWs7CisgICAgY2FzZSBQ YWludEJlaGF2aW9yOjpTZWxlY3Rpb25Pbmx5OiB0cyA8PCAiU2VsZWN0aW9uT25seSI7IGJyZWFr OworICAgIGNhc2UgUGFpbnRCZWhhdmlvcjo6U2tpcFNlbGVjdGlvbkhpZ2hsaWdodDogdHMgPDwg IlNraXBTZWxlY3Rpb25IaWdobGlnaHQiOyBicmVhazsKKyAgICBjYXNlIFBhaW50QmVoYXZpb3I6 OkZvcmNlQmxhY2tUZXh0OiB0cyA8PCAiRm9yY2VCbGFja1RleHQiOyBicmVhazsKKyAgICBjYXNl IFBhaW50QmVoYXZpb3I6OkZvcmNlV2hpdGVUZXh0OiB0cyA8PCAiRm9yY2VXaGl0ZVRleHQiOyBi cmVhazsKKyAgICBjYXNlIFBhaW50QmVoYXZpb3I6OlJlbmRlcmluZ1NWR01hc2s6IHRzIDw8ICJS ZW5kZXJpbmdTVkdNYXNrIjsgYnJlYWs7CisgICAgY2FzZSBQYWludEJlaGF2aW9yOjpTa2lwUm9v dEJhY2tncm91bmQ6IHRzIDw8ICJTa2lwUm9vdEJhY2tncm91bmQiOyBicmVhazsKKyAgICBjYXNl IFBhaW50QmVoYXZpb3I6OlJvb3RCYWNrZ3JvdW5kT25seTogdHMgPDwgIlJvb3RCYWNrZ3JvdW5k T25seSI7IGJyZWFrOworICAgIGNhc2UgUGFpbnRCZWhhdmlvcjo6U2VsZWN0aW9uQW5kQmFja2dy b3VuZHNPbmx5OiB0cyA8PCAiU2VsZWN0aW9uQW5kQmFja2dyb3VuZHNPbmx5IjsgYnJlYWs7Cisg ICAgY2FzZSBQYWludEJlaGF2aW9yOjpFeGNsdWRlU2VsZWN0aW9uOiB0cyA8PCAiRXhjbHVkZVNl bGVjdGlvbiI7IGJyZWFrOworICAgIGNhc2UgUGFpbnRCZWhhdmlvcjo6RmxhdHRlbkNvbXBvc2l0 aW5nTGF5ZXJzOiB0cyA8PCAiRmxhdHRlbkNvbXBvc2l0aW5nTGF5ZXJzIjsgYnJlYWs7CisgICAg Y2FzZSBQYWludEJlaGF2aW9yOjpTbmFwc2hvdHRpbmc6IHRzIDw8ICJTbmFwc2hvdHRpbmciOyBi cmVhazsKKyAgICBjYXNlIFBhaW50QmVoYXZpb3I6OlRpbGVGaXJzdFBhaW50OiB0cyA8PCAiVGls ZUZpcnN0UGFpbnQiOyBicmVhazsKKyAgICBjYXNlIFBhaW50QmVoYXZpb3I6OkNvbXBvc2l0ZWRP dmVyZmxvd1Njcm9sbENvbnRlbnQ6IHRzIDw8ICJDb21wb3NpdGVkT3ZlcmZsb3dTY3JvbGxDb250 ZW50IjsgYnJlYWs7CisgICAgY2FzZSBQYWludEJlaGF2aW9yOjpBbm5vdGF0ZUxpbmtzOiB0cyA8 PCAiQW5ub3RhdGVMaW5rcyI7IGJyZWFrOworICAgIH0KKworICAgIHJldHVybiB0czsKK30KKwog fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjaWYgRU5BQkxFKFRSRUVfREVCVUdHSU5HKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmggYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAppbmRleCBlYjlmYWNlNzEyNGU4ZWU5Y2I4 YTc0MjY4ZWMwMjkxYWVkMDRiMjg2Li45NWQyMTlhNjNiNTExZmEwNDlhZDEzYTBmYzk0NjM5NjVm NmVlYTY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaApAQCAtMTQzMSw2 ICsxNDMxLDcgQEAgV1RGOjpUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFdURjo6VGV4dFN0cmVhbSYs IENsaXBSZWN0c1R5cGUpOwogV1RGOjpUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFdURjo6VGV4dFN0 cmVhbSYsIGNvbnN0IFJlbmRlckxheWVyJik7CiBXVEY6OlRleHRTdHJlYW0mIG9wZXJhdG9yPDwo V1RGOjpUZXh0U3RyZWFtJiwgY29uc3QgUmVuZGVyTGF5ZXI6OkNsaXBSZWN0c0NvbnRleHQmKTsK IFdURjo6VGV4dFN0cmVhbSYgb3BlcmF0b3I8PChXVEY6OlRleHRTdHJlYW0mLCBJbmRpcmVjdENv bXBvc2l0aW5nUmVhc29uKTsKK1dURjo6VGV4dFN0cmVhbSYgb3BlcmF0b3I8PChXVEY6OlRleHRT dHJlYW0mLCBQYWludEJlaGF2aW9yKTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCg==