229733 2021-08-31 13:41:21 -0700 REGRESSION(r280928) The smooth keyboard scrolling is unconditionally enabled for PageUp and PageDown keys 2021-11-04 02:48:52 -0700 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 fujii fujii a9016009 darin simon.fraser thorton webkit-bug-importer oldest_to_newest 1789061 0 fujii 2021-08-31 13:41:21 -0700 REGRESSION(r280928) The smooth keyboard scrolling is enabled only for PageUp and PageDown keys Since: r280928 (Bug 228156) 1. Start WinCairo MiniBrowser 2. Press PageDown key Actual: scolling smoothly Expected: scolling not smoothly NOTE: Space key and Arrow key don't trigger the smooth keyboard scrolling. 1789069 1 436938 fujii 2021-08-31 13:51:10 -0700 Created attachment 436938 Patch 1789070 2 436938 darin 2021-08-31 13:52:43 -0700 Comment on attachment 436938 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=436938&action=review > Source/WebCore/page/EventHandler.cpp:3812 > + else if (m_frame.settings().eventHandlerDrivenSmoothKeyboardScrollingEnabled() > + && (event.keyIdentifier() == "PageUp" || event.keyIdentifier() == "PageDown")) > startKeyboardScrolling(event); This looks like it will make PageUp and PageDown not scroll at all? Is that right? 1789088 3 436938 fujii 2021-08-31 14:17:22 -0700 Comment on attachment 436938 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=436938&action=review >> Source/WebCore/page/EventHandler.cpp:3812 >> startKeyboardScrolling(event); > > This looks like it will make PageUp and PageDown not scroll at all? Is that right? This change restores the previous behavior before r280928. If the key event isn't consumed by WebCore's handleKeyEvent, WebKit's WebPage::performDefaultBehaviorForKeyEvent handles it. 1789089 4 436938 thorton 2021-08-31 14:20:42 -0700 Comment on attachment 436938 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=436938&action=review > Source/WebCore/ChangeLog:3 > + REGRESSION(r280928) The smooth keyboard scrolling is enabled only for PageUp and PageDown keys From the wording of the title ("enabled only for") I assumed the fix would be "enable it for more things". But actually it is fixing the fact that it was accidentally enabled unconditionally for pageup/down. Current title is fine, but a rewording could make it more clear. Regardless, this seems fine. >>> Source/WebCore/page/EventHandler.cpp:3812 >>> startKeyboardScrolling(event); >> >> This looks like it will make PageUp and PageDown not scroll at all? Is that right? > > This change restores the previous behavior before r280928. > If the key event isn't consumed by WebCore's handleKeyEvent, WebKit's WebPage::performDefaultBehaviorForKeyEvent handles it. Possible we should just move the setting check /inside/ startKeyboardScrolling? 1789164 5 436938 fujii 2021-08-31 17:14:22 -0700 Comment on attachment 436938 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=436938&action=review >> Source/WebCore/ChangeLog:3 >> + REGRESSION(r280928) The smooth keyboard scrolling is enabled only for PageUp and PageDown keys > > From the wording of the title ("enabled only for") I assumed the fix would be "enable it for more things". But actually it is fixing the fact that it was accidentally enabled unconditionally for pageup/down. Current title is fine, but a rewording could make it more clear. Regardless, this seems fine. Fixed. >>>> Source/WebCore/page/EventHandler.cpp:3812 >>>> startKeyboardScrolling(event); >>> >>> This looks like it will make PageUp and PageDown not scroll at all? Is that right? >> >> This change restores the previous behavior before r280928. >> If the key event isn't consumed by WebCore's handleKeyEvent, WebKit's WebPage::performDefaultBehaviorForKeyEvent handles it. > > Possible we should just move the setting check /inside/ startKeyboardScrolling? Good idea. Will fix. 1789167 6 436971 fujii 2021-08-31 17:24:32 -0700 Created attachment 436971 Patch 1789172 7 436971 darin 2021-08-31 17:30:49 -0700 Comment on attachment 436971 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=436971&action=review > Source/WebCore/page/EventHandler.cpp:3812 > + event.setDefaultHandled(); What was calling setDefaultHandled here before? Change log doesn’t mention this change, and it’s a change that affects only the other ports, not WinCairo. > Source/WebCore/page/EventHandler.cpp:4312 > + event.setDefaultHandled(); Ditto. 1789178 8 436971 fujii 2021-08-31 17:49:05 -0700 Comment on attachment 436971 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=436971&action=review >> Source/WebCore/page/EventHandler.cpp:3812 >> + event.setDefaultHandled(); > > What was calling setDefaultHandled here before? Change log doesn’t mention this change, and it’s a change that affects only the other ports, not WinCairo. Yes. It's another change. I'm going to split the patch for the part. 1789179 9 436975 fujii 2021-08-31 17:50:05 -0700 Created attachment 436975 Patch 1789423 10 436975 fujii 2021-09-01 12:50:19 -0700 Comment on attachment 436975 Patch Clearing flags on attachment: 436975 Committed r281867 (241197@main): <https://commits.webkit.org/241197@main> 1789424 11 fujii 2021-09-01 12:50:23 -0700 All reviewed patches have been landed. Closing bug. 1789427 12 webkit-bug-importer 2021-09-01 12:51:27 -0700 <rdar://problem/82641834> 1789560 13 fujii 2021-09-01 17:38:20 -0700 (In reply to Fujii Hironori from comment #8) > Yes. It's another change. I'm going to split the patch for the part. Filed: Bug 229784 – KeyboardEvent should setDefaultHandled if EventHandler::startKeyboardScrolling returns true 1811809 14 aperez 2021-11-04 02:48:52 -0700 *** Bug 232701 has been marked as a duplicate of this bug. *** 436938 2021-08-31 13:51:10 -0700 2021-08-31 17:24:22 -0700 Patch bug-229733-20210901055109.patch text/plain 2026 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2RiZDI0YjBkODc0NWI0 ZDFlM2EwYzYzOTZjMjQxM2VkNmY4MzkwMC4uYmMxZjk4ZjM5Mjk5MTk4MTE4NzY5Y2NlNGMzNGE4 MjI0NjRiZmExOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA4LTMxICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFJFR1JFU1NJ T04ocjI4MDkyOCkgVGhlIHNtb290aCBrZXlib2FyZCBzY3JvbGxpbmcgaXMgZW5hYmxlZCBvbmx5 IGZvciBQYWdlVXAgYW5kIFBhZ2VEb3duIGtleXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTczMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEV2ZW4gdGhvdWdoIFdpbkNhaXJvIHBvcnQgZG9lc24ndCBl bmFibGUKKyAgICAgICAgRXZlbnRIYW5kbGVyRHJpdmVuU21vb3RoS2V5Ym9hcmRTY3JvbGxpbmdF bmFibGVkIHlldCwgaXQgaGFkIGJlZW4KKyAgICAgICAgZW5hYmxlZCBvbmx5IGZvciBQYWdlVXAg YW5kIFBhZ2VEb3duIGtleXMgc2luY2UgcjI4MDkyOC4gT3RoZXIKKyAgICAgICAga2V5cyAoU3Bh Y2UgYW5kIEFycm93IGtleXMpIGRvbid0IHRyaWdnZXIgdGhlIHNtb290aCBzY3JvbGxpbmcuCisK KyAgICAgICAgKiBwYWdlL0V2ZW50SGFuZGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFdmVu dEhhbmRsZXI6OmRlZmF1bHRLZXlib2FyZEV2ZW50SGFuZGxlcik6IENoZWNrIHRoZQorICAgICAg ICBzZXR0aW5nIGV2ZW50SGFuZGxlckRyaXZlblNtb290aEtleWJvYXJkU2Nyb2xsaW5nRW5hYmxl ZC4KKwogMjAyMS0wOC0yNyAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29t PgogCiAgICAgICAgIFRoZSBzaW1wbGUgdGV4dCBjb2RlcGF0aCBkb2VzIG5vdCBoYW5kbGUgdW5w YWlyZWQgc3Vycm9nYXRlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhh bmRsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCmluZGV4IDA1 OTRjOTk1MDdhMmI1MDFkNmQ2NDdjNmZlNmVkNDVjNDU0MDIxOTEuLjk2ZWVmMTdmN2UzMzQ0M2Zl NzJjZDI5OGEwYzAzYjFmYzIzMWZkYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RXZlbnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5j cHAKQEAgLTM4MDcsNyArMzgwNyw4IEBAIHZvaWQgRXZlbnRIYW5kbGVyOjpkZWZhdWx0S2V5Ym9h cmRFdmVudEhhbmRsZXIoS2V5Ym9hcmRFdmVudCYgZXZlbnQpCiAgICAgICAgICAgICBkZWZhdWx0 VGFiRXZlbnRIYW5kbGVyKGV2ZW50KTsKICAgICAgICAgZWxzZSBpZiAoZXZlbnQua2V5SWRlbnRp ZmllcigpID09ICJVKzAwMDgiKQogICAgICAgICAgICAgZGVmYXVsdEJhY2tzcGFjZUV2ZW50SGFu ZGxlcihldmVudCk7Ci0gICAgICAgIGVsc2UgaWYgKGV2ZW50LmtleUlkZW50aWZpZXIoKSA9PSAi UGFnZVVwIiB8fCBldmVudC5rZXlJZGVudGlmaWVyKCkgPT0gIlBhZ2VEb3duIikKKyAgICAgICAg ZWxzZSBpZiAobV9mcmFtZS5zZXR0aW5ncygpLmV2ZW50SGFuZGxlckRyaXZlblNtb290aEtleWJv YXJkU2Nyb2xsaW5nRW5hYmxlZCgpCisgICAgICAgICAgICAmJiAoZXZlbnQua2V5SWRlbnRpZmll cigpID09ICJQYWdlVXAiIHx8IGV2ZW50LmtleUlkZW50aWZpZXIoKSA9PSAiUGFnZURvd24iKSkK ICAgICAgICAgICAgIHN0YXJ0S2V5Ym9hcmRTY3JvbGxpbmcoZXZlbnQpOwogICAgICAgICBlbHNl IHsKICAgICAgICAgICAgIEZvY3VzRGlyZWN0aW9uIGRpcmVjdGlvbiA9IGZvY3VzRGlyZWN0aW9u Rm9yS2V5KGV2ZW50LmtleUlkZW50aWZpZXIoKSk7Cg== 436971 2021-08-31 17:24:32 -0700 2021-08-31 17:49:56 -0700 Patch bug-229733-20210901092431.patch text/plain 3108 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2RiZDI0YjBkODc0NWI0 ZDFlM2EwYzYzOTZjMjQxM2VkNmY4MzkwMC4uZjNkMGVjN2RkZjMyNjAyYWRjM2VmZTgwNGVkZDBh YWRmZmU4MTAwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTA4LTMxICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFJFR1JFU1NJ T04ocjI4MDkyOCkgVGhlIHNtb290aCBrZXlib2FyZCBzY3JvbGxpbmcgaXMgdW5jb25kaXRpb25h bGx5IGVuYWJsZWQgZm9yIFBhZ2VVcCBhbmQgUGFnZURvd24ga2V5cworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5NzMzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICBFdmVuIHRob3VnaCBXaW5DYWlybyBwb3J0IGRv ZXNuJ3QgZW5hYmxlCisgICAgICAgIEV2ZW50SGFuZGxlckRyaXZlblNtb290aEtleWJvYXJkU2Ny b2xsaW5nRW5hYmxlZCB5ZXQsIGl0IGhhZCBiZWVuCisgICAgICAgIGVuYWJsZWQgb25seSBmb3Ig UGFnZVVwIGFuZCBQYWdlRG93biBrZXlzIHNpbmNlIHIyODA5MjguIE90aGVyCisgICAgICAgIGtl eXMgKFNwYWNlIGFuZCBBcnJvdyBrZXlzKSBkb24ndCB0cmlnZ2VyIHRoZSBzbW9vdGggc2Nyb2xs aW5nLgorCisgICAgICAgIHIyODA5MjggY2hhbmdlZCB0byBjYWxsIHN0YXJ0S2V5Ym9hcmRTY3Jv bGxpbmcgZm9yIFBhZ2VVcCBhbmQKKyAgICAgICAgUGFnZURvd24ga2V5cywgYnV0IGl0IGRpZG4n dCBjaGVjayB0aGUgc2V0dGluZy4KKworICAgICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6c3RhcnRLZXlib2FyZFNjcm9sbGluZyk6 CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmRlZmF1bHRLZXlib2FyZEV2ZW50SGFu ZGxlcik6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmRlZmF1bHRBcnJvd0V2ZW50 SGFuZGxlcik6CisKIDIwMjEtMDgtMjcgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFw cGxlLmNvbT4KIAogICAgICAgICBUaGUgc2ltcGxlIHRleHQgY29kZXBhdGggZG9lcyBub3QgaGFu ZGxlIHVucGFpcmVkIHN1cnJvZ2F0ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RXZlbnRIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcApp bmRleCAwNTk0Yzk5NTA3YTJiNTAxZDZkNjQ3YzZmZTZlZDQ1YzQ1NDAyMTkxLi4wODY5YzYxZDcz MjRlNzlkNDQ3YTFjZTNiN2RlOTAxNzJkMWUyMThiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhh bmRsZXIuY3BwCkBAIC0zODA3LDkgKzM4MDcsMTAgQEAgdm9pZCBFdmVudEhhbmRsZXI6OmRlZmF1 bHRLZXlib2FyZEV2ZW50SGFuZGxlcihLZXlib2FyZEV2ZW50JiBldmVudCkKICAgICAgICAgICAg IGRlZmF1bHRUYWJFdmVudEhhbmRsZXIoZXZlbnQpOwogICAgICAgICBlbHNlIGlmIChldmVudC5r ZXlJZGVudGlmaWVyKCkgPT0gIlUrMDAwOCIpCiAgICAgICAgICAgICBkZWZhdWx0QmFja3NwYWNl RXZlbnRIYW5kbGVyKGV2ZW50KTsKLSAgICAgICAgZWxzZSBpZiAoZXZlbnQua2V5SWRlbnRpZmll cigpID09ICJQYWdlVXAiIHx8IGV2ZW50LmtleUlkZW50aWZpZXIoKSA9PSAiUGFnZURvd24iKQot ICAgICAgICAgICAgc3RhcnRLZXlib2FyZFNjcm9sbGluZyhldmVudCk7Ci0gICAgICAgIGVsc2Ug eworICAgICAgICBlbHNlIGlmIChldmVudC5rZXlJZGVudGlmaWVyKCkgPT0gIlBhZ2VVcCIgfHwg ZXZlbnQua2V5SWRlbnRpZmllcigpID09ICJQYWdlRG93biIpIHsKKyAgICAgICAgICAgIGlmIChz dGFydEtleWJvYXJkU2Nyb2xsaW5nKGV2ZW50KSkKKyAgICAgICAgICAgICAgICBldmVudC5zZXRE ZWZhdWx0SGFuZGxlZCgpOworICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgRm9jdXNEaXJl Y3Rpb24gZGlyZWN0aW9uID0gZm9jdXNEaXJlY3Rpb25Gb3JLZXkoZXZlbnQua2V5SWRlbnRpZmll cigpKTsKICAgICAgICAgICAgIGlmIChkaXJlY3Rpb24gIT0gRm9jdXNEaXJlY3Rpb246Ok5vbmUp CiAgICAgICAgICAgICAgICAgZGVmYXVsdEFycm93RXZlbnRIYW5kbGVyKGRpcmVjdGlvbiwgZXZl bnQpOwpAQCAtNDI4OCw2ICs0Mjg5LDkgQEAgdm9pZCBFdmVudEhhbmRsZXI6OnN0b3BLZXlib2Fy ZFNjcm9sbGluZygpCiAKIGJvb2wgRXZlbnRIYW5kbGVyOjpzdGFydEtleWJvYXJkU2Nyb2xsaW5n KEtleWJvYXJkRXZlbnQmIGV2ZW50KQogeworICAgIGlmICghbV9mcmFtZS5zZXR0aW5ncygpLmV2 ZW50SGFuZGxlckRyaXZlblNtb290aEtleWJvYXJkU2Nyb2xsaW5nRW5hYmxlZCgpKQorICAgICAg ICByZXR1cm4gZmFsc2U7CisKICAgICBSZWYgcHJvdGVjdGVkRnJhbWUgPSBtX2ZyYW1lOwogICAg IEZyYW1lVmlldyogdmlldyA9IG1fZnJhbWUudmlldygpOwogCkBAIC00MzA0LDggKzQzMDgsOCBA QCB2b2lkIEV2ZW50SGFuZGxlcjo6ZGVmYXVsdEFycm93RXZlbnRIYW5kbGVyKEZvY3VzRGlyZWN0 aW9uIGZvY3VzRGlyZWN0aW9uLCBLZXlibwogICAgIEFTU0VSVChldmVudC50eXBlKCkgPT0gZXZl bnROYW1lcygpLmtleWRvd25FdmVudCk7CiAKICAgICBpZiAoIWlzU3BhdGlhbE5hdmlnYXRpb25F bmFibGVkKCZtX2ZyYW1lKSkgewotICAgICAgICBpZiAobV9mcmFtZS5zZXR0aW5ncygpLmV2ZW50 SGFuZGxlckRyaXZlblNtb290aEtleWJvYXJkU2Nyb2xsaW5nRW5hYmxlZCgpKQotICAgICAgICAg ICAgc3RhcnRLZXlib2FyZFNjcm9sbGluZyhldmVudCk7CisgICAgICAgIGlmIChzdGFydEtleWJv YXJkU2Nyb2xsaW5nKGV2ZW50KSkKKyAgICAgICAgICAgIGV2ZW50LnNldERlZmF1bHRIYW5kbGVk KCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAK 436975 2021-08-31 17:50:05 -0700 2021-09-01 12:50:19 -0700 Patch bug-229733-20210901095004.patch text/plain 2211 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2RiZDI0YjBkODc0NWI0 ZDFlM2EwYzYzOTZjMjQxM2VkNmY4MzkwMC4uOTQ1MzU0ODRlM2ExMWI4YzZmNzVjZDgwYjhlN2Yx MDk0NzlmZWI0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTA4LTMxICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFJFR1JFU1NJ T04ocjI4MDkyOCkgVGhlIHNtb290aCBrZXlib2FyZCBzY3JvbGxpbmcgaXMgdW5jb25kaXRpb25h bGx5IGVuYWJsZWQgZm9yIFBhZ2VVcCBhbmQgUGFnZURvd24ga2V5cworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5NzMzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICBFdmVuIHRob3VnaCBXaW5DYWlybyBwb3J0IGRv ZXNuJ3QgZW5hYmxlCisgICAgICAgIEV2ZW50SGFuZGxlckRyaXZlblNtb290aEtleWJvYXJkU2Ny b2xsaW5nRW5hYmxlZCB5ZXQsIGl0IGhhZCBiZWVuCisgICAgICAgIGVuYWJsZWQgb25seSBmb3Ig UGFnZVVwIGFuZCBQYWdlRG93biBrZXlzIHNpbmNlIHIyODA5MjguIE90aGVyCisgICAgICAgIGtl eXMgKFNwYWNlIGFuZCBBcnJvdyBrZXlzKSBkb24ndCB0cmlnZ2VyIHRoZSBzbW9vdGggc2Nyb2xs aW5nLgorCisgICAgICAgIHIyODA5MjggY2hhbmdlZCB0byBjYWxsIHN0YXJ0S2V5Ym9hcmRTY3Jv bGxpbmcgZm9yIFBhZ2VVcCBhbmQKKyAgICAgICAgUGFnZURvd24ga2V5cywgYnV0IGl0IGRpZG4n dCBjaGVjayB0aGUgc2V0dGluZy4KKworICAgICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6c3RhcnRLZXlib2FyZFNjcm9sbGluZyk6 CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmRlZmF1bHRLZXlib2FyZEV2ZW50SGFu ZGxlcik6CisKIDIwMjEtMDgtMjcgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxl LmNvbT4KIAogICAgICAgICBUaGUgc2ltcGxlIHRleHQgY29kZXBhdGggZG9lcyBub3QgaGFuZGxl IHVucGFpcmVkIHN1cnJvZ2F0ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZl bnRIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAppbmRl eCAwNTk0Yzk5NTA3YTJiNTAxZDZkNjQ3YzZmZTZlZDQ1YzQ1NDAyMTkxLi5kYjdkODhjYWExN2Zm MzdmZTEzMDM5NzljZDQwOGZhNWYyZDRjYWViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL0V2ZW50SGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRs ZXIuY3BwCkBAIC00Mjg4LDYgKzQyODgsOSBAQCB2b2lkIEV2ZW50SGFuZGxlcjo6c3RvcEtleWJv YXJkU2Nyb2xsaW5nKCkKIAogYm9vbCBFdmVudEhhbmRsZXI6OnN0YXJ0S2V5Ym9hcmRTY3JvbGxp bmcoS2V5Ym9hcmRFdmVudCYgZXZlbnQpCiB7CisgICAgaWYgKCFtX2ZyYW1lLnNldHRpbmdzKCku ZXZlbnRIYW5kbGVyRHJpdmVuU21vb3RoS2V5Ym9hcmRTY3JvbGxpbmdFbmFibGVkKCkpCisgICAg ICAgIHJldHVybiBmYWxzZTsKKwogICAgIFJlZiBwcm90ZWN0ZWRGcmFtZSA9IG1fZnJhbWU7CiAg ICAgRnJhbWVWaWV3KiB2aWV3ID0gbV9mcmFtZS52aWV3KCk7CiAKQEAgLTQzMDQsOCArNDMwNyw3 IEBAIHZvaWQgRXZlbnRIYW5kbGVyOjpkZWZhdWx0QXJyb3dFdmVudEhhbmRsZXIoRm9jdXNEaXJl Y3Rpb24gZm9jdXNEaXJlY3Rpb24sIEtleWJvCiAgICAgQVNTRVJUKGV2ZW50LnR5cGUoKSA9PSBl dmVudE5hbWVzKCkua2V5ZG93bkV2ZW50KTsKIAogICAgIGlmICghaXNTcGF0aWFsTmF2aWdhdGlv bkVuYWJsZWQoJm1fZnJhbWUpKSB7Ci0gICAgICAgIGlmIChtX2ZyYW1lLnNldHRpbmdzKCkuZXZl bnRIYW5kbGVyRHJpdmVuU21vb3RoS2V5Ym9hcmRTY3JvbGxpbmdFbmFibGVkKCkpCi0gICAgICAg ICAgICBzdGFydEtleWJvYXJkU2Nyb2xsaW5nKGV2ZW50KTsKKyAgICAgICAgc3RhcnRLZXlib2Fy ZFNjcm9sbGluZyhldmVudCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAK