210774 2020-04-20 16:44:57 -0700 Support toggling debug overlay for touch action region and editable element region independent from non-fast scrollable region 2020-04-22 17:43:18 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dbates dbates dino esprehn+autocc ews-watchlist fred.wang glenn kondapallykalyan pdr simon.fraser webkit-bug-importer oldest_to_newest 1643695 0 dbates 2020-04-20 16:44:57 -0700 Support toggling debug overlay for touch action region and editable element region independent from non-fast scrollable region. Currently both of these are tied into the setting for painting the non-fast scrollable region. Separate them out to support opting into the combinations of overlays each person is interested in at the moment. 1643696 1 397038 dbates 2020-04-20 16:54:49 -0700 Created attachment 397038 Patch 1643993 2 397038 dbates 2020-04-21 13:26:43 -0700 Comment on attachment 397038 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=397038&action=review > Source/WebCore/rendering/RenderLayer.cpp:7055 > + if (renderer().settings().visibleDebugOverlayRegions() & (TouchActionRegion | EditableElementRegion)) I wanted to make this setting return an OptionSet<>, but that involves some work due to how settings are generated. For now, I deferred this. 1644599 3 397038 dino 2020-04-22 17:33:05 -0700 Comment on attachment 397038 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=397038&action=review > Source/WebCore/ChangeLog:8 > + Break out the touch action region and editable element region debug overlays into there own their > Source/WebCore/ChangeLog:19 > + (WebCore::RenderLayerBacking::paintDebugOverlays): Condition the paintinf of touch action region painting >> Source/WebCore/rendering/RenderLayer.cpp:7055 >> + if (renderer().settings().visibleDebugOverlayRegions() & (TouchActionRegion | EditableElementRegion)) > > I wanted to make this setting return an OptionSet<>, but that involves some work due to how settings are generated. For now, I deferred this. Yeah, that's a shame. It's ok as a mask though. > Source/WebCore/rendering/RenderLayerBacking.cpp:3088 > + Color regionColor(0, 0, 255, 50); At some point in the future we should collect all our colors into a single place so we can document them easily. 1644601 4 397296 dbates 2020-04-22 17:41:12 -0700 Created attachment 397296 To Land 1644602 5 dbates 2020-04-22 17:42:51 -0700 Committed r260547: <https://trac.webkit.org/changeset/260547> 1644603 6 webkit-bug-importer 2020-04-22 17:43:18 -0700 <rdar://problem/62222660> 397038 2020-04-20 16:54:49 -0700 2020-04-22 17:41:10 -0700 Patch bug-210774-20200420165448.patch text/plain 9535 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMjE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjc4Njc1NDE0ZGUxOTdj ZDQzN2JkMTVjZmEzYjk5YTdjNThlZTgzMi4uZTNmYmExZmE4ZjY2YTczZWEwNDIzYjE0ZTA5ZjZm NTFmY2IwNzIwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTA0LTIwICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBTdXBwb3J0IHRvZ2dsaW5n IGRlYnVnIG92ZXJsYXkgZm9yIHRvdWNoIGFjdGlvbiByZWdpb24gYW5kIGVkaXRhYmxlIGVsZW1l bnQgcmVnaW9uIGluZGVwZW5kZW50IGZyb20gbm9uLWZhc3Qgc2Nyb2xsYWJsZSByZWdpb24KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDc3NAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJyZWFrIG91dCB0 aGUgdG91Y2ggYWN0aW9uIHJlZ2lvbiBhbmQgZWRpdGFibGUgZWxlbWVudCByZWdpb24gZGVidWcg b3ZlcmxheXMgaW50byB0aGVyZSBvd24KKyAgICAgICAgZmxhZ3MgdGhhdCBjYW4gYmUgcGFzc2Vk IHRvIFNldHRpbmdzOjpzZXRWaXNpYmxlRGVidWdPdmVybGF5UmVnaW9ucygpIHRvIHRvZ2dsZSB0 aGVzZSBvdmVybGF5cywKKyAgICAgICAgcmVzcGVjdGl2ZWx5LiBDdXJyZW50bHkgYm90aCBvZiB0 aGVzZSBvdmVybGF5cyBwaWdneWJhY2sgb24gd2hldGhlciB0aGUgZW5naW5lIHdpbGwgcGFpbnQg dGhlCisgICAgICAgIG5vbi1mYXN0IHNjcm9sbGFibGUgcmVnaW9uLgorCisgICAgICAgICogcGFn ZS9TZXR0aW5nc0Jhc2UuaDogQWRkIHR3byBtb3JlIGVudW1lcmF0b3JzLgorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6 aW52YWxpZGF0ZUV2ZW50UmVnaW9uIGNvbnN0KTogVXBkYXRlIHRoZSBjb2RlIHRvIGJlIG1vcmUg cHJlY2lzZSBub3cgdGhhdAorICAgICAgICB3ZSBjYW4gdGFyZ2V0IHRoZSB1cGRhdGUgcGFpbnQg b3ZlcmxheSBoYWNrIHRvIHdoZW4gd2UgYXJlIHBhaW50aW5nIHRvdWNoLWFjdGlvbiBvciBlZGl0 YWJsZQorICAgICAgICBlbGVtZW50IHJlZ2lvbnMuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ckxheWVyQmFja2luZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6 OnBhaW50RGVidWdPdmVybGF5cyk6IENvbmRpdGlvbiB0aGUgcGFpbnRpbmYgb2YgdG91Y2ggYWN0 aW9uIHJlZ2lvbgorICAgICAgICBvbiBvbmUgZW51bWVyYXRvciBhbmQgdGhlIHBhaW50aW5nIG9m IGVkaXRhYmxlIGVsZW1lbnQgcmVnaW9uIG9uIGFub3RoZXIuCisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJMYXllckJhY2tpbmc6OnBhaW50Q29udGVudHMpOiBVcGRhdGUgdGhlIGNvZGUgdG8gYmUg bW9yZSBwcmVjaXNlLgorCiAyMDIwLTA0LTE2ICBDbGF1ZGlvIFNhYXZlZHJhICA8Y3NhYXZlZHJh QGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gRGVwcmVjYXRpb24tZ3VhcmRzIGZpeGVzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdl TG9nCmluZGV4IDQzNWI2NjIyYjcyOTA0ZjZkZjdiZTk3ZTIyNGQxN2Q4ZTQ5MmVmNjMuLjk3NDcz MTA0NDliN2Q1NzcwYTMyODM2Mzg2N2Q3NTBhODA5ODMyZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTYgQEAKKzIwMjAtMDQtMjAgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisg ICAgICAgIFN1cHBvcnQgdG9nZ2xpbmcgZGVidWcgb3ZlcmxheSBmb3IgdG91Y2ggYWN0aW9uIHJl Z2lvbiBhbmQgZWRpdGFibGUgZWxlbWVudCByZWdpb24gaW5kZXBlbmRlbnQgZnJvbSBub24tZmFz dCBzY3JvbGxhYmxlIHJlZ2lvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjEwNzc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgRXhwb3NlIHR3byBuZXcgZW51bWVyYXRvcnMgdG8gdG9nZ2xlIHRvdWNoIGFj dGlvbiByZWdpb24gYW5kIGVkaXRhYmxlIGVsZW1lbnQgcmVnaW9uCisgICAgICAgIG92ZXJsYXkg cGFpbnRpbmcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1JlZi5o OgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaDoK KwogMjAyMC0wNC0xNiAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAg ICAgICBSRUdSRVNTSU9OKHIyNjAwODEpIEJyb2tlIGlPUyBQTFQgZHVlIHRvIEluamVjdGVkQnVu ZGxlIGluaXRpYWxpemF0aW9uIChlZGl0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn ZS9TZXR0aW5nc0Jhc2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3NCYXNlLmgKaW5k ZXggNGMwYjM5ZjEyOTlhYzgxNzA1YmVjY2VkMDY3ODYwOGFkZjM3Njg0Ny4uYWRmOGRiYWNkZGNh N2NhZDBmYjcyY2EzMTY5YzEyZGE4YjQ4NTA2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9TZXR0aW5nc0Jhc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzQmFz ZS5oCkBAIC02OSw2ICs2OSw4IEBAIGVudW0gVGV4dERpcmVjdGlvblN1Ym1lbnVJbmNsdXNpb25C ZWhhdmlvciB7CiBlbnVtIERlYnVnT3ZlcmxheVJlZ2lvbkZsYWdzIHsKICAgICBOb25GYXN0U2Ny b2xsYWJsZVJlZ2lvbiA9IDEgPDwgMCwKICAgICBXaGVlbEV2ZW50SGFuZGxlclJlZ2lvbiA9IDEg PDwgMSwKKyAgICBUb3VjaEFjdGlvblJlZ2lvbiA9IDEgPDwgMiwKKyAgICBFZGl0YWJsZUVsZW1l bnRSZWdpb24gPSAxIDw8IDMsCiB9OwogCiBlbnVtIGNsYXNzIFVzZXJJbnRlcmZhY2VEaXJlY3Rp b25Qb2xpY3kgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXgg NWYxYzMyOGE3MDQ3NDExMTU1MjM0NGM4MTg5NzljNTE2NDQ1ZjkwOS4uNTg4Y2ZlYzU2MmZhYTZm NjE0YzBiMzliMzI2ZjZlNWFmNGQ5OTg2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXIuY3BwCkBAIC03MDUyLDcgKzcwNTIsNyBAQCBib29sIFJlbmRlckxheWVyOjppbnZh bGlkYXRlRXZlbnRSZWdpb24oRXZlbnRSZWdpb25JbnZhbGlkYXRpb25SZWFzb24gcmVhc29uKQog ICAgIGlmIChyZWFzb24gPT0gRXZlbnRSZWdpb25JbnZhbGlkYXRpb25SZWFzb246Ok5vbkNvbXBv c2l0ZWRGcmFtZSkgewogICAgICAgICBhdXRvJiB2aWV3ID0gcmVuZGVyZXIoKS52aWV3KCk7CiAg ICAgICAgIHZpZXcuc2V0TmVlZHNFdmVudFJlZ2lvblVwZGF0ZUZvck5vbkNvbXBvc2l0ZWRGcmFt ZSgpOwotICAgICAgICBpZiAocmVuZGVyZXIoKS5zZXR0aW5ncygpLnZpc2libGVEZWJ1Z092ZXJs YXlSZWdpb25zKCkgJiBOb25GYXN0U2Nyb2xsYWJsZVJlZ2lvbikKKyAgICAgICAgaWYgKHJlbmRl cmVyKCkuc2V0dGluZ3MoKS52aXNpYmxlRGVidWdPdmVybGF5UmVnaW9ucygpICYgKFRvdWNoQWN0 aW9uUmVnaW9uIHwgRWRpdGFibGVFbGVtZW50UmVnaW9uKSkKICAgICAgICAgICAgIHZpZXcuc2V0 TmVlZHNSZXBhaW50SGFja0FmdGVyQ29tcG9zaXRpbmdMYXllclVwZGF0ZUZvckRlYnVnT3Zlcmxh eXNPbmx5KCk7CiAgICAgICAgIHZpZXcuY29tcG9zaXRvcigpLnNjaGVkdWxlQ29tcG9zaXRpbmdM YXllclVwZGF0ZSgpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllckJhY2tpbmcuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyQmFja2luZy5jcHAKaW5kZXggZDczYjBkODlmODA5MTQ3NDdlYzQzN2I2ZmYwZGU5NWRm ZDQyYjBlMC4uNTc1YjIzMzFjZjAwY2U5NjVlZWM4MTlkNjhlMDZjMzEzNTc2Yjk5OSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKQEAgLTMw NzAsNyArMzA3MCw4IEBAIHN0YXRpYyBSZWZQdHI8UGF0dGVybj4gcGF0dGVybkZvclRvdWNoQWN0 aW9uKFRvdWNoQWN0aW9uIHRvdWNoQWN0aW9uLCBGbG9hdFNpemUKIAogdm9pZCBSZW5kZXJMYXll ckJhY2tpbmc6OnBhaW50RGVidWdPdmVybGF5cyhjb25zdCBHcmFwaGljc0xheWVyKiBncmFwaGlj c0xheWVyLCBHcmFwaGljc0NvbnRleHQmIGNvbnRleHQpCiB7Ci0gICAgaWYgKGdyYXBoaWNzTGF5 ZXItPmV2ZW50UmVnaW9uKCkuaXNFbXB0eSgpKQorICAgIGF1dG8mIGV2ZW50UmVnaW9uID0gZ3Jh cGhpY3NMYXllci0+ZXZlbnRSZWdpb24oKTsKKyAgICBpZiAoZXZlbnRSZWdpb24uaXNFbXB0eSgp KQogICAgICAgICByZXR1cm47CiAKICAgICBHcmFwaGljc0NvbnRleHRTdGF0ZVNhdmVyIHN0YXRl U2F2ZXIoY29udGV4dCk7CkBAIC0zMDc5LDQxICszMDgwLDQ2IEBAIHZvaWQgUmVuZGVyTGF5ZXJC YWNraW5nOjpwYWludERlYnVnT3ZlcmxheXMoY29uc3QgR3JhcGhpY3NMYXllciogZ3JhcGhpY3NM YXllciwKICAgICBhdXRvIGNvbnRlbnRPZmZzZXQgPSByb3VuZGVkSW50U2l6ZShjb250ZW50T2Zm c2V0SW5Db21wb3NpdGluZ0xheWVyKCkpOwogICAgIGNvbnRleHQudHJhbnNsYXRlKC1jb250ZW50 T2Zmc2V0KTsKIAorICAgIGF1dG8gdmlzaWJsZURlYnVnT3ZlcmxheVJlZ2lvbnMgPSByZW5kZXJl cigpLnNldHRpbmdzKCkudmlzaWJsZURlYnVnT3ZlcmxheVJlZ2lvbnMoKTsKKwogICAgIC8vIFRo ZSBpbnRlcmFjdGl2ZSBwYXJ0LgogICAgIC8vIFBhaW50IHJlY3RzIGZvciB0b3VjaCBhY3Rpb24u Ci0gICAgYXV0byYgZXZlbnRSZWdpb24gPSBncmFwaGljc0xheWVyLT5ldmVudFJlZ2lvbigpOwot ICAgIENvbG9yIHJlZ2lvbkNvbG9yKDAsIDAsIDI1NSwgNTApOwotICAgIGNvbnRleHQuc2V0Rmls bENvbG9yKHJlZ2lvbkNvbG9yKTsKLSAgICBmb3IgKGF1dG8gcmVjdCA6IGV2ZW50UmVnaW9uLnJl Z2lvbigpLnJlY3RzKCkpCi0gICAgICAgIGNvbnRleHQuZmlsbFJlY3QocmVjdCk7Ci0KLSAgICBj b25zdCBUb3VjaEFjdGlvbiB0b3VjaEFjdGlvbkxpc3RbXSA9IHsKLSAgICAgICAgVG91Y2hBY3Rp b246Ok5vbmUsCi0gICAgICAgIFRvdWNoQWN0aW9uOjpNYW5pcHVsYXRpb24sCi0gICAgICAgIFRv dWNoQWN0aW9uOjpQYW5YLAotICAgICAgICBUb3VjaEFjdGlvbjo6UGFuWSwKLSAgICAgICAgVG91 Y2hBY3Rpb246OlBpbmNoWm9vbSwKLSAgICB9OwotCi0gICAgZm9yIChhdXRvIGFjdGlvbiA6IHRv dWNoQWN0aW9uTGlzdCkgewotICAgICAgICBhdXRvKiBhY3Rpb25SZWdpb24gPSBncmFwaGljc0xh eWVyLT5ldmVudFJlZ2lvbigpLnJlZ2lvbkZvclRvdWNoQWN0aW9uKGFjdGlvbik7Ci0gICAgICAg IGlmICghYWN0aW9uUmVnaW9uKQotICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAgICAgYXV0 byBmaWxsUGF0dGVybiA9IHBhdHRlcm5Gb3JUb3VjaEFjdGlvbihhY3Rpb24sIGNvbnRlbnRPZmZz ZXRJbkNvbXBvc2l0aW5nTGF5ZXIoKSwgY29udGV4dCk7Ci0gICAgICAgIGlmICghZmlsbFBhdHRl cm4pCi0gICAgICAgICAgICBjb250aW51ZTsKLQotICAgICAgICBjb250ZXh0LnNldEZpbGxQYXR0 ZXJuKGZpbGxQYXR0ZXJuLnJlbGVhc2VOb25OdWxsKCkpOwotICAgICAgICBmb3IgKGF1dG8gcmVj dCA6IGFjdGlvblJlZ2lvbi0+cmVjdHMoKSkKKyAgICBpZiAodmlzaWJsZURlYnVnT3ZlcmxheVJl Z2lvbnMgJiBUb3VjaEFjdGlvblJlZ2lvbikgeworICAgICAgICBDb2xvciByZWdpb25Db2xvcigw LCAwLCAyNTUsIDUwKTsKKyAgICAgICAgY29udGV4dC5zZXRGaWxsQ29sb3IocmVnaW9uQ29sb3Ip OworICAgICAgICBmb3IgKGF1dG8gcmVjdCA6IGV2ZW50UmVnaW9uLnJlZ2lvbigpLnJlY3RzKCkp CiAgICAgICAgICAgICBjb250ZXh0LmZpbGxSZWN0KHJlY3QpOworCisgICAgICAgIGNvbnN0IFRv dWNoQWN0aW9uIHRvdWNoQWN0aW9uTGlzdFtdID0geworICAgICAgICAgICAgVG91Y2hBY3Rpb246 Ok5vbmUsCisgICAgICAgICAgICBUb3VjaEFjdGlvbjo6TWFuaXB1bGF0aW9uLAorICAgICAgICAg ICAgVG91Y2hBY3Rpb246OlBhblgsCisgICAgICAgICAgICBUb3VjaEFjdGlvbjo6UGFuWSwKKyAg ICAgICAgICAgIFRvdWNoQWN0aW9uOjpQaW5jaFpvb20sCisgICAgICAgIH07CisKKyAgICAgICAg Zm9yIChhdXRvIGFjdGlvbiA6IHRvdWNoQWN0aW9uTGlzdCkgeworICAgICAgICAgICAgYXV0byog YWN0aW9uUmVnaW9uID0gZ3JhcGhpY3NMYXllci0+ZXZlbnRSZWdpb24oKS5yZWdpb25Gb3JUb3Vj aEFjdGlvbihhY3Rpb24pOworICAgICAgICAgICAgaWYgKCFhY3Rpb25SZWdpb24pCisgICAgICAg ICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgICAgIGF1dG8gZmlsbFBhdHRlcm4gPSBwYXR0 ZXJuRm9yVG91Y2hBY3Rpb24oYWN0aW9uLCBjb250ZW50T2Zmc2V0SW5Db21wb3NpdGluZ0xheWVy KCksIGNvbnRleHQpOworICAgICAgICAgICAgaWYgKCFmaWxsUGF0dGVybikKKyAgICAgICAgICAg ICAgICBjb250aW51ZTsKKworICAgICAgICAgICAgY29udGV4dC5zZXRGaWxsUGF0dGVybihmaWxs UGF0dGVybi5yZWxlYXNlTm9uTnVsbCgpKTsKKyAgICAgICAgICAgIGZvciAoYXV0byByZWN0IDog YWN0aW9uUmVnaW9uLT5yZWN0cygpKQorICAgICAgICAgICAgICAgIGNvbnRleHQuZmlsbFJlY3Qo cmVjdCk7CisgICAgICAgIH0KICAgICB9CiAKICNpZiBFTkFCTEUoRURJVEFCTEVfUkVHSU9OKQog ICAgIC8vIFBhaW50IHJlY3RzIGZvciBlZGl0YWJsZSBlbGVtZW50cy4KLSAgICBjb250ZXh0LnNl dEZpbGxDb2xvcih7IDEyOCwgMCwgMTI4LCA1MCB9KTsKLSAgICBmb3IgKGF1dG8gcmVjdCA6IGV2 ZW50UmVnaW9uLnJlY3RzRm9yRWRpdGFibGVFbGVtZW50cygpKQotICAgICAgICBjb250ZXh0LmZp bGxSZWN0KHJlY3QpOworICAgIGlmICh2aXNpYmxlRGVidWdPdmVybGF5UmVnaW9ucyAmIEVkaXRh YmxlRWxlbWVudFJlZ2lvbikgeworICAgICAgICBjb250ZXh0LnNldEZpbGxDb2xvcih7IDEyOCwg MCwgMTI4LCA1MCB9KTsKKyAgICAgICAgZm9yIChhdXRvIHJlY3QgOiBldmVudFJlZ2lvbi5yZWN0 c0ZvckVkaXRhYmxlRWxlbWVudHMoKSkKKyAgICAgICAgICAgIGNvbnRleHQuZmlsbFJlY3QocmVj dCk7CisgICAgfQogI2VuZGlmCiB9CiAKQEAgLTMxNTYsNyArMzE2Miw3IEBAIHZvaWQgUmVuZGVy TGF5ZXJCYWNraW5nOjpwYWludENvbnRlbnRzKGNvbnN0IEdyYXBoaWNzTGF5ZXIqIGdyYXBoaWNz TGF5ZXIsIEdyYXBoCiAKICAgICAgICAgcGFpbnRJbnRvTGF5ZXIoZ3JhcGhpY3NMYXllciwgY29u dGV4dCwgZGlydHlSZWN0LCBiZWhhdmlvcik7CiAKLSAgICAgICAgaWYgKHJlbmRlcmVyKCkuc2V0 dGluZ3MoKS52aXNpYmxlRGVidWdPdmVybGF5UmVnaW9ucygpICYgTm9uRmFzdFNjcm9sbGFibGVS ZWdpb24pIC8vIFBpZ2d5LWJhY2sgb2ZmIHRoZSBzZXR0aW5nIHRoYXQgc2hvd3MgdG91Y2ggaGFu ZGxlciByZWdpb25zLgorICAgICAgICBpZiAocmVuZGVyZXIoKS5zZXR0aW5ncygpLnZpc2libGVE ZWJ1Z092ZXJsYXlSZWdpb25zKCkgJiAoVG91Y2hBY3Rpb25SZWdpb24gfCBFZGl0YWJsZUVsZW1l bnRSZWdpb24pKQogICAgICAgICAgICAgcGFpbnREZWJ1Z092ZXJsYXlzKGdyYXBoaWNzTGF5ZXIs IGNvbnRleHQpOwogCiAgICAgfSBlbHNlIGlmIChncmFwaGljc0xheWVyID09IGxheWVyRm9ySG9y aXpvbnRhbFNjcm9sbGJhcigpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQy9XS1ByZWZlcmVuY2VzUmVmLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Qy9XS1ByZWZlcmVuY2VzUmVmLmgKaW5kZXggNDU1NDFmZjExYWIwNTYwODAzNjE5ZTMzM2VkZTNi OWIzN2JmZjg4NC4uZTc4NjczYzI4NzMwYmZkNTc0YzJiYWE2OTgxMWYxZDIzN2Y3OGY2MCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1JlZi5o CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNSZWYuaApA QCAtNDYsNyArNDYsOSBAQCB0eXBlZGVmIGVudW0gV0tTdG9yYWdlQmxvY2tpbmdQb2xpY3kgV0tT dG9yYWdlQmxvY2tpbmdQb2xpY3k7CiAKIGVudW0gV0tEZWJ1Z092ZXJsYXlSZWdpb25GbGFncyB7 CiAgICAga1dLTm9uRmFzdFNjcm9sbGFibGVSZWdpb24gPSAxIDw8IDAsCi0gICAga1dLV2hlZWxF dmVudEhhbmRsZXJSZWdpb24gPSAxIDw8IDEKKyAgICBrV0tXaGVlbEV2ZW50SGFuZGxlclJlZ2lv biA9IDEgPDwgMSwKKyAgICBrV0tUb3VjaEFjdGlvblJlZ2lvbiA9IDEgPDwgMiwKKyAgICBrV0tF ZGl0YWJsZUVsZW1lbnRSZWdpb24gPSAxIDw8IDMsCiB9OwogdHlwZWRlZiB1bnNpZ25lZCBXS0Rl YnVnT3ZlcmxheVJlZ2lvbnM7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1ByZWZlcmVuY2VzUHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0NvY29hL1dLUHJlZmVyZW5jZXNQcml2YXRlLmgKaW5kZXggN2NkMDUxODdmOTQwYmI2 N2Y5YWIwYzIxZjg5YTc5OTAwN2Q0YTVjNC4uMDRmNjQyZTA4NDI0YmJlMzgwMGY0NzFlMTMyZjFm MjE4ZDUxZTgyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h L1dLUHJlZmVyZW5jZXNQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L0NvY29hL1dLUHJlZmVyZW5jZXNQcml2YXRlLmgKQEAgLTM5LDcgKzM5LDkgQEAgdHlwZWRlZiBO U19FTlVNKE5TSW50ZWdlciwgX1dLU3RvcmFnZUJsb2NraW5nUG9saWN5KSB7CiAKIHR5cGVkZWYg TlNfT1BUSU9OUyhOU1VJbnRlZ2VyLCBfV0tEZWJ1Z092ZXJsYXlSZWdpb25zKSB7CiAgICAgX1dL Tm9uRmFzdFNjcm9sbGFibGVSZWdpb24gPSAxIDw8IDAsCi0gICAgX1dLV2hlZWxFdmVudEhhbmRs ZXJSZWdpb24gPSAxIDw8IDEKKyAgICBfV0tXaGVlbEV2ZW50SGFuZGxlclJlZ2lvbiA9IDEgPDwg MSwKKyAgICBfV0tUb3VjaEFjdGlvblJlZ2lvbiA9IDEgPDwgMiwKKyAgICBfV0tFZGl0YWJsZUVs ZW1lbnRSZWdpb24gPSAxIDw8IDMsCiB9IFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoMTAuMTEpLCBp b3MoOS4wKSk7CiAKIHR5cGVkZWYgTlNfT1BUSU9OUyhOU1VJbnRlZ2VyLCBfV0tKYXZhU2NyaXB0 UnVudGltZUZsYWdzKSB7Cg== 397296 2020-04-22 17:41:12 -0700 2020-04-22 17:41:12 -0700 To Land bug-210774-20200422174111.patch text/plain 9568 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwNTQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGQ4OWUyODk4NTk3Mjll M2I4ZjhhNmQyYWM2N2U1NTc0Zjg4YWQzYy4uMTJjZDQxMGViOTgyZGI1OTJlYWViYTI4YjVjNmI1 MTJlNDMyYzhkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTA0LTIyICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBTdXBwb3J0IHRvZ2dsaW5n IGRlYnVnIG92ZXJsYXkgZm9yIHRvdWNoIGFjdGlvbiByZWdpb24gYW5kIGVkaXRhYmxlIGVsZW1l bnQgcmVnaW9uIGluZGVwZW5kZW50IGZyb20gbm9uLWZhc3Qgc2Nyb2xsYWJsZSByZWdpb24KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDc3NAorCisg ICAgICAgIFJldmlld2VkIGJ5IERlYW4gSmFja3Nvbi4KKworICAgICAgICBCcmVhayBvdXQgdGhl IHRvdWNoIGFjdGlvbiByZWdpb24gYW5kIGVkaXRhYmxlIGVsZW1lbnQgcmVnaW9uIGRlYnVnIG92 ZXJsYXlzIGludG8gdGhlaXIgb3duCisgICAgICAgIGZsYWdzIHRoYXQgY2FuIGJlIHBhc3NlZCB0 byBTZXR0aW5nczo6c2V0VmlzaWJsZURlYnVnT3ZlcmxheVJlZ2lvbnMoKSB0byB0b2dnbGUgdGhl c2Ugb3ZlcmxheXMsCisgICAgICAgIHJlc3BlY3RpdmVseS4gQ3VycmVudGx5IGJvdGggb2YgdGhl c2Ugb3ZlcmxheXMgcGlnZ3liYWNrIG9uIHdoZXRoZXIgdGhlIGVuZ2luZSB3aWxsIHBhaW50IHRo ZQorICAgICAgICBub24tZmFzdCBzY3JvbGxhYmxlIHJlZ2lvbi4KKworICAgICAgICAqIHBhZ2Uv U2V0dGluZ3NCYXNlLmg6IEFkZCB0d28gbW9yZSBlbnVtZXJhdG9ycy4KKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6Omlu dmFsaWRhdGVFdmVudFJlZ2lvbiBjb25zdCk6IFVwZGF0ZSB0aGUgY29kZSB0byBiZSBtb3JlIHBy ZWNpc2Ugbm93IHRoYXQKKyAgICAgICAgd2UgY2FuIHRhcmdldCB0aGUgdXBkYXRlIHBhaW50IG92 ZXJsYXkgaGFjayB0byB3aGVuIHdlIGFyZSBwYWludGluZyB0b3VjaC1hY3Rpb24gb3IgZWRpdGFi bGUKKyAgICAgICAgZWxlbWVudCByZWdpb25zLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJM YXllckJhY2tpbmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjpw YWludERlYnVnT3ZlcmxheXMpOiBDb25kaXRpb24gdGhlIHBhaW50aW5nIG9mIHRvdWNoIGFjdGlv biByZWdpb24KKyAgICAgICAgb24gb25lIGVudW1lcmF0b3IgYW5kIHRoZSBwYWludGluZyBvZiBl ZGl0YWJsZSBlbGVtZW50IHJlZ2lvbiBvbiBhbm90aGVyLgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyTGF5ZXJCYWNraW5nOjpwYWludENvbnRlbnRzKTogVXBkYXRlIHRoZSBjb2RlIHRvIGJlIG1v cmUgcHJlY2lzZS4KKwogMjAyMC0wNC0yMiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29t PgogCiAgICAgICAgIFsgTWFjIHdrMiBdIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv bm90aWZpY2F0aW9ucy9ldmVudC1vbmNsb3NlLmh0bWwgaXMgZmxha3kgZmFpbGluZy4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cK aW5kZXggMzdkZWY0ZGVhMGM4NzQyYmNiNDQ3Yjc0NGYxMjIzYjMwMjNhZmJlZS4uYTUxYjRjNGZj ZjE2YWZhYzliNDE5YWMyMmZkOWUxYzUyN2NkYmQzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBA QAorMjAyMC0wNC0yMiAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CisKKyAgICAg ICAgU3VwcG9ydCB0b2dnbGluZyBkZWJ1ZyBvdmVybGF5IGZvciB0b3VjaCBhY3Rpb24gcmVnaW9u IGFuZCBlZGl0YWJsZSBlbGVtZW50IHJlZ2lvbiBpbmRlcGVuZGVudCBmcm9tIG5vbi1mYXN0IHNj cm9sbGFibGUgcmVnaW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTA3NzQKKworICAgICAgICBSZXZpZXdlZCBieSBEZWFuIEphY2tzb24uCisKKyAg ICAgICAgRXhwb3NlIHR3byBuZXcgZW51bWVyYXRvcnMgdG8gdG9nZ2xlIHRvdWNoIGFjdGlvbiBy ZWdpb24gYW5kIGVkaXRhYmxlIGVsZW1lbnQgcmVnaW9uCisgICAgICAgIG92ZXJsYXkgcGFpbnRp bmcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1JlZi5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaDoKKwogMjAy MC0wNC0yMiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1Nd IEV4cG9zZSAtX3dlYlZpZXc6d2lsbEdvVG9CYWNrRm9yd2FyZExpc3RJdGVtOmluUGFnZUNhY2hl OgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5nc0Jhc2UuaCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3NCYXNlLmgKaW5kZXggNGMwYjM5ZjEyOTlhYzgxNzA1YmVj Y2VkMDY3ODYwOGFkZjM3Njg0Ny4uYWRmOGRiYWNkZGNhN2NhZDBmYjcyY2EzMTY5YzEyZGE4YjQ4 NTA2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5nc0Jhc2UuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzQmFzZS5oCkBAIC02OSw2ICs2OSw4IEBAIGVu dW0gVGV4dERpcmVjdGlvblN1Ym1lbnVJbmNsdXNpb25CZWhhdmlvciB7CiBlbnVtIERlYnVnT3Zl cmxheVJlZ2lvbkZsYWdzIHsKICAgICBOb25GYXN0U2Nyb2xsYWJsZVJlZ2lvbiA9IDEgPDwgMCwK ICAgICBXaGVlbEV2ZW50SGFuZGxlclJlZ2lvbiA9IDEgPDwgMSwKKyAgICBUb3VjaEFjdGlvblJl Z2lvbiA9IDEgPDwgMiwKKyAgICBFZGl0YWJsZUVsZW1lbnRSZWdpb24gPSAxIDw8IDMsCiB9Owog CiBlbnVtIGNsYXNzIFVzZXJJbnRlcmZhY2VEaXJlY3Rpb25Qb2xpY3kgewpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggMjViM2Y3YmRkZWRhNzM1NjBlMzc1MzEw Njg3N2IxZTZiMTBiYjMwZi4uYzVhYmQyN2ZmMzdhMjY0MjA1MzU0MjEwMGQ1MjFkNjFjMGQ2Mjcw MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC03MDIyLDcg KzcwMjIsNyBAQCBib29sIFJlbmRlckxheWVyOjppbnZhbGlkYXRlRXZlbnRSZWdpb24oRXZlbnRS ZWdpb25JbnZhbGlkYXRpb25SZWFzb24gcmVhc29uKQogICAgIGlmIChyZWFzb24gPT0gRXZlbnRS ZWdpb25JbnZhbGlkYXRpb25SZWFzb246Ok5vbkNvbXBvc2l0ZWRGcmFtZSkgewogICAgICAgICBh dXRvJiB2aWV3ID0gcmVuZGVyZXIoKS52aWV3KCk7CiAgICAgICAgIHZpZXcuc2V0TmVlZHNFdmVu dFJlZ2lvblVwZGF0ZUZvck5vbkNvbXBvc2l0ZWRGcmFtZSgpOwotICAgICAgICBpZiAocmVuZGVy ZXIoKS5zZXR0aW5ncygpLnZpc2libGVEZWJ1Z092ZXJsYXlSZWdpb25zKCkgJiBOb25GYXN0U2Ny b2xsYWJsZVJlZ2lvbikKKyAgICAgICAgaWYgKHJlbmRlcmVyKCkuc2V0dGluZ3MoKS52aXNpYmxl RGVidWdPdmVybGF5UmVnaW9ucygpICYgKFRvdWNoQWN0aW9uUmVnaW9uIHwgRWRpdGFibGVFbGVt ZW50UmVnaW9uKSkKICAgICAgICAgICAgIHZpZXcuc2V0TmVlZHNSZXBhaW50SGFja0FmdGVyQ29t cG9zaXRpbmdMYXllclVwZGF0ZUZvckRlYnVnT3ZlcmxheXNPbmx5KCk7CiAgICAgICAgIHZpZXcu Y29tcG9zaXRvcigpLnNjaGVkdWxlQ29tcG9zaXRpbmdMYXllclVwZGF0ZSgpOwogICAgIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKaW5kZXgg NDA4YjViMTRiOTgyZjAwMTg0MDRmZmZlYmEzODk4ZmUxNWFiM2IxYS4uMzQ4NzU4MDZmMjBlM2Y5 MjgxNmUyZjEwMzhiYjlkYzgyYjZhMDFmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKQEAgLTMxMDksNyArMzEwOSw4IEBAIHN0YXRpYyBS ZWZQdHI8UGF0dGVybj4gcGF0dGVybkZvclRvdWNoQWN0aW9uKFRvdWNoQWN0aW9uIHRvdWNoQWN0 aW9uLCBGbG9hdFNpemUKIAogdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnBhaW50RGVidWdPdmVy bGF5cyhjb25zdCBHcmFwaGljc0xheWVyKiBncmFwaGljc0xheWVyLCBHcmFwaGljc0NvbnRleHQm IGNvbnRleHQpCiB7Ci0gICAgaWYgKGdyYXBoaWNzTGF5ZXItPmV2ZW50UmVnaW9uKCkuaXNFbXB0 eSgpKQorICAgIGF1dG8mIGV2ZW50UmVnaW9uID0gZ3JhcGhpY3NMYXllci0+ZXZlbnRSZWdpb24o KTsKKyAgICBpZiAoZXZlbnRSZWdpb24uaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAKICAg ICBHcmFwaGljc0NvbnRleHRTdGF0ZVNhdmVyIHN0YXRlU2F2ZXIoY29udGV4dCk7CkBAIC0zMTE4 LDQxICszMTE5LDQ2IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjpwYWludERlYnVnT3Zlcmxh eXMoY29uc3QgR3JhcGhpY3NMYXllciogZ3JhcGhpY3NMYXllciwKICAgICBhdXRvIGNvbnRlbnRP ZmZzZXQgPSByb3VuZGVkSW50U2l6ZShjb250ZW50T2Zmc2V0SW5Db21wb3NpdGluZ0xheWVyKCkp OwogICAgIGNvbnRleHQudHJhbnNsYXRlKC1jb250ZW50T2Zmc2V0KTsKIAorICAgIGF1dG8gdmlz aWJsZURlYnVnT3ZlcmxheVJlZ2lvbnMgPSByZW5kZXJlcigpLnNldHRpbmdzKCkudmlzaWJsZURl YnVnT3ZlcmxheVJlZ2lvbnMoKTsKKwogICAgIC8vIFRoZSBpbnRlcmFjdGl2ZSBwYXJ0LgogICAg IC8vIFBhaW50IHJlY3RzIGZvciB0b3VjaCBhY3Rpb24uCi0gICAgYXV0byYgZXZlbnRSZWdpb24g PSBncmFwaGljc0xheWVyLT5ldmVudFJlZ2lvbigpOwotICAgIENvbG9yIHJlZ2lvbkNvbG9yKDAs IDAsIDI1NSwgNTApOwotICAgIGNvbnRleHQuc2V0RmlsbENvbG9yKHJlZ2lvbkNvbG9yKTsKLSAg ICBmb3IgKGF1dG8gcmVjdCA6IGV2ZW50UmVnaW9uLnJlZ2lvbigpLnJlY3RzKCkpCi0gICAgICAg IGNvbnRleHQuZmlsbFJlY3QocmVjdCk7Ci0KLSAgICBjb25zdCBUb3VjaEFjdGlvbiB0b3VjaEFj dGlvbkxpc3RbXSA9IHsKLSAgICAgICAgVG91Y2hBY3Rpb246Ok5vbmUsCi0gICAgICAgIFRvdWNo QWN0aW9uOjpNYW5pcHVsYXRpb24sCi0gICAgICAgIFRvdWNoQWN0aW9uOjpQYW5YLAotICAgICAg ICBUb3VjaEFjdGlvbjo6UGFuWSwKLSAgICAgICAgVG91Y2hBY3Rpb246OlBpbmNoWm9vbSwKLSAg ICB9OwotCi0gICAgZm9yIChhdXRvIGFjdGlvbiA6IHRvdWNoQWN0aW9uTGlzdCkgewotICAgICAg ICBhdXRvKiBhY3Rpb25SZWdpb24gPSBncmFwaGljc0xheWVyLT5ldmVudFJlZ2lvbigpLnJlZ2lv bkZvclRvdWNoQWN0aW9uKGFjdGlvbik7Ci0gICAgICAgIGlmICghYWN0aW9uUmVnaW9uKQotICAg ICAgICAgICAgY29udGludWU7Ci0KLSAgICAgICAgYXV0byBmaWxsUGF0dGVybiA9IHBhdHRlcm5G b3JUb3VjaEFjdGlvbihhY3Rpb24sIGNvbnRlbnRPZmZzZXRJbkNvbXBvc2l0aW5nTGF5ZXIoKSwg Y29udGV4dCk7Ci0gICAgICAgIGlmICghZmlsbFBhdHRlcm4pCi0gICAgICAgICAgICBjb250aW51 ZTsKLQotICAgICAgICBjb250ZXh0LnNldEZpbGxQYXR0ZXJuKGZpbGxQYXR0ZXJuLnJlbGVhc2VO b25OdWxsKCkpOwotICAgICAgICBmb3IgKGF1dG8gcmVjdCA6IGFjdGlvblJlZ2lvbi0+cmVjdHMo KSkKKyAgICBpZiAodmlzaWJsZURlYnVnT3ZlcmxheVJlZ2lvbnMgJiBUb3VjaEFjdGlvblJlZ2lv bikgeworICAgICAgICBDb2xvciByZWdpb25Db2xvcigwLCAwLCAyNTUsIDUwKTsKKyAgICAgICAg Y29udGV4dC5zZXRGaWxsQ29sb3IocmVnaW9uQ29sb3IpOworICAgICAgICBmb3IgKGF1dG8gcmVj dCA6IGV2ZW50UmVnaW9uLnJlZ2lvbigpLnJlY3RzKCkpCiAgICAgICAgICAgICBjb250ZXh0LmZp bGxSZWN0KHJlY3QpOworCisgICAgICAgIGNvbnN0IFRvdWNoQWN0aW9uIHRvdWNoQWN0aW9uTGlz dFtdID0geworICAgICAgICAgICAgVG91Y2hBY3Rpb246Ok5vbmUsCisgICAgICAgICAgICBUb3Vj aEFjdGlvbjo6TWFuaXB1bGF0aW9uLAorICAgICAgICAgICAgVG91Y2hBY3Rpb246OlBhblgsCisg ICAgICAgICAgICBUb3VjaEFjdGlvbjo6UGFuWSwKKyAgICAgICAgICAgIFRvdWNoQWN0aW9uOjpQ aW5jaFpvb20sCisgICAgICAgIH07CisKKyAgICAgICAgZm9yIChhdXRvIGFjdGlvbiA6IHRvdWNo QWN0aW9uTGlzdCkgeworICAgICAgICAgICAgYXV0byogYWN0aW9uUmVnaW9uID0gZ3JhcGhpY3NM YXllci0+ZXZlbnRSZWdpb24oKS5yZWdpb25Gb3JUb3VjaEFjdGlvbihhY3Rpb24pOworICAgICAg ICAgICAgaWYgKCFhY3Rpb25SZWdpb24pCisgICAgICAgICAgICAgICAgY29udGludWU7CisKKyAg ICAgICAgICAgIGF1dG8gZmlsbFBhdHRlcm4gPSBwYXR0ZXJuRm9yVG91Y2hBY3Rpb24oYWN0aW9u LCBjb250ZW50T2Zmc2V0SW5Db21wb3NpdGluZ0xheWVyKCksIGNvbnRleHQpOworICAgICAgICAg ICAgaWYgKCFmaWxsUGF0dGVybikKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAg ICAgICAgY29udGV4dC5zZXRGaWxsUGF0dGVybihmaWxsUGF0dGVybi5yZWxlYXNlTm9uTnVsbCgp KTsKKyAgICAgICAgICAgIGZvciAoYXV0byByZWN0IDogYWN0aW9uUmVnaW9uLT5yZWN0cygpKQor ICAgICAgICAgICAgICAgIGNvbnRleHQuZmlsbFJlY3QocmVjdCk7CisgICAgICAgIH0KICAgICB9 CiAKICNpZiBFTkFCTEUoRURJVEFCTEVfUkVHSU9OKQogICAgIC8vIFBhaW50IHJlY3RzIGZvciBl ZGl0YWJsZSBlbGVtZW50cy4KLSAgICBjb250ZXh0LnNldEZpbGxDb2xvcih7IDEyOCwgMCwgMTI4 LCA1MCB9KTsKLSAgICBmb3IgKGF1dG8gcmVjdCA6IGV2ZW50UmVnaW9uLnJlY3RzRm9yRWRpdGFi bGVFbGVtZW50cygpKQotICAgICAgICBjb250ZXh0LmZpbGxSZWN0KHJlY3QpOworICAgIGlmICh2 aXNpYmxlRGVidWdPdmVybGF5UmVnaW9ucyAmIEVkaXRhYmxlRWxlbWVudFJlZ2lvbikgeworICAg ICAgICBjb250ZXh0LnNldEZpbGxDb2xvcih7IDEyOCwgMCwgMTI4LCA1MCB9KTsKKyAgICAgICAg Zm9yIChhdXRvIHJlY3QgOiBldmVudFJlZ2lvbi5yZWN0c0ZvckVkaXRhYmxlRWxlbWVudHMoKSkK KyAgICAgICAgICAgIGNvbnRleHQuZmlsbFJlY3QocmVjdCk7CisgICAgfQogI2VuZGlmCiB9CiAK QEAgLTMxOTUsNyArMzIwMSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjpwYWludENvbnRl bnRzKGNvbnN0IEdyYXBoaWNzTGF5ZXIqIGdyYXBoaWNzTGF5ZXIsIEdyYXBoCiAKICAgICAgICAg cGFpbnRJbnRvTGF5ZXIoZ3JhcGhpY3NMYXllciwgY29udGV4dCwgZGlydHlSZWN0LCBiZWhhdmlv cik7CiAKLSAgICAgICAgaWYgKHJlbmRlcmVyKCkuc2V0dGluZ3MoKS52aXNpYmxlRGVidWdPdmVy bGF5UmVnaW9ucygpICYgTm9uRmFzdFNjcm9sbGFibGVSZWdpb24pIC8vIFBpZ2d5LWJhY2sgb2Zm IHRoZSBzZXR0aW5nIHRoYXQgc2hvd3MgdG91Y2ggaGFuZGxlciByZWdpb25zLgorICAgICAgICBp ZiAocmVuZGVyZXIoKS5zZXR0aW5ncygpLnZpc2libGVEZWJ1Z092ZXJsYXlSZWdpb25zKCkgJiAo VG91Y2hBY3Rpb25SZWdpb24gfCBFZGl0YWJsZUVsZW1lbnRSZWdpb24pKQogICAgICAgICAgICAg cGFpbnREZWJ1Z092ZXJsYXlzKGdyYXBoaWNzTGF5ZXIsIGNvbnRleHQpOwogCiAgICAgfSBlbHNl IGlmIChncmFwaGljc0xheWVyID09IGxheWVyRm9ySG9yaXpvbnRhbFNjcm9sbGJhcigpKSB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUmVm LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUmVmLmgKaW5k ZXggNDU1NDFmZjExYWIwNTYwODAzNjE5ZTMzM2VkZTNiOWIzN2JmZjg4NC4uZTc4NjczYzI4NzMw YmZkNTc0YzJiYWE2OTgxMWYxZDIzN2Y3OGY2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1JlZi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNSZWYuaApAQCAtNDYsNyArNDYsOSBAQCB0eXBlZGVm IGVudW0gV0tTdG9yYWdlQmxvY2tpbmdQb2xpY3kgV0tTdG9yYWdlQmxvY2tpbmdQb2xpY3k7CiAK IGVudW0gV0tEZWJ1Z092ZXJsYXlSZWdpb25GbGFncyB7CiAgICAga1dLTm9uRmFzdFNjcm9sbGFi bGVSZWdpb24gPSAxIDw8IDAsCi0gICAga1dLV2hlZWxFdmVudEhhbmRsZXJSZWdpb24gPSAxIDw8 IDEKKyAgICBrV0tXaGVlbEV2ZW50SGFuZGxlclJlZ2lvbiA9IDEgPDwgMSwKKyAgICBrV0tUb3Vj aEFjdGlvblJlZ2lvbiA9IDEgPDwgMiwKKyAgICBrV0tFZGl0YWJsZUVsZW1lbnRSZWdpb24gPSAx IDw8IDMsCiB9OwogdHlwZWRlZiB1bnNpZ25lZCBXS0RlYnVnT3ZlcmxheVJlZ2lvbnM7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ByZWZlcmVuY2Vz UHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJlZmVyZW5j ZXNQcml2YXRlLmgKaW5kZXggMDJhY2Q5ODE0MDgzNjBlNjM1NWIyNDljMTljOTY3OTYwN2Q2ZWFh NC4uMWE3Y2ZiNWUxYWNlNzE2ZTNlN2Y1MzM4OTMwYWE5OTZkZmIyYmVhNiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJlZmVyZW5jZXNQcml2YXRlLmgK KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJlZmVyZW5jZXNQcml2 YXRlLmgKQEAgLTM0LDcgKzM0LDkgQEAgdHlwZWRlZiBOU19FTlVNKE5TSW50ZWdlciwgX1dLU3Rv cmFnZUJsb2NraW5nUG9saWN5KSB7CiAKIHR5cGVkZWYgTlNfT1BUSU9OUyhOU1VJbnRlZ2VyLCBf V0tEZWJ1Z092ZXJsYXlSZWdpb25zKSB7CiAgICAgX1dLTm9uRmFzdFNjcm9sbGFibGVSZWdpb24g PSAxIDw8IDAsCi0gICAgX1dLV2hlZWxFdmVudEhhbmRsZXJSZWdpb24gPSAxIDw8IDEKKyAgICBf V0tXaGVlbEV2ZW50SGFuZGxlclJlZ2lvbiA9IDEgPDwgMSwKKyAgICBfV0tUb3VjaEFjdGlvblJl Z2lvbiA9IDEgPDwgMiwKKyAgICBfV0tFZGl0YWJsZUVsZW1lbnRSZWdpb24gPSAxIDw8IDMsCiB9 IFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoMTAuMTEpLCBpb3MoOS4wKSk7CiAKIHR5cGVkZWYgTlNf T1BUSU9OUyhOU1VJbnRlZ2VyLCBfV0tKYXZhU2NyaXB0UnVudGltZUZsYWdzKSB7Cg==