193084 2019-01-02 11:35:06 -0800 [iOS] REGRESSION (r239441): Tab cycling to offscreen <select> may not scroll it into view 2019-01-03 07:38:43 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Local Build iPhone / iPad iOS 12 RESOLVED FIXED InRadar, Regression P1 Normal --- 192802 1 dbates wenson_hsieh bdakin commit-queue megan_gardner simon.fraser thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1491195 0 358192 dbates 2019-01-02 11:35:06 -0800 Created attachment 358192 Test Seen with iOS WebKit using a 6th generation iPad in landscape orientation with a hardware keyboard attached. We may not scroll an offscreen <select> into view following r23944. Steps to reproduce: 1. Open the attached test case. 2. Press the tab key on the hardware keyboard four times. Then the bottom-most <select> (whose selected item is "Fifth") should be selected the view scrolled to show it. But the view is scrolled to the top of the page. For some reason we will scroll the <select>s in the middle of the page into view (why?). 1491197 1 webkit-bug-importer 2019-01-02 11:36:33 -0800 <rdar://problem/47006884> 1491198 2 webkit-bug-importer 2019-01-02 11:36:38 -0800 <rdar://problem/47006882> 1491206 3 wenson_hsieh 2019-01-02 12:07:42 -0800 It's interesting that the input accessory view buttons (˄ and ˅) do the right thing, but the keyboard does not. I think I overlooked a nuance in the way that _didAccessoryTabInitiateFocus state is maintained when tabbing/shift-tabbing via hardware keyboard. 1491267 4 wenson_hsieh 2019-01-02 14:48:08 -0800 Ah, this broke in r239441 because I changed this (in WebPage::getFocusedElementInformation, formerly WebPage::getAssistedNodeInformation) from: if (!information.elementRect.contains(m_lastInteractionLocation)) information.selectionRect = IntRect(); ...to: if (!information.elementRect.contains(m_lastInteractionLocation)) information.elementInteractionLocation = { }; ...and in WKContentViewInteraction.mm, I then have this logic to determine where to zoom/scroll: WebCore::IntRect elementInteractionRect(elementInfo.elementInteractionLocation, { 1, 1 }); if (!shouldZoomToRevealSelectionRect(elementInfo.elementType)) return elementInteractionRect; So the net effect of this is that when zooming between form controls when the last interaction location is outside of the element bounding rect, we'll end up passing in a selection rect of {{ 0, 0 }, { 1, 1 }} instead of {{ 0, 0 }, { 0, 0 }} as we did before. Subsequently, -[WKWebView _zoomToFocusRect:selectionRect:insideFixed:fontSize:minimumScale:maximumScale:allowScaling:forceScroll:] treats {{ 0, 0 }, { 0, 0 }} as a special case by not attempting to reveal that rect, whereas it happily will attempt to reveal {{ 0, 0 }, { 1, 1 }}, causing the page to scroll to the top. The fix is to revert this unintentional behavior change. 1491339 5 358231 wenson_hsieh 2019-01-02 17:37:07 -0800 Created attachment 358231 Patch 1491421 6 358231 commit-queue 2019-01-03 07:38:42 -0800 Comment on attachment 358231 Patch Clearing flags on attachment: 358231 Committed r239590: <https://trac.webkit.org/changeset/239590> 1491422 7 commit-queue 2019-01-03 07:38:43 -0800 All reviewed patches have been landed. Closing bug. 358192 2019-01-02 11:35:06 -0800 2019-01-02 11:35:06 -0800 Test 1.html text/html 352 dbates PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8Ym9keT4KPGlucHV0IHR5cGU9InRleHQiPgo8ZGl2IHN0 eWxlPSJoZWlnaHQ6IDEwMjRweCI+PC9kaXY+CjxzZWxlY3Q+CjxvcHRpb24+Rmlyc3Q8L29wdGlv bj4KPG9wdGlvbj5TZWNvbmQ8L29wdGlvbj4KPC9zZWxlY3Q+CjxzZWxlY3Q+CjxvcHRpb24+VGhp cmQ8L29wdGlvbj4KPG9wdGlvbj5Gb3VydGg8L29wdGlvbj4KPC9zZWxlY3Q+CjxkaXYgc3R5bGU9 ImhlaWdodDogMTAyNHB4Ij48L2Rpdj4KPHNlbGVjdD4KPG9wdGlvbj5GaWZ0aDwvb3B0aW9uPgo8 b3B0aW9uPlNpeHRoPC9vcHRpb24+Cjwvc2VsZWN0Pgo8aW5wdXQgdHlwZT0idGV4dCI+CjwvYm9k eT4KPC9odG1sPg== 358231 2019-01-02 17:37:07 -0800 2019-01-03 07:38:42 -0800 Patch bug-193084-20190102173706.patch text/plain 12956 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5NTc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDMyMDdiOTVkZDk5N2RhMTdj MzViYWFkZGM3M2MxMTg1ZmZkOThiNGYuLjE1M2M0MTkzNGMxYWUwZjM2MGM5MTAwNWMyMjFkZjBh NmIyOWMwOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTYgQEAKKzIwMTktMDEtMDIgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gUkVHUkVTU0lP TiAocjIzOTQ0MSk6IFRhYiBjeWNsaW5nIHRvIG9mZnNjcmVlbiA8c2VsZWN0PiBtYXkgbm90IHNj cm9sbCBpdCBpbnRvIHZpZXcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE5MzA4NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcwMDY4ODI+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gYFdLV2ViVmll dy5tbWAsIGAtX3pvb21Ub0ZvY3VzUmVjdDpgIHdpbGwgaWdub3JlIHRoZSBnaXZlbiBzZWxlY3Rp b24gcmVjdCBpZiBpdCBpcyBvZiBzaXplIGB7IDAsIDAgfWAgYW5kIGF0CisgICAgICAgIHRoZSBv cmlnaW4uIFByaW9yIHRvIHIyMzk0NDEsIHdoZW4gdXNpbmcgdGhlIHRhYiBrZXkgdG8gbW92ZSBm b2N1cyBiZXR3ZWVuIG5vbi1lZGl0YWJsZSBmb3JtIGNvbnRyb2xzIChvciBhbnkKKyAgICAgICAg b3RoZXIgbWV0aG9kIHRoYXQgZG9lc24ndCBpbnZvbHZlIHRhcHBpbmcgb24gdGhlIGZvY3VzZWQg c2VsZWN0IGVsZW1lbnQsIHdpdGggdGhlIGV4Y2VwdGlvbiBvZiB0aGUgbmV4dCBhbmQKKyAgICAg ICAgcHJldmlvdXMgYnV0dG9ucyBpbiB0aGUgaW5wdXQgYWNjZXNzb3J5IHZpZXcpLCB3ZSB3b3Vs ZCBjb21wdXRlIGEgc2VsZWN0aW9uIHJlY3Qgb2YgYHt7IDAsIDAgfSwgeyAwLCAwIH19YCwgYW5k CisgICAgICAgIHN1YnNlcXVlbnRseSB0cnkgdG8gc2Nyb2xsIHRoZSBmb2N1c2VkIGVsZW1lbnQg dG8gdGhlIGNlbnRlciBvZiB0aGUgdmlzaWJsZSBhcmVhLCB3aXRob3V0IHRha2luZyB0aGUgc2Vs ZWN0aW9uCisgICAgICAgIHJlY3QgaW50byBhY2NvdW50LgorCisgICAgICAgIEhvd2V2ZXIsIGFm dGVyIHIyMzk0NDEsIHRoZSB3ZWIgcHJvY2VzcyBzZW5kcyB0aGUgZWxlbWVudCBpbnRlcmFjdGlv biBsb2NhdGlvbiB0byB0aGUgVUkgcHJvY2Vzcywgd2hpY2ggdGhlbgorICAgICAgICBjb21wdXRl cyB0aGUgc2VsZWN0aW9uIHJlY3QgYnkgdGFraW5nIHRoaXMgbG9jYXRpb24gYW5kIGFkZGluZyBh IHNpemUgb2YgYHsgMSwgMSB9YCAoYmVmb3JlIHIyMzk0NDEsIHRoaXMgd2FzCisgICAgICAgIGRv bmUgaW4gYFdlYlBhZ2U6OmdldEFzc2lzdGVkTm9kZUluZm9ybWF0aW9uYCkuIEhvd2V2ZXIsIG91 ciBuZXcgaW1wbGVtZW50YXRpb24gZG9lc24ndCB0YWtlIGludG8gYWNjb3VudCB0aGUKKyAgICAg ICAgY2FzZSB3aGVyZSB0aGUgZWxlbWVudCBpbnRlcmFjdGlvbiByZWN0IGlzIG51bGwsIHdoaWNo IGhhcHBlbnMgd2hlbiB0aGUgbGFzdCBpbnRlcmFjdGlvbiBsb2NhdGlvbiBpcyBvdXRzaWRlIG9m CisgICAgICAgIHRoZSBib3VuZGluZyByZWN0IG9mIHRoZSBlbGVtZW50LiBJbiB0aGlzIGNhc2Us IHdlIHNldCB0aGUgZWxlbWVudCBpbnRlcmFjdGlvbiBsb2NhdGlvbiB0byB7IDAsIDAgfSBhbmQg ZW5kIHVwCisgICAgICAgIGNvbXB1dGluZyBhIHNlbGVjdGlvbiByZWN0IG9mIGB7eyAwLCAwIH0s IHsgMSwgMSB9fWAgaW5zdGVhZCBvZiBge3sgMCwgMCB9LCB7IDAsIDAgfX1gIGFzIHdlIHdvdWxk IGhhdmUKKyAgICAgICAgcHJldmlvdXNseSBkb25lLiBUaGlzIGNhdXNlcyB1cyB0byBzY3JvbGwg dXAgdG8gdGhlIG9yaWdpbiwgaW5zdGVhZCBvZiByZXZlYWxpbmcgdGhlIGZvY3VzZWQgZWxlbWVu dC4KKworICAgICAgICBUbyBmaXggdGhpcywgd2UgcmVzdG9yZSB0aGUgcHJlLXIyMzk0NDEgYmVo YXZpb3IuIFNlZSBhZGRpdGlvbmFsIGNvbW1lbnRzIGJlbG93IGZvciBkZXRhaWxzLgorCisgICAg ICAgIFRlc3Q6IGZhc3QvZm9ybXMvaW9zL3Njcm9sbC10by1yZXZlYWwtZm9jdXNlZC1zZWxlY3Qu aHRtbAorCisgICAgICAgICogU2hhcmVkL0ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uY3BwOgor ICAgICAgICAoV2ViS2l0OjpGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uOjplbmNvZGUgY29uc3Qp OgorICAgICAgICAoV2ViS2l0OjpGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uOjpkZWNvZGUpOgor ICAgICAgICAqIFNoYXJlZC9Gb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmg6CisKKyAgICAgICAg UmVuYW1lIGBlbGVtZW50SW50ZXJhY3Rpb25Mb2NhdGlvbmAgdG8gYGxhc3RJbnRlcmFjdGlvbkxv Y2F0aW9uYC4gVGhpcyB3YXMgcHJldmlvdXNseQorICAgICAgICBgZWxlbWVudEludGVyYWN0aW9u TG9jYXRpb25gIGR1ZSB0byBleGlzdGluZyBsb2dpYyB0aGF0IHRyaWVzIHRvIG1vdmUgdGhlIGlu dGVyYWN0aW9uIGxvY2F0aW9uIGludG8gdGhlIGJvdW5kaW5nCisgICAgICAgIHJlY3Qgb2YgdGhl IGVsZW1lbnQgaW4gdGhlIGNhc2Ugd2hlcmUgdmlzdWFsIHZpZXdwb3J0cyBhcmUgZGlzYWJsZWQ7 IGhvd2V2ZXIsIHNpbmNlIHRoaXMgZmVhdHVyZSBoYXMgbG9uZyBiZWVuCisgICAgICAgIGVuYWJs ZWQgYnkgZGVmYXVsdCBmb3IgYWxsIG1vZGVybiBXZWJLaXQgY2xpZW50cyAoaW50ZXJuYWwgYW5k IGV4dGVybmFsKSwgaXQncyBzaW1wbGVyIHRvIGp1c3QgdXNlIGFsd2F5cyBzZW5kCisgICAgICAg IHRoZSBsYXN0IGludGVyYWN0aW9uIGxvY2F0aW9uIG92ZXIgdG8gdGhlIFVJIHByb2Nlc3MsIGFu ZCBoYXZlIHRoZSBVSSBwcm9jZXNzIHVzZSBge3sgMCwgMCB9LCB7IDAsIDAgfX1gIGlmCisgICAg ICAgIHRoZSBpbnRlcmFjdGlvbiBsb2NhdGlvbiBpcyBvdXRzaWRlIG9mIHRoZSBlbGVtZW50IHJl Y3QuCisKKyAgICAgICAgSW4gdGhlIHZlcnkgdW5saWtlbHkgZXZlbnQgdGhhdCBhbnkgbW9kZXJu IFdlYktpdCBjbGllbnQgZGlzYWJsZXMgdmlzdWFsIHZpZXdwb3J0cywgdGhpcyB3aWxsIHN0aWxs IGJlaGF2ZQorICAgICAgICByZWFzb25hYmx5LCBzaW5jZSB3ZSdsbCBqdXN0IHVzZSBge3sgMCwg MCB9LCB7IDAsIDAgfX1gIGFzIHRoZSB0YXJnZXQgcmVjdCBhbmQgc2Nyb2xsIHRvIHJldmVhbCB0 aGUgZW50aXJlCisgICAgICAgIGVsZW1lbnQgcmF0aGVyIHRoYW4gdGhlIHRvcCBsZWZ0IGNvcm5l ciBvZiB0aGUgZWxlbWVudC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll d0ludGVyYWN0aW9uLm1tOgorICAgICAgICAocmVjdFRvUmV2ZWFsV2hlblpvb21pbmdUb0ZvY3Vz ZWRFbGVtZW50KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1Mu bW06CisKKyAgICAgICAgTW92ZSB0aGUgY2hlY2sgZm9yIHdoZXRoZXIgdGhlIGludGVyYWN0aW9u IGxvY2F0aW9uIGlzIGluc2lkZSB0aGUgZWxlbWVudCdzIGJvdW5kaW5nIHJlY3QgZnJvbSB0aGUg d2ViIHByb2Nlc3MKKyAgICAgICAgdG8gdGhlIFVJIHByb2Nlc3MuIFRoaXMgcmVsb2NhdGVzIHRo ZSBsb2dpYyB0byBkZXRlcm1pbmUgd2hldGhlciB0aGUgc2VsZWN0aW9uIHJlY3Qgc2hvdWxkIGJl IGEgMSBieSAxIGZhbGxiYWNrCisgICAgICAgIGludGVyYWN0aW9uIHJlY3Qgb3IgdGhlIHplcm8g cmVjdCAoYHt7IDAsIDAgfSwgeyAwLCAwIH19YCkgY2xvc2VyIHRvIHRoZSBjb2RlIHRoYXQgYWN0 dWFsbHkgdXNlcyB0aGlzIHJlY3QuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6Z2V0Rm9j dXNlZEVsZW1lbnRJbmZvcm1hdGlvbik6CisKIDIwMTktMDEtMDIgIFdlbnNvbiBIc2llaCAgPHdl bnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjIzOTQ0MSk6IFtp T1NdIFNlbGVjdGlvbiBVSSBzb21ldGltZXMgZG9lc24ndCBjaGFuZ2UgYWZ0ZXIgdGFwcGluZyAi c2VsZWN0IGFsbCIgaW4gdGhlIGNhbGxvdXQgYmFyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1NoYXJlZC9Gb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQvU2hh cmVkL0ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uY3BwCmluZGV4IDM4MGJiNDkxOGRhOGY0NGYy NTI3MmVmYzAxYjk5NDZjMzNiMDhjY2IuLjllZTgxNWY0MmQ2NGIwNjg4OTY5YjM4MzQxYWM0NDQ3 MDU4NWMxMjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0ZvY3VzZWRFbGVtZW50 SW5mb3JtYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0ZvY3VzZWRFbGVtZW50 SW5mb3JtYXRpb24uY3BwCkBAIC02NCw3ICs2NCw3IEBAIE9wdGlvbmFsPE9wdGlvbkl0ZW0+IE9w dGlvbkl0ZW06OmRlY29kZShJUEM6OkRlY29kZXImIGRlY29kZXIpCiB2b2lkIEZvY3VzZWRFbGVt ZW50SW5mb3JtYXRpb246OmVuY29kZShJUEM6OkVuY29kZXImIGVuY29kZXIpIGNvbnN0CiB7CiAg ICAgZW5jb2RlciA8PCBlbGVtZW50UmVjdDsKLSAgICBlbmNvZGVyIDw8IGVsZW1lbnRJbnRlcmFj dGlvbkxvY2F0aW9uOworICAgIGVuY29kZXIgPDwgbGFzdEludGVyYWN0aW9uTG9jYXRpb247CiAg ICAgZW5jb2RlciA8PCBtaW5pbXVtU2NhbGVGYWN0b3I7CiAgICAgZW5jb2RlciA8PCBtYXhpbXVt U2NhbGVGYWN0b3I7CiAgICAgZW5jb2RlciA8PCBtYXhpbXVtU2NhbGVGYWN0b3JJZ25vcmluZ0Fs d2F5c1NjYWxhYmxlOwpAQCAtMTEyLDcgKzExMiw3IEBAIGJvb2wgRm9jdXNlZEVsZW1lbnRJbmZv cm1hdGlvbjo6ZGVjb2RlKElQQzo6RGVjb2RlciYgZGVjb2RlciwgRm9jdXNlZEVsZW1lbnRJbmZv CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuZWxlbWVudFJlY3QpKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5lbGVtZW50SW50 ZXJhY3Rpb25Mb2NhdGlvbikpCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQubGFzdElu dGVyYWN0aW9uTG9jYXRpb24pKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBpZiAoIWRl Y29kZXIuZGVjb2RlKHJlc3VsdC5taW5pbXVtU2NhbGVGYWN0b3IpKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9TaGFyZWQvRm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5oIGIvU291cmNlL1dl YktpdC9TaGFyZWQvRm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5oCmluZGV4IDFhNWI0NjllMWNl MTg3YjQ1ZDRkMzYxNzg1YTc4N2QyZjFiNGQ4YzYuLjA1MzA3MDM2MWU1OWMzMDNkODNiYjY2NzBk MThhYzQzZGNjMTZjNWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0ZvY3VzZWRF bGVtZW50SW5mb3JtYXRpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Gb2N1c2VkRWxl bWVudEluZm9ybWF0aW9uLmgKQEAgLTk3LDcgKzk3LDcgQEAgdXNpbmcgRm9jdXNlZEVsZW1lbnRJ ZGVudGlmaWVyID0gdWludDY0X3Q7CiAKIHN0cnVjdCBGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9u IHsKICAgICBXZWJDb3JlOjpJbnRSZWN0IGVsZW1lbnRSZWN0OwotICAgIFdlYkNvcmU6OkludFBv aW50IGVsZW1lbnRJbnRlcmFjdGlvbkxvY2F0aW9uOworICAgIFdlYkNvcmU6OkludFBvaW50IGxh c3RJbnRlcmFjdGlvbkxvY2F0aW9uOwogICAgIGRvdWJsZSBtaW5pbXVtU2NhbGVGYWN0b3IgeyAt SU5GSU5JVFkgfTsKICAgICBkb3VibGUgbWF4aW11bVNjYWxlRmFjdG9yIHsgSU5GSU5JVFkgfTsK ICAgICBkb3VibGUgbWF4aW11bVNjYWxlRmFjdG9ySWdub3JpbmdBbHdheXNTY2FsYWJsZSB7IElO RklOSVRZIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250 ZW50Vmlld0ludGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29u dGVudFZpZXdJbnRlcmFjdGlvbi5tbQppbmRleCBjZGZlNWRiYTJlMzg3N2ExMTgzZjY5YjhmNGMx MDBhZWRhN2ZmOTMxLi5mNTE2MmIwMDU5MWQ0OTc3NzViNjc3OWY4YjBmYzU3N2FjOWVjOWM3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVy YWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 SW50ZXJhY3Rpb24ubW0KQEAgLTQzNjksNyArNDM2OSwxMCBAQCBzdGF0aWMgYm9vbCBzaG91bGRa b29tVG9SZXZlYWxTZWxlY3Rpb25SZWN0KFdlYktpdDo6SW5wdXRUeXBlIHR5cGUpCiAKIHN0YXRp YyBXZWJDb3JlOjpGbG9hdFJlY3QgcmVjdFRvUmV2ZWFsV2hlblpvb21pbmdUb0ZvY3VzZWRFbGVt ZW50KGNvbnN0IFdlYktpdDo6Rm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbiYgZWxlbWVudEluZm8s IGNvbnN0IFdlYktpdDo6RWRpdG9yU3RhdGUmIGVkaXRvclN0YXRlKQogewotICAgIFdlYkNvcmU6 OkludFJlY3QgZWxlbWVudEludGVyYWN0aW9uUmVjdChlbGVtZW50SW5mby5lbGVtZW50SW50ZXJh Y3Rpb25Mb2NhdGlvbiwgeyAxLCAxIH0pOworICAgIFdlYkNvcmU6OkludFJlY3QgZWxlbWVudElu dGVyYWN0aW9uUmVjdDsKKyAgICBpZiAoZWxlbWVudEluZm8uZWxlbWVudFJlY3QuY29udGFpbnMo ZWxlbWVudEluZm8ubGFzdEludGVyYWN0aW9uTG9jYXRpb24pKQorICAgICAgICBlbGVtZW50SW50 ZXJhY3Rpb25SZWN0ID0geyBlbGVtZW50SW5mby5sYXN0SW50ZXJhY3Rpb25Mb2NhdGlvbiwgeyAx LCAxIH0gfTsKKwogICAgIGlmICghc2hvdWxkWm9vbVRvUmV2ZWFsU2VsZWN0aW9uUmVjdChlbGVt ZW50SW5mby5lbGVtZW50VHlwZSkpCiAgICAgICAgIHJldHVybiBlbGVtZW50SW50ZXJhY3Rpb25S ZWN0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3Mv V2ViUGFnZUlPUy5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQ YWdlSU9TLm1tCmluZGV4IDkwNjU4MDU2Mzg5NzM3ZWY5Y2FhNWZmZDYxZThlZGFhZGY3OWNjZTku LmJiMWFjYWQ2Njk3MjRmY2I2Zjc3MmU3NzFlNzQ1YWViNDg2NGYzZDAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCkBAIC0yMzYy LDcgKzIzNjIsNyBAQCB2b2lkIFdlYlBhZ2U6OmdldEZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24o Rm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbiYgaW5mb3JtYXRpbwogewogICAgIGxheW91dElmTmVl ZGVkKCk7CiAKLSAgICBpbmZvcm1hdGlvbi5lbGVtZW50SW50ZXJhY3Rpb25Mb2NhdGlvbiA9IG1f bGFzdEludGVyYWN0aW9uTG9jYXRpb247CisgICAgaW5mb3JtYXRpb24ubGFzdEludGVyYWN0aW9u TG9jYXRpb24gPSBtX2xhc3RJbnRlcmFjdGlvbkxvY2F0aW9uOwogCiAgICAgaWYgKGF1dG8qIHJl bmRlcmVyID0gbV9mb2N1c2VkRWxlbWVudC0+cmVuZGVyZXIoKSkgewogICAgICAgICBhdXRvJiBl bGVtZW50RnJhbWUgPSBtX3BhZ2UtPmZvY3VzQ29udHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFt ZSgpOwpAQCAtMjM4MSwxMyArMjM4MSw2IEBAIHZvaWQgV2ViUGFnZTo6Z2V0Rm9jdXNlZEVsZW1l bnRJbmZvcm1hdGlvbihGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uJiBpbmZvcm1hdGlvCiAgICAg ICAgICAgICBmcmFtZVZpZXctPnNldEN1c3RvbUZpeGVkUG9zaXRpb25MYXlvdXRSZWN0KGZyYW1l Vmlldy0+cmVuZGVyVmlldygpLT5kb2N1bWVudFJlY3QoKSk7CiAgICAgICAgICAgICBpbmZvcm1h dGlvbi5lbGVtZW50UmVjdCA9IGZyYW1lVmlldy0+Y29udGVudHNUb1Jvb3RWaWV3KHJlbmRlcmVy LT5hYnNvbHV0ZUJvdW5kaW5nQm94UmVjdCgpKTsKICAgICAgICAgICAgIGZyYW1lVmlldy0+c2V0 Q3VzdG9tRml4ZWRQb3NpdGlvbkxheW91dFJlY3QoY3VycmVudEZpeGVkUG9zaXRpb25SZWN0KTsK LSAgICAgICAgICAgIAotICAgICAgICAgICAgaWYgKCFpbmZvcm1hdGlvbi5lbGVtZW50UmVjdC5j b250YWlucyhtX2xhc3RJbnRlcmFjdGlvbkxvY2F0aW9uKSkKLSAgICAgICAgICAgICAgICBpbmZv cm1hdGlvbi5lbGVtZW50SW50ZXJhY3Rpb25Mb2NhdGlvbiA9IGluZm9ybWF0aW9uLmVsZW1lbnRS ZWN0LmxvY2F0aW9uKCk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAvLyBEb24ndCB1 c2UgdGhlIHNlbGVjdGlvbiByZWN0IGlmIGludGVyYWN0aW9uIHdhcyBvdXRzaWRlIHRoZSBlbGVt ZW50IHJlY3QuCi0gICAgICAgICAgICBpZiAoIWluZm9ybWF0aW9uLmVsZW1lbnRSZWN0LmNvbnRh aW5zKG1fbGFzdEludGVyYWN0aW9uTG9jYXRpb24pKQotICAgICAgICAgICAgICAgIGluZm9ybWF0 aW9uLmVsZW1lbnRJbnRlcmFjdGlvbkxvY2F0aW9uID0geyB9OwogICAgICAgICB9CiAgICAgfSBl bHNlCiAgICAgICAgIGluZm9ybWF0aW9uLmVsZW1lbnRSZWN0ID0gSW50UmVjdCgpOwpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4 IDFmMzZlYmY4NTc2MTU5ZjJiNTYwNzZkNTE4MGQ1Y2VlNjJiZDU5MmMuLjNjN2RiMjAwNzVkNDcx MWE4OGYyYzM1ZGJiNGUwNjg4ZDkyNTMxYzQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxOS0w MS0wMiAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KKworICAgICAgICBb aU9TXSBSRUdSRVNTSU9OIChyMjM5NDQxKTogVGFiIGN5Y2xpbmcgdG8gb2Zmc2NyZWVuIDxzZWxl Y3Q+IG1heSBub3Qgc2Nyb2xsIGl0IGludG8gdmlldworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzMDg0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80 NzAwNjg4Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgYSBsYXlvdXQgdGVzdCB0byB2ZXJpZnkgdGhhdCBmb2N1c2luZyBhIHNlbGVjdCBlbGVt ZW50IGJ5IHRhcHBpbmcgb3V0c2lkZSBvZiBpdCBzY3JvbGxzIHRvIHJldmVhbCB0aGUKKyAgICAg ICAgZm9jdXNlZCBzZWxlY3QgZWxlbWVudC4KKworICAgICAgICAqIGZhc3QvZm9ybXMvaW9zL3Nj cm9sbC10by1yZXZlYWwtZm9jdXNlZC1zZWxlY3QtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAg ICAgKiBmYXN0L2Zvcm1zL2lvcy9zY3JvbGwtdG8tcmV2ZWFsLWZvY3VzZWQtc2VsZWN0Lmh0bWw6 IEFkZGVkLgorCiAyMDE5LTAxLTAyICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUu Y29tPgogCiAgICAgICAgIFN1cHBvcnQgY3NzLWNvbG9yLTQgcmdiIGZ1bmN0aW9ucwpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9pb3Mvc2Nyb2xsLXRvLXJldmVhbC1mb2N1c2Vk LXNlbGVjdC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL2lvcy9zY3JvbGwt dG8tcmV2ZWFsLWZvY3VzZWQtc2VsZWN0LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi45ZDI2NzFi NjQ3OTdjNDA2YjczMjVjMDJkMGE3NDk5NWVhY2Q1MjA4Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvZmFzdC9mb3Jtcy9pb3Mvc2Nyb2xsLXRvLXJldmVhbC1mb2N1c2VkLXNlbGVjdC1l eHBlY3RlZC50eHQKQEAgLTAsMCArMSwxMSBAQAorCitWZXJpZmllcyB0aGF0IGZvY3VzaW5nIGEg c2VsZWN0IGVsZW1lbnQgYWZ0ZXIgdXNlciBpbnRlcmFjdGlvbiBzY3JvbGxzIHRvIHJldmVhbCB0 aGUgc2VsZWN0IGVsZW1lbnQuIFRvIG1hbnVhbGx5IHRlc3QsIGZvY3VzIHRoZSB0b3Agc2VsZWN0 IGVsZW1lbnQgYW5kIHRhcCB0aGUgcmVkIGJveCB0byBmb2N1cyB0aGUgYm90dG9tIHNlbGVjdCBl bGVtZW50LiBUaGUgYm90dG9tIHNlbGVjdCBlbGVtZW50IHNob3VsZCBiZSBzY3JvbGxlZCBpbnRv IHZpZXcuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVz c2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworUEFTUyBkb2N1bWVudC5hY3Rp dmVFbGVtZW50IGlzIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdib3R0b20nKQorUEFTUyBwYWdl WU9mZnNldCBpcyA+PSAxMDAwCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RF U1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9pb3Mvc2Ny b2xsLXRvLXJldmVhbC1mb2N1c2VkLXNlbGVjdC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jt cy9pb3Mvc2Nyb2xsLXRvLXJldmVhbC1mb2N1c2VkLXNlbGVjdC5odG1sCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjE4 NDc1ODBiMTAyNzFkZWE4MzIzNGU5OWVhMDg2YmFhZDhiY2U4YjYKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL2lvcy9zY3JvbGwtdG8tcmV2ZWFsLWZvY3VzZWQtc2Vs ZWN0Lmh0bWwKQEAgLTAsMCArMSw3OSBAQAorPCFET0NUWVBFIGh0bWw+IDwhLS0gd2Via2l0LXRl c3QtcnVubmVyIFsgdXNlRmxleGlibGVWaWV3cG9ydD10cnVlIF0gLS0+CisKKzxodG1sPgorPG1l dGEgbmFtZT0idmlld3BvcnQiIGNvbnRlbnQ9IndpZHRoPWRldmljZS13aWR0aCwgaW5pdGlhbC1z Y2FsZT0xLCB1c2VyLXNjYWxhYmxlPW5vIj4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4u L3Jlc291cmNlcy91aS1oZWxwZXIuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4u L3Jlc291cmNlcy9qcy10ZXN0LmpzIj48L3NjcmlwdD4KKzxzdHlsZT4KK3NlbGVjdCB7CisgICAg d2lkdGg6IDEwMCU7CisgICAgaGVpZ2h0OiA4MHB4OworfQorCisjYm90dG9tIHsKKyAgICBtYXJn aW4tdG9wOiAxMzAwcHg7Cit9CisKKyN0YXBUb0ZvY3VzIHsKKyAgICB3aWR0aDogMTAwJTsKKyAg ICBoZWlnaHQ6IDgwcHg7CisgICAgYmFja2dyb3VuZDogdG9tYXRvOworICAgIGJvcmRlci1yYWRp dXM6IDIwcHg7CisgICAgY29sb3I6IHdoaXRlOworICAgIGZvbnQtc2l6ZTogMmVtOworICAgIHRl eHQtYWxpZ246IGNlbnRlcjsKKyAgICBjdXJzb3I6IHBvaW50ZXI7Cit9Cis8L3N0eWxlPgorPHNj cmlwdD4KK2pzVGVzdElzQXN5bmMgPSB0cnVlOworCithc3luYyBmdW5jdGlvbiB0YXBBdExvY2F0 aW9uQW5kV2FpdEZvclNjcm9sbGluZ1RvRW5kKHgsIHkpCit7CisgICAgY29uc3QgdWlTY3JpcHQg PSBgCisgICAgbGV0IGRvbmVDb3VudCA9IDA7CisgICAgZnVuY3Rpb24gY2hlY2tEb25lKCkgewor ICAgICAgICBpZiAoKytkb25lQ291bnQgPT0gMikKKyAgICAgICAgICAgIHVpQ29udHJvbGxlci51 aVNjcmlwdENvbXBsZXRlKCk7CisgICAgfQorICAgIHVpQ29udHJvbGxlci5kaWRFbmRab29taW5n Q2FsbGJhY2sgPSBjaGVja0RvbmU7CisgICAgdWlDb250cm9sbGVyLnNpbmdsZVRhcEF0UG9pbnQo JHt4fSwgJHt5fSwgY2hlY2tEb25lKTtgOworICAgIHJldHVybiBuZXcgUHJvbWlzZShyZXNvbHZl ID0+IHRlc3RSdW5uZXIucnVuVUlTY3JpcHQodWlTY3JpcHQsIHJlc29sdmUpKTsKK30KKworYXN5 bmMgZnVuY3Rpb24gcnVuKCkKK3sKKyAgICBkZXNjcmlwdGlvbigiVmVyaWZpZXMgdGhhdCBmb2N1 c2luZyBhIHNlbGVjdCBlbGVtZW50IGFmdGVyIHVzZXIgaW50ZXJhY3Rpb24gc2Nyb2xscyB0byBy ZXZlYWwgdGhlIHNlbGVjdCBlbGVtZW50LiAiCisgICAgICAgICsgIlRvIG1hbnVhbGx5IHRlc3Qs IGZvY3VzIHRoZSB0b3Agc2VsZWN0IGVsZW1lbnQgYW5kIHRhcCB0aGUgcmVkIGJveCB0byBmb2N1 cyB0aGUgYm90dG9tIHNlbGVjdCBlbGVtZW50LiBUaGUgIgorICAgICAgICArICJib3R0b20gc2Vs ZWN0IGVsZW1lbnQgc2hvdWxkIGJlIHNjcm9sbGVkIGludG8gdmlldy4iKTsKKworICAgIGlmICgh d2luZG93LnRlc3RSdW5uZXIpCisgICAgICAgIHJldHVybjsKKworICAgIGF3YWl0IFVJSGVscGVy LmFjdGl2YXRlQW5kV2FpdEZvcklucHV0U2Vzc2lvbkF0KDE2MCwgNDApOworICAgIGF3YWl0IHRh cEF0TG9jYXRpb25BbmRXYWl0Rm9yU2Nyb2xsaW5nVG9FbmQoMTYwLCAxMjApOworCisgICAgc2hv dWxkQmUoImRvY3VtZW50LmFjdGl2ZUVsZW1lbnQiLCAiZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo J2JvdHRvbScpIik7CisgICAgc2hvdWxkQmVHcmVhdGVyVGhhbk9yRXF1YWwoInBhZ2VZT2Zmc2V0 IiwgIjEwMDAiKTsKKworICAgIGRvY3VtZW50LmFjdGl2ZUVsZW1lbnQuYmx1cigpOworICAgIGF3 YWl0IFVJSGVscGVyLndhaXRGb3JLZXlib2FyZFRvSGlkZSgpOworICAgIHRhcFRvRm9jdXMucmVt b3ZlKCk7CisgICAgZmluaXNoSlNUZXN0KCk7Cit9Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5 IG9ubG9hZD1ydW4oKT4KKyAgICA8ZGl2PgorICAgICAgICA8c2VsZWN0IGlkPSJ0b3AiPjxvcHRp b24gc2VsZWN0ZWQ+Rmlyc3Q8L29wdGlvbj48b3B0aW9uPlNlY29uZDwvb3B0aW9uPjwvc2VsZWN0 PgorICAgIDwvZGl2PgorICAgIDxkaXYgaWQ9InRhcFRvRm9jdXMiIG9uY2xpY2s9ImJvdHRvbS5m b2N1cygpIj5UYXAgdG8gZm9jdXMgdGhlPGJyPmJvdHRvbSBzZWxlY3Q8L2Rpdj4KKyAgICA8ZGl2 IGlkPSJkZXNjcmlwdGlvbiI+PC9kaXY+CisgICAgPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+Cisg ICAgPHNlbGVjdCBpZD0iYm90dG9tIj4KKyAgICAgICAgPG9wdGlvbiBzZWxlY3RlZD5UaGlyZDwv b3B0aW9uPgorICAgICAgICA8b3B0aW9uPkZvdXJ0aDwvb3B0aW9uPgorICAgIDwvc2VsZWN0Pgor PC9ib2R5PgorPC9odG1sPgo=