211307 2020-05-01 12:10:52 -0700 Text manipulation should observe the value attribute of some input elements 2020-05-01 19:26:29 -0700 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin darin ews-watchlist megan_gardner mifenton sihui_liu thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1647959 0 wenson_hsieh 2020-05-01 12:10:52 -0700 <rdar://problem/61568528> 1648090 1 398246 wenson_hsieh 2020-05-01 15:10:10 -0700 Created attachment 398246 Patch 1648170 2 398246 darin 2020-05-01 18:39:38 -0700 Comment on attachment 398246 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=398246&action=review > Source/WebCore/editing/TextManipulationController.cpp:233 > + if (nameToCheck == valueAttr.get() && is<HTMLInputElement>(element)) > + return downcast<HTMLInputElement>(element).isTextButton(); I would write: if (nameToCheck == valueAttr) return is<HTMLInputElement>(element) && downcast<HTMLInputElement>(element).isTextButton(); 1648172 3 398246 wenson_hsieh 2020-05-01 18:43:24 -0700 Comment on attachment 398246 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=398246&action=review >> Source/WebCore/editing/TextManipulationController.cpp:233 >> + return downcast<HTMLInputElement>(element).isTextButton(); > > I would write: > > if (nameToCheck == valueAttr) > return is<HTMLInputElement>(element) && downcast<HTMLInputElement>(element).isTextButton(); Sounds good! 1648173 4 398269 wenson_hsieh 2020-05-01 18:48:00 -0700 Created attachment 398269 Patch for landing 1648177 5 ews-feeder 2020-05-01 19:26:28 -0700 Committed r261042: <https://trac.webkit.org/changeset/261042> All reviewed patches have been landed. Closing bug and clearing flags on attachment 398269. 398246 2020-05-01 15:10:10 -0700 2020-05-01 18:39:38 -0700 Patch bug-211307-20200501151010.patch text/plain 5490 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwOTgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjkxYjRiMjk2MDQwMjlk ZWE3ZjFlNjY4MjZhNzkyMWUxMTFlOTc1NS4uYTRlZGQ0MzZjZmQ2NGU5ZDc4NjE1NDI0N2QxNjRk NzlkZmQzNTY5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTA1LTAxICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFRleHQgbWFuaXB1 bGF0aW9uIHNob3VsZCBvYnNlcnZlIHRoZSB2YWx1ZSBhdHRyaWJ1dGUgb2Ygc29tZSBpbnB1dCBl bGVtZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjExMzA3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82MTU2ODUyOD4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZWFjaCBUZXh0TWFuaXB1bGF0aW9u Q29udHJvbGxlciB0byBkZXRlY3QgdGhlIGB2YWx1ZWAgYXR0cmlidXRlIGluIGlucHV0IGVsZW1l bnRzIG9mIHR5cGUgImJ1dHRvbiIgYW5kCisgICAgICAgICJzdWJtaXQiLiBUbyBkbyB0aGlzLCB3 ZSBwbHVtYiB0aGUgZWxlbWVudCB0aHJvdWdoIHRvIGBpc0F0dHJpYnV0ZUZvclRleHRNYW5pcHVs YXRpb25gIGFuZCBjaGVjayBgaXNUZXh0QnV0dG9uKClgCisgICAgICAgIGlmICJ2YWx1ZSIgYXR0 cmlidXRlIGlzIGJlaW5nIGNvbnNpZGVyZWQuCisKKyAgICAgICAgVGVzdDogVGV4dE1hbmlwdWxh dGlvbi5TdGFydFRleHRNYW5pcHVsYXRpb25FeHRyYWN0c1ZhbHVlc0Zyb21CdXR0b25JbnB1dHMK KworICAgICAgICAqIGVkaXRpbmcvVGV4dE1hbmlwdWxhdGlvbkNvbnRyb2xsZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6aXNBdHRyaWJ1dGVGb3JUZXh0TWFuaXB1bGF0aW9uKToKKyAgICAgICAg KFdlYkNvcmU6OlRleHRNYW5pcHVsYXRpb25Db250cm9sbGVyOjpvYnNlcnZlUGFyYWdyYXBocyk6 CisKIDIwMjAtMDQtMzAgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAK ICAgICAgICAgQ2xlYW4gdXAgc29tZSBFdmVudEhhbmRsZXIgY29vcmRpbmF0ZS1yZWxhdGVkIG5h bWluZyBhbmQgZml4IFNjcm9sbGFibGVBcmVhOjpsYXN0S25vd25Nb3VzZVBvc2l0aW9uKCkgY29u dmVyc2lvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVGV4dE1hbmlwdWxh dGlvbkNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9UZXh0TWFuaXB1bGF0 aW9uQ29udHJvbGxlci5jcHAKaW5kZXggNzdjYzUzY2EzMzQ0Y2MxZGUyMDJkZTRhODQ0NzNjYzk4 MmY1NzJkZi4uOTg4MTJjOTYyY2I3MTQ3YjZlNDhiZjRmZjE4ZDYyZjY3MGJlMzRhNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9UZXh0TWFuaXB1bGF0aW9uQ29udHJvbGxlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9UZXh0TWFuaXB1bGF0aW9uQ29udHJvbGxl ci5jcHAKQEAgLTMzLDYgKzMzLDcgQEAKICNpbmNsdWRlICJFdmVudExvb3AuaCIKICNpbmNsdWRl ICJIVE1MQlJFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTEVsZW1lbnQuaCIKKyNpbmNsdWRlICJI VE1MSW5wdXRFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTE5hbWVzLmgiCiAjaW5jbHVkZSAiSFRN TFBhcnNlcklkaW9tcy5oIgogI2luY2x1ZGUgIk5vZGVUcmF2ZXJzYWwuaCIKQEAgLTIyNCw5ICsy MjUsMTMgQEAgcHJpdmF0ZToKICAgICBSZWZQdHI8Tm9kZT4gbV9wYXN0RW5kTm9kZTsKIH07CiAK LXN0YXRpYyBib29sIGlzQXR0cmlidXRlRm9yVGV4dE1hbmlwdWxhdGlvbihjb25zdCBRdWFsaWZp ZWROYW1lJiBuYW1lVG9DaGVjaykKK3N0YXRpYyBib29sIGlzQXR0cmlidXRlRm9yVGV4dE1hbmlw dWxhdGlvbihjb25zdCBFbGVtZW50JiBlbGVtZW50LCBjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1l VG9DaGVjaykKIHsKICAgICB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOworCisgICAgaWYgKG5h bWVUb0NoZWNrID09IHZhbHVlQXR0ci5nZXQoKSAmJiBpczxIVE1MSW5wdXRFbGVtZW50PihlbGVt ZW50KSkKKyAgICAgICAgcmV0dXJuIGRvd25jYXN0PEhUTUxJbnB1dEVsZW1lbnQ+KGVsZW1lbnQp LmlzVGV4dEJ1dHRvbigpOworCiAgICAgc3RhdGljIGNvbnN0IFF1YWxpZmllZE5hbWUqIGNvbnN0 IGF0dHJpYnV0ZU5hbWVzW10gPSB7CiAgICAgICAgICZ0aXRsZUF0dHIuZ2V0KCksCiAgICAgICAg ICZhbHRBdHRyLmdldCgpLApAQCAtMzQwLDcgKzM0NSw3IEBAIHZvaWQgVGV4dE1hbmlwdWxhdGlv bkNvbnRyb2xsZXI6Om9ic2VydmVQYXJhZ3JhcGhzKGNvbnN0IFBvc2l0aW9uJiBzdGFydCwgY29u c3QKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgaWYgKGN1cnJlbnRFbGVtZW50 Lmhhc0F0dHJpYnV0ZXMoKSkgewogICAgICAgICAgICAgICAgICAgICBmb3IgKGF1dG8mIGF0dHJp YnV0ZSA6IGN1cnJlbnRFbGVtZW50LmF0dHJpYnV0ZXNJdGVyYXRvcigpKSB7Ci0gICAgICAgICAg ICAgICAgICAgICAgICBpZiAoaXNBdHRyaWJ1dGVGb3JUZXh0TWFuaXB1bGF0aW9uKGF0dHJpYnV0 ZS5uYW1lKCkpKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBpZiAoaXNBdHRyaWJ1dGVGb3JU ZXh0TWFuaXB1bGF0aW9uKGN1cnJlbnRFbGVtZW50LCBhdHRyaWJ1dGUubmFtZSgpKSkgewogICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGFkZEl0ZW0oTWFuaXB1bGF0aW9uSXRlbURhdGEgeyBQ b3NpdGlvbigpLCBQb3NpdGlvbigpLCBtYWtlV2Vha1B0cihjdXJyZW50RWxlbWVudCksIGF0dHJp YnV0ZS5uYW1lKCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHsgTWFuaXB1bGF0 aW9uVG9rZW4geyBtX3Rva2VuSWRlbnRpZmllci5nZW5lcmF0ZSgpLCBhdHRyaWJ1dGUudmFsdWUo KSwgdG9rZW5JbmZvKCZjdXJyZW50RWxlbWVudCkgfSB9IH0pOwogICAgICAgICAgICAgICAgICAg ICAgICAgfQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmlu ZGV4IDRjYjgzMWQ4ZWUzMjdmNTE2MmVjZDE2MTA1ZDJiYTAwNzVlMGY5ZTQuLmE0Y2Q0OTBhODIy NjllMWFkOTU0YjUyZjY0Yzg5YmVmYzFhMmE4NmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxv ZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMC0wNS0wMSAgV2Vu c29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KKworICAgICAgICBUZXh0IG1hbmlw dWxhdGlvbiBzaG91bGQgb2JzZXJ2ZSB0aGUgdmFsdWUgYXR0cmlidXRlIG9mIHNvbWUgaW5wdXQg ZWxlbWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxMTMwNworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjE1Njg1Mjg+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgbmV3IEFQSSB0ZXN0IHRo YXQgY292ZXJzIGA8aW5wdXQgdHlwZT0ic3VibWl0Ij5gIGFuZCBgPGlucHV0IHR5cGU9ImJ1dHRv biI+YC4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVGV4dE1h bmlwdWxhdGlvbi5tbToKKwogMjAyMC0wNC0zMCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3Rl bnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFRlc3RXZWJLaXRBUEkuV2ViS2l0LkRlZmF1bHRE aXNwbGF5TmFtZSBhbmQgVGVzdFdlYktpdEFQSS5XZWJLaXQuQ3VzdG9tRGlzcGxheU5hbWUgYXJl IGZsYWt5IGZhaWx1cmVzCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1RleHRNYW5pcHVsYXRpb24ubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdENvY29hL1RleHRNYW5pcHVsYXRpb24ubW0KaW5kZXggMzFjZjFjYWZhMGY1NWQ1NDgy Njc1YmI3YmRkYmIyZGE0NjI3ZGRhOC4uZjY0YjZlMzkzZmM5MzE1M2E5YzExODhjZGQwODA3ZDY3 ZWU5ZWZmNyAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9UZXh0TWFuaXB1bGF0aW9uLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Q29jb2EvVGV4dE1hbmlwdWxhdGlvbi5tbQpAQCAtNzU3LDYgKzc1NywzNSBAQCBURVNUKFRl eHRNYW5pcHVsYXRpb24sIFN0YXJ0VGV4dE1hbmlwdWxhdGlvbkV4dHJhY3RzVXNlckluZm8pCiAg ICAgfQogfQogCitURVNUKFRleHRNYW5pcHVsYXRpb24sIFN0YXJ0VGV4dE1hbmlwdWxhdGlvbkV4 dHJhY3RzVmFsdWVzRnJvbUJ1dHRvbklucHV0cykKK3sKKyAgICBhdXRvIGRlbGVnYXRlID0gYWRv cHROUyhbW1RleHRNYW5pcHVsYXRpb25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIGF1dG8g d2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5T TWFrZVJlY3QoMCwgMCwgNDAwLCA0MDApXSk7CisgICAgW3dlYlZpZXcgX3NldFRleHRNYW5pcHVs YXRpb25EZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CisKKyAgICBbd2ViVmlldyBzeW5jaHJvbm91 c2x5TG9hZEhUTUxTdHJpbmc6QCI8IURPQ1RZUEUgaHRtbD4iCisgICAgICAgICI8Ym9keT4iCisg ICAgICAgICI8aW5wdXQgdHlwZT0nYnV0dG9uJyB2YWx1ZT0nT25lJz4iCisgICAgICAgICI8aW5w dXQgdHlwZT0nc3VibWl0JyB2YWx1ZT0nVHdvJz4iCisgICAgICAgICI8aW5wdXQgdHlwZT0ncGFz c3dvcmQnIHZhbHVlPSdUaHJlZSc+IgorICAgICAgICAiPGlucHV0IHR5cGU9J3JhbmdlJyB2YWx1 ZT0nNCc+IgorICAgICAgICAiPGlucHV0IHR5cGU9J2RhdGUnIHZhbHVlPScyMDIwLTA1LTAxJz4i CisgICAgICAgICI8L2JvZHk+Il07CisKKyAgICBkb25lID0gZmFsc2U7CisgICAgW3dlYlZpZXcg X3N0YXJ0VGV4dE1hbmlwdWxhdGlvbnNXaXRoQ29uZmlndXJhdGlvbjpuaWwgY29tcGxldGlvbjpe eworICAgICAgICBkb25lID0gdHJ1ZTsKKyAgICB9XTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGls OjpydW4oJmRvbmUpOworCisgICAgYXV0byBpdGVtcyA9IFtkZWxlZ2F0ZSBpdGVtc107CisgICAg RVhQRUNUX0VRKGl0ZW1zLmNvdW50LCAyVUwpOworICAgIEVYUEVDVF9FUShpdGVtc1swXS50b2tl bnMuY291bnQsIDFVTCk7CisgICAgRVhQRUNUX0VRKGl0ZW1zWzFdLnRva2Vucy5jb3VudCwgMVVM KTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoIk9uZSIsIGl0ZW1zWzBdLnRva2Vuc1swXS5jb250ZW50 KTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoIlR3byIsIGl0ZW1zWzFdLnRva2Vuc1swXS5jb250ZW50 KTsKK30KKwogc3RydWN0IFRva2VuIHsKICAgICBOU1N0cmluZyAqaWRlbnRpZmllcjsKICAgICBO U1N0cmluZyAqY29udGVudDsK 398269 2020-05-01 18:48:00 -0700 2020-05-01 19:26:28 -0700 Patch for landing bug-211307-20200501184759.patch text/plain 5478 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwOTgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjkxYjRiMjk2MDQwMjlk ZWE3ZjFlNjY4MjZhNzkyMWUxMTFlOTc1NS4uYjRlMjg4ZTUwOWU4OTQ5NGVhZDE0ZTU4NmFlMmU4 M2ViNWFmZGZiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTA1LTAxICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFRleHQgbWFuaXB1 bGF0aW9uIHNob3VsZCBvYnNlcnZlIHRoZSB2YWx1ZSBhdHRyaWJ1dGUgb2Ygc29tZSBpbnB1dCBl bGVtZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjExMzA3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82MTU2ODUyOD4KKworICAgICAgICBSZXZp ZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBUZWFjaCBUZXh0TWFuaXB1bGF0aW9uQ29u dHJvbGxlciB0byBkZXRlY3QgdGhlIGB2YWx1ZWAgYXR0cmlidXRlIGluIGlucHV0IGVsZW1lbnRz IG9mIHR5cGUgImJ1dHRvbiIgYW5kCisgICAgICAgICJzdWJtaXQiLiBUbyBkbyB0aGlzLCB3ZSBw bHVtYiB0aGUgZWxlbWVudCB0aHJvdWdoIHRvIGBpc0F0dHJpYnV0ZUZvclRleHRNYW5pcHVsYXRp b25gIGFuZCBjaGVjayBgaXNUZXh0QnV0dG9uKClgCisgICAgICAgIGlmICJ2YWx1ZSIgYXR0cmli dXRlIGlzIGJlaW5nIGNvbnNpZGVyZWQuCisKKyAgICAgICAgVGVzdDogVGV4dE1hbmlwdWxhdGlv bi5TdGFydFRleHRNYW5pcHVsYXRpb25FeHRyYWN0c1ZhbHVlc0Zyb21CdXR0b25JbnB1dHMKKwor ICAgICAgICAqIGVkaXRpbmcvVGV4dE1hbmlwdWxhdGlvbkNvbnRyb2xsZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6aXNBdHRyaWJ1dGVGb3JUZXh0TWFuaXB1bGF0aW9uKToKKyAgICAgICAgKFdl YkNvcmU6OlRleHRNYW5pcHVsYXRpb25Db250cm9sbGVyOjpvYnNlcnZlUGFyYWdyYXBocyk6CisK IDIwMjAtMDQtMzAgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAg ICAgICAgQ2xlYW4gdXAgc29tZSBFdmVudEhhbmRsZXIgY29vcmRpbmF0ZS1yZWxhdGVkIG5hbWlu ZyBhbmQgZml4IFNjcm9sbGFibGVBcmVhOjpsYXN0S25vd25Nb3VzZVBvc2l0aW9uKCkgY29udmVy c2lvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVGV4dE1hbmlwdWxhdGlv bkNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9UZXh0TWFuaXB1bGF0aW9u Q29udHJvbGxlci5jcHAKaW5kZXggNzdjYzUzY2EzMzQ0Y2MxZGUyMDJkZTRhODQ0NzNjYzk4MmY1 NzJkZi4uZTBlZTFkMmRhMDg5MWIxN2JiNWVmM2ZjZmMzZDU3ZjY1ZmVjOTczYiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9UZXh0TWFuaXB1bGF0aW9uQ29udHJvbGxlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9UZXh0TWFuaXB1bGF0aW9uQ29udHJvbGxlci5j cHAKQEAgLTMzLDYgKzMzLDcgQEAKICNpbmNsdWRlICJFdmVudExvb3AuaCIKICNpbmNsdWRlICJI VE1MQlJFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTEVsZW1lbnQuaCIKKyNpbmNsdWRlICJIVE1M SW5wdXRFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTE5hbWVzLmgiCiAjaW5jbHVkZSAiSFRNTFBh cnNlcklkaW9tcy5oIgogI2luY2x1ZGUgIk5vZGVUcmF2ZXJzYWwuaCIKQEAgLTIyNCw5ICsyMjUs MTMgQEAgcHJpdmF0ZToKICAgICBSZWZQdHI8Tm9kZT4gbV9wYXN0RW5kTm9kZTsKIH07CiAKLXN0 YXRpYyBib29sIGlzQXR0cmlidXRlRm9yVGV4dE1hbmlwdWxhdGlvbihjb25zdCBRdWFsaWZpZWRO YW1lJiBuYW1lVG9DaGVjaykKK3N0YXRpYyBib29sIGlzQXR0cmlidXRlRm9yVGV4dE1hbmlwdWxh dGlvbihjb25zdCBFbGVtZW50JiBlbGVtZW50LCBjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1lVG9D aGVjaykKIHsKICAgICB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOworCisgICAgaWYgKG5hbWVU b0NoZWNrID09IHZhbHVlQXR0cikKKyAgICAgICAgcmV0dXJuIGlzPEhUTUxJbnB1dEVsZW1lbnQ+ KGVsZW1lbnQpICYmIGRvd25jYXN0PEhUTUxJbnB1dEVsZW1lbnQ+KGVsZW1lbnQpLmlzVGV4dEJ1 dHRvbigpOworCiAgICAgc3RhdGljIGNvbnN0IFF1YWxpZmllZE5hbWUqIGNvbnN0IGF0dHJpYnV0 ZU5hbWVzW10gPSB7CiAgICAgICAgICZ0aXRsZUF0dHIuZ2V0KCksCiAgICAgICAgICZhbHRBdHRy LmdldCgpLApAQCAtMzQwLDcgKzM0NSw3IEBAIHZvaWQgVGV4dE1hbmlwdWxhdGlvbkNvbnRyb2xs ZXI6Om9ic2VydmVQYXJhZ3JhcGhzKGNvbnN0IFBvc2l0aW9uJiBzdGFydCwgY29uc3QKICAgICAg ICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgaWYgKGN1cnJlbnRFbGVtZW50Lmhhc0F0dHJp YnV0ZXMoKSkgewogICAgICAgICAgICAgICAgICAgICBmb3IgKGF1dG8mIGF0dHJpYnV0ZSA6IGN1 cnJlbnRFbGVtZW50LmF0dHJpYnV0ZXNJdGVyYXRvcigpKSB7Ci0gICAgICAgICAgICAgICAgICAg ICAgICBpZiAoaXNBdHRyaWJ1dGVGb3JUZXh0TWFuaXB1bGF0aW9uKGF0dHJpYnV0ZS5uYW1lKCkp KSB7CisgICAgICAgICAgICAgICAgICAgICAgICBpZiAoaXNBdHRyaWJ1dGVGb3JUZXh0TWFuaXB1 bGF0aW9uKGN1cnJlbnRFbGVtZW50LCBhdHRyaWJ1dGUubmFtZSgpKSkgewogICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGFkZEl0ZW0oTWFuaXB1bGF0aW9uSXRlbURhdGEgeyBQb3NpdGlvbigp LCBQb3NpdGlvbigpLCBtYWtlV2Vha1B0cihjdXJyZW50RWxlbWVudCksIGF0dHJpYnV0ZS5uYW1l KCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHsgTWFuaXB1bGF0aW9uVG9rZW4g eyBtX3Rva2VuSWRlbnRpZmllci5nZW5lcmF0ZSgpLCBhdHRyaWJ1dGUudmFsdWUoKSwgdG9rZW5J bmZvKCZjdXJyZW50RWxlbWVudCkgfSB9IH0pOwogICAgICAgICAgICAgICAgICAgICAgICAgfQpk aWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDRjYjgz MWQ4ZWUzMjdmNTE2MmVjZDE2MTA1ZDJiYTAwNzVlMGY5ZTQuLjE2ZGI1Yzg2YWI5YTEyNjdmNWQz YzVhMGFlMmYxM2Q1YzdmOGFjNWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMC0wNS0wMSAgV2Vuc29uIEhzaWVo ICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KKworICAgICAgICBUZXh0IG1hbmlwdWxhdGlvbiBz aG91bGQgb2JzZXJ2ZSB0aGUgdmFsdWUgYXR0cmlidXRlIG9mIHNvbWUgaW5wdXQgZWxlbWVudHMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMTMwNwor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjE1Njg1Mjg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg RGFyaW4gQWRsZXIuCisKKyAgICAgICAgQWRkIGEgbmV3IEFQSSB0ZXN0IHRoYXQgY292ZXJzIGA8 aW5wdXQgdHlwZT0ic3VibWl0Ij5gIGFuZCBgPGlucHV0IHR5cGU9ImJ1dHRvbiI+YC4KKworICAg ICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVGV4dE1hbmlwdWxhdGlvbi5t bToKKwogMjAyMC0wNC0zMCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQu b3JnPgogCiAgICAgICAgIFRlc3RXZWJLaXRBUEkuV2ViS2l0LkRlZmF1bHREaXNwbGF5TmFtZSBh bmQgVGVzdFdlYktpdEFQSS5XZWJLaXQuQ3VzdG9tRGlzcGxheU5hbWUgYXJlIGZsYWt5IGZhaWx1 cmVzCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Rl eHRNYW5pcHVsYXRpb24ubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29h L1RleHRNYW5pcHVsYXRpb24ubW0KaW5kZXggMzFjZjFjYWZhMGY1NWQ1NDgyNjc1YmI3YmRkYmIy ZGE0NjI3ZGRhOC4uZjY0YjZlMzkzZmM5MzE1M2E5YzExODhjZGQwODA3ZDY3ZWU5ZWZmNyAxMDA2 NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9UZXh0TWFuaXB1 bGF0aW9uLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVGV4 dE1hbmlwdWxhdGlvbi5tbQpAQCAtNzU3LDYgKzc1NywzNSBAQCBURVNUKFRleHRNYW5pcHVsYXRp b24sIFN0YXJ0VGV4dE1hbmlwdWxhdGlvbkV4dHJhY3RzVXNlckluZm8pCiAgICAgfQogfQogCitU RVNUKFRleHRNYW5pcHVsYXRpb24sIFN0YXJ0VGV4dE1hbmlwdWxhdGlvbkV4dHJhY3RzVmFsdWVz RnJvbUJ1dHRvbklucHV0cykKK3sKKyAgICBhdXRvIGRlbGVnYXRlID0gYWRvcHROUyhbW1RleHRN YW5pcHVsYXRpb25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIGF1dG8gd2ViVmlldyA9IGFk b3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwg MCwgNDAwLCA0MDApXSk7CisgICAgW3dlYlZpZXcgX3NldFRleHRNYW5pcHVsYXRpb25EZWxlZ2F0 ZTpkZWxlZ2F0ZS5nZXQoKV07CisKKyAgICBbd2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZEhUTUxT dHJpbmc6QCI8IURPQ1RZUEUgaHRtbD4iCisgICAgICAgICI8Ym9keT4iCisgICAgICAgICI8aW5w dXQgdHlwZT0nYnV0dG9uJyB2YWx1ZT0nT25lJz4iCisgICAgICAgICI8aW5wdXQgdHlwZT0nc3Vi bWl0JyB2YWx1ZT0nVHdvJz4iCisgICAgICAgICI8aW5wdXQgdHlwZT0ncGFzc3dvcmQnIHZhbHVl PSdUaHJlZSc+IgorICAgICAgICAiPGlucHV0IHR5cGU9J3JhbmdlJyB2YWx1ZT0nNCc+IgorICAg ICAgICAiPGlucHV0IHR5cGU9J2RhdGUnIHZhbHVlPScyMDIwLTA1LTAxJz4iCisgICAgICAgICI8 L2JvZHk+Il07CisKKyAgICBkb25lID0gZmFsc2U7CisgICAgW3dlYlZpZXcgX3N0YXJ0VGV4dE1h bmlwdWxhdGlvbnNXaXRoQ29uZmlndXJhdGlvbjpuaWwgY29tcGxldGlvbjpeeworICAgICAgICBk b25lID0gdHJ1ZTsKKyAgICB9XTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUp OworCisgICAgYXV0byBpdGVtcyA9IFtkZWxlZ2F0ZSBpdGVtc107CisgICAgRVhQRUNUX0VRKGl0 ZW1zLmNvdW50LCAyVUwpOworICAgIEVYUEVDVF9FUShpdGVtc1swXS50b2tlbnMuY291bnQsIDFV TCk7CisgICAgRVhQRUNUX0VRKGl0ZW1zWzFdLnRva2Vucy5jb3VudCwgMVVMKTsKKyAgICBFWFBF Q1RfV0tfU1RSRVEoIk9uZSIsIGl0ZW1zWzBdLnRva2Vuc1swXS5jb250ZW50KTsKKyAgICBFWFBF Q1RfV0tfU1RSRVEoIlR3byIsIGl0ZW1zWzFdLnRva2Vuc1swXS5jb250ZW50KTsKK30KKwogc3Ry dWN0IFRva2VuIHsKICAgICBOU1N0cmluZyAqaWRlbnRpZmllcjsKICAgICBOU1N0cmluZyAqY29u dGVudDsK