196264 2019-03-26 11:48:02 -0700 [iOS][WK2] Use a better concept to describe the reason we defer zooming a focused element: selectabiltiy 2019-03-26 21:16:26 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Local Build iPhone / iPad iOS 12 RESOLVED FIXED InRadar P2 Normal --- 1 dbates dbates megan_gardner webkit-bug-importer wenson_hsieh oldest_to_newest 1521376 0 dbates 2019-03-26 11:48:02 -0700 In iOS WebKit2 we have made a "thing" (or concept) out of deferred zooming of focused elements. We wrapped up this concept into a helper function called shouldDeferZoomingToSelectionWhenRevealingFocusedElement() that tells us whether we should defer zooming or not. The problem is that this seems like an indirect way to describe the actual concept the UI process is talking about: text/element selectability – whether the focused element has selectable text (like a text field). I think this is the concept we are trying to describe. The deferment of zooming is a side effect of an implementation detail that zooming of selectable elements reveals the selection and we may not have an up-to-date selection rect to reveal sometimes. When we don't have an up-to-date selection rect then we need to defer zooming until we do. 1521382 1 365982 dbates 2019-03-26 12:01:24 -0700 Created attachment 365982 Patch 1521383 2 365982 dbates 2019-03-26 12:04:08 -0700 Comment on attachment 365982 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=365982&action=review > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:4825 > + case WebKit::InputType::DateTime: Note that this is a new case. Old code didn't consider DataTime, but we should. It acts like a text field (or at least does on the Mac). > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:4835 > + case WebKit::InputType::Week: Note that this is a new case. Old code didn't consider Week, but we should. It acts like a text field (or at least does on the Mac). This type appears to behave weirdly on iOS currently. We need to fix bug #158327. 1521385 3 365982 dbates 2019-03-26 12:09:05 -0700 Comment on attachment 365982 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=365982&action=review > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:4808 > +static bool mayBeSelectable(WebKit::InputType type) Wenson wants something more precise, mayContainSelectableText. 1521386 4 365982 wenson_hsieh 2019-03-26 12:13:12 -0700 Comment on attachment 365982 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=365982&action=review > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:4808 > +static bool mayBeSelectable(WebKit::InputType type) Nit - mayContainSelectableText? >> Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:4835 >> + case WebKit::InputType::Week: > > Note that this is a new case. Old code didn't consider Week, but we should. It acts like a text field (or at least does on the Mac). This type appears to behave weirdly on iOS currently. We need to fix bug #158327. Nit - maybe leave a FIXME referencing the bug number (158327) here/ 1521468 5 dbates 2019-03-26 15:03:53 -0700 (In reply to Wenson Hsieh from comment #4) > >> Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:4835 > >> + case WebKit::InputType::Week: > > > > Note that this is a new case. Old code didn't consider Week, but we should. It acts like a text field (or at least does on the Mac). This type appears to behave weirdly on iOS currently. We need to fix bug #158327. > > Nit - maybe leave a FIXME referencing the bug number (158327) here/ I am not going to do this because it does not make sense to me to do this. This was just a remark to the reader, you, of this patch to point out that the existing code did not handle <input type="week"> – that in and of itself was a bug in the old code. I mentioned bug #158327 because it turns out (coincidentally?) that there are more bugs around <input type="week"> on iOS. So, the omission of WebKit::InputType::Week turns out not to be the thing that broke the <input type="week">, but it still wasn't correct. 1521472 6 366010 dbates 2019-03-26 15:07:14 -0700 Created attachment 366010 To Land 1521473 7 366010 dbates 2019-03-26 15:08:55 -0700 Comment on attachment 366010 To Land Clearing flags on attachment: 366010 Committed r243520: <https://trac.webkit.org/changeset/243520> 1521474 8 dbates 2019-03-26 15:08:57 -0700 All reviewed patches have been landed. Closing bug. 1521479 9 webkit-bug-importer 2019-03-26 15:11:48 -0700 <rdar://problem/49294878> 365982 2019-03-26 12:01:24 -0700 2019-03-26 15:07:13 -0700 Patch bug-196264-20190326120124.patch text/plain 6654 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzNDQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDM0ZDVhM2ZmMjE2NTJiYjBj ZTA0OWNiMjkxZTZhNWY5MTRkZGRjMDcuLjY3ZjcyOWIyYTU2NWEwYjU3MzEwY2EwYmEyMTU5ZTU4 ZDg0M2E3MTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTktMDMtMjYgIERhbmllbCBC YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW1dLMl0gVXNlIGEgYmV0 dGVyIGNvbmNlcHQgdG8gZGVzY3JpYmUgdGhlIHJlYXNvbiB3ZSBkZWZlciB6b29taW5nIGEgZm9j dXNlZCBlbGVtZW50OiBzZWxlY3RhYmlsdGl5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xOTYyNjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBSZW5hbWUgc2hvdWxkRGVmZXJab29taW5nVG9TZWxlY3Rpb25X aGVuUmV2ZWFsaW5nRm9jdXNlZEVsZW1lbnQoKSB0byBtYXlCZVNlbGVjdGFibGUoKSB0byBkZXNj cmliZSB0aGUgY3JpdGVyaW9uCisgICAgICAgIHRoYXQgd2Ugd2lsbCB1c2UgdG8gZGVjaWRlIHdo ZXRoZXIgdG8gZGVmZXIgem9vbWluZyBvciBub3QuIFdlIGRlZmVyIHpvb21pbmcgb25seSBmb3Ig ZWxlbWVudHMgdGhhdCBtYXkKKyAgICAgICAgc3VwcG9ydCB0ZXh0IHNlbGVjdGlvbiBvbiBpbml0 aWFsIGZvY3VzIGJlY2F1c2Ugd2UgZG8gbm90IGhhdmUgYW4gdXAtdG8tZGF0ZSBzZWxlY3Rpb24g cmVjdCBhdCB0aGF0IHRpbWUuCisgICAgICAgIEZvciBlbGVtZW50LCBsaWtlIDxzZWxlY3Q+LCB0 aGF0IGRvIG5vdCBzdXBwb3J0IHRleHQgc2VsZWN0aW9uLCB3ZSBjYW4gem9vbSB0byBmb2N1cyB0 aGVtIGltbWVkaWF0ZWx5CisgICAgICAgIHdoZW4gZm9jdXNlZC4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAobWF5QmVTZWxl Y3RhYmxlKTogUmVuYW1lZCBmcm9tIHNob3VsZERlZmVyWm9vbWluZ1RvU2VsZWN0aW9uV2hlblJl dmVhbGluZ0ZvY3VzZWRFbGVtZW50LgorICAgICAgICBMaXN0IGFsbCB0aGUgaW5wdXQgdHlwZXMg aW4gdGhlIHN3aXRjaCBibG9jayBhbmQgcmVtb3ZlIHRoZSBkZWZhdWx0IGNhc2UgdG8gZm9yY2Ug dGhlIGNvbXBpbGVyIHRvIGNoZWNrIHRoYXQgd2UKKyAgICAgICAgY292ZXJlZCBhbGwgY2FzZXMu IFRoaXMgd2lsbCBwcmV2ZW50IHVuZm9yc2VlbiBrZXlib2FyZCBpc3N1ZXMgKHdoeSBpc24ndCB0 aGUga2V5Ym9hcmQgc2hvd24/IG9yIHdoeSBpcyB0aGUga2V5Ym9hcmQgc2hvd24/KQorICAgICAg ICBmb3IgZnV0dXJlIGlucHV0IHR5cGVzIHRoYXQgd2UgbWF5IGFkZC4KKyAgICAgICAgKHJlY3RU b1JldmVhbFdoZW5ab29taW5nVG9Gb2N1c2VkRWxlbWVudCk6IFVwZGF0ZSBmb3IgcmVuYW1pbmcu CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2VsZW1lbnREaWRGb2N1czp1c2VySXNJbnRlcmFj dGluZzpibHVyUHJldmlvdXNOb2RlOmNoYW5naW5nQWN0aXZpdHlTdGF0ZTp1c2VyT2JqZWN0Ol0p OiBBZGQgYQorICAgICAgICBjb21tZW50IHRvIGV4cGxhaW4gd2h5IHdlIG1heSBuZWVkIHRvIGRl ZmVyIHRoZSB6b29tOiB0aGUgZm9jdXNlZCBlbGVtZW50IHN1cHBvcnRzIHRleHQgc2VsZWN0aW9u IGFuZCB3ZSBuZWVkCisgICAgICAgIHRvIHdhaXQgZm9yIHRoZSB3ZWIgcHJvY2VzcyB0byBjYWxs IGJhY2sgdG8gcHJvdmlkZSBhbiB1cC10by1kYXRlIHNlbGVjdGlvbiByZWN0IGZvciB1cyB0byB6 b29tIGFuZCByZXZlYWwuCisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2RpZFJlY2VpdmVFZGl0 b3JTdGF0ZVVwZGF0ZUFmdGVyRm9jdXNdKTogVXBkYXRlIGZvciByZW5hbWluZy4KKyAgICAgICAg KHNob3VsZERlZmVyWm9vbWluZ1RvU2VsZWN0aW9uV2hlblJldmVhbGluZ0ZvY3VzZWRFbGVtZW50 KTogRGVsZXRlZC4KKwogMjAxOS0wMy0yNSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29t PgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHRpbnkgZml4IGFmdGVyIHIyNDMzODggdG8gYWRkcmVz cyBBUEkgdGVzdCBmYWlsdXJlcyBvbiBpT1MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IGMwYjgxZjM5MzJj NDFmMTAyZGU5NmI4ZGFlM2I4M2RkNTExZmZhZTIuLjBjNjhlNjhmZmMxOWI1NTA3M2VhNDBkOGZi ZWU3ZDkxNTJlNWM1ZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9X S0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv aW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAtNDgwNCwyMiArNDgwNCwzNiBAQCAt IChWZWN0b3I8V2ViS2l0OjpPcHRpb25JdGVtPiYpZm9jdXNlZFNlbGVjdEVsZW1lbnRPcHRpb25z CiAgICAgcmV0dXJuIF9mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLnNlbGVjdE9wdGlvbnM7CiB9 CiAKLXN0YXRpYyBib29sIHNob3VsZERlZmVyWm9vbWluZ1RvU2VsZWN0aW9uV2hlblJldmVhbGlu Z0ZvY3VzZWRFbGVtZW50KFdlYktpdDo6SW5wdXRUeXBlIHR5cGUpCisvLyBOb3RlIHRoYXQgc2Vs ZWN0YWJpbGl0eSBpcyBhbHNvIGFmZmVjdGVkIGJ5IHRoZSBDU1MgcHJvcGVydHkgdXNlci1zZWxl Y3QuCitzdGF0aWMgYm9vbCBtYXlCZVNlbGVjdGFibGUoV2ViS2l0OjpJbnB1dFR5cGUgdHlwZSkK IHsKICAgICBzd2l0Y2ggKHR5cGUpIHsKKyAgICBjYXNlIFdlYktpdDo6SW5wdXRUeXBlOjpOb25l OgorICAgIC8vIFRoZSBmb2xsb3dpbmcgdHlwZXMgaGF2ZSBjdXN0b20gVUkgYW5kIGRvIG5vdCBs b29rIG9yIGJlaGF2ZSBsaWtlIGEgdGV4dCBmaWVsZC4KKyNpZiBFTkFCTEUoSU5QVVRfVFlQRV9D T0xPUikKKyAgICBjYXNlIFdlYktpdDo6SW5wdXRUeXBlOjpDb2xvcjoKKyNlbmRpZgorICAgIGNh c2UgV2ViS2l0OjpJbnB1dFR5cGU6OkRhdGU6CisgICAgY2FzZSBXZWJLaXQ6OklucHV0VHlwZTo6 RGF0ZVRpbWVMb2NhbDoKKyAgICBjYXNlIFdlYktpdDo6SW5wdXRUeXBlOjpEcmF3aW5nOgorICAg IGNhc2UgV2ViS2l0OjpJbnB1dFR5cGU6Ok1vbnRoOgorICAgIGNhc2UgV2ViS2l0OjpJbnB1dFR5 cGU6OlNlbGVjdDoKKyAgICBjYXNlIFdlYktpdDo6SW5wdXRUeXBlOjpUaW1lOgorICAgICAgICBy ZXR1cm4gZmFsc2U7CisgICAgLy8gVGhlIGZvbGxvd2luZyB0eXBlcyBsb29rIGFuZCBiZWhhdmUg bGlrZSBhIHRleHQgZmllbGQuCiAgICAgY2FzZSBXZWJLaXQ6OklucHV0VHlwZTo6Q29udGVudEVk aXRhYmxlOgotICAgIGNhc2UgV2ViS2l0OjpJbnB1dFR5cGU6OlRleHQ6Ci0gICAgY2FzZSBXZWJL aXQ6OklucHV0VHlwZTo6UGFzc3dvcmQ6Ci0gICAgY2FzZSBXZWJLaXQ6OklucHV0VHlwZTo6VGV4 dEFyZWE6Ci0gICAgY2FzZSBXZWJLaXQ6OklucHV0VHlwZTo6U2VhcmNoOgorICAgIGNhc2UgV2Vi S2l0OjpJbnB1dFR5cGU6OkRhdGVUaW1lOgogICAgIGNhc2UgV2ViS2l0OjpJbnB1dFR5cGU6OkVt YWlsOgotICAgIGNhc2UgV2ViS2l0OjpJbnB1dFR5cGU6OlVSTDoKLSAgICBjYXNlIFdlYktpdDo6 SW5wdXRUeXBlOjpQaG9uZToKICAgICBjYXNlIFdlYktpdDo6SW5wdXRUeXBlOjpOdW1iZXI6CiAg ICAgY2FzZSBXZWJLaXQ6OklucHV0VHlwZTo6TnVtYmVyUGFkOgorICAgIGNhc2UgV2ViS2l0OjpJ bnB1dFR5cGU6OlBhc3N3b3JkOgorICAgIGNhc2UgV2ViS2l0OjpJbnB1dFR5cGU6OlBob25lOgor ICAgIGNhc2UgV2ViS2l0OjpJbnB1dFR5cGU6OlNlYXJjaDoKKyAgICBjYXNlIFdlYktpdDo6SW5w dXRUeXBlOjpUZXh0OgorICAgIGNhc2UgV2ViS2l0OjpJbnB1dFR5cGU6OlRleHRBcmVhOgorICAg IGNhc2UgV2ViS2l0OjpJbnB1dFR5cGU6OlVSTDoKKyAgICBjYXNlIFdlYktpdDo6SW5wdXRUeXBl OjpXZWVrOgogICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICBkZWZhdWx0OgotICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgfQogfQogCkBAIC00ODI5LDcgKzQ4NDMsNyBAQCBzdGF0aWMgV2ViQ29y ZTo6RmxvYXRSZWN0IHJlY3RUb1JldmVhbFdoZW5ab29taW5nVG9Gb2N1c2VkRWxlbWVudChjb25z dCBXZWJLaXQ6OgogICAgIGlmIChlbGVtZW50SW5mby5lbGVtZW50UmVjdC5jb250YWlucyhlbGVt ZW50SW5mby5sYXN0SW50ZXJhY3Rpb25Mb2NhdGlvbikpCiAgICAgICAgIGVsZW1lbnRJbnRlcmFj dGlvblJlY3QgPSB7IGVsZW1lbnRJbmZvLmxhc3RJbnRlcmFjdGlvbkxvY2F0aW9uLCB7IDEsIDEg fSB9OwogCi0gICAgaWYgKCFzaG91bGREZWZlclpvb21pbmdUb1NlbGVjdGlvbldoZW5SZXZlYWxp bmdGb2N1c2VkRWxlbWVudChlbGVtZW50SW5mby5lbGVtZW50VHlwZSkpCisgICAgaWYgKCFtYXlC ZVNlbGVjdGFibGUoZWxlbWVudEluZm8uZWxlbWVudFR5cGUpKQogICAgICAgICByZXR1cm4gZWxl bWVudEludGVyYWN0aW9uUmVjdDsKIAogICAgIGlmIChlZGl0b3JTdGF0ZS5pc01pc3NpbmdQb3N0 TGF5b3V0RGF0YSkgewpAQCAtNDk2NSwyOCArNDk3OSwxOSBAQCAtICh2b2lkKV9lbGVtZW50RGlk Rm9jdXM6KGNvbnN0IFdlYktpdDo6Rm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbiYpaW5mb3JtYXRp b24gdQogI2Vsc2UKICAgICBbc2VsZiByZWxvYWRJbnB1dFZpZXdzXTsKICNlbmRpZgotICAgIAot ICAgIHN3aXRjaCAoaW5mb3JtYXRpb24uZWxlbWVudFR5cGUpIHsKLSAgICBjYXNlIFdlYktpdDo6 SW5wdXRUeXBlOjpTZWxlY3Q6Ci0gICAgY2FzZSBXZWJLaXQ6OklucHV0VHlwZTo6RGF0ZVRpbWVM b2NhbDoKLSAgICBjYXNlIFdlYktpdDo6SW5wdXRUeXBlOjpUaW1lOgotICAgIGNhc2UgV2ViS2l0 OjpJbnB1dFR5cGU6Ok1vbnRoOgotICAgIGNhc2UgV2ViS2l0OjpJbnB1dFR5cGU6OkRhdGU6Ci0g ICAgY2FzZSBXZWJLaXQ6OklucHV0VHlwZTo6RHJhd2luZzoKLSNpZiBFTkFCTEUoSU5QVVRfVFlQ RV9DT0xPUikKLSAgICBjYXNlIFdlYktpdDo6SW5wdXRUeXBlOjpDb2xvcjoKLSNlbmRpZgotICAg ICAgICBicmVhazsKLSAgICBkZWZhdWx0OgorCisgICAgaWYgKG1heUJlU2VsZWN0YWJsZShfZm9j dXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5lbGVtZW50VHlwZSkpCiAgICAgICAgIFtzZWxmIF9zaG93 S2V5Ym9hcmRdOwotICAgICAgICBicmVhazsKLSAgICB9Ci0gICAgCisKICAgICAvLyBUaGUgY3Vz dG9tIGZpeGVkIHBvc2l0aW9uIHJlY3QgYmVoYXZpb3IgaXMgYWZmZWN0ZWQgYnkgLWlzRm9jdXNp bmdFbGVtZW50LCBzbyBpZiB0aGF0IGNoYW5nZXMgd2UgbmVlZCB0byByZWNvbXB1dGUgcmVjdHMu CiAgICAgaWYgKGVkaXRhYmxlQ2hhbmdlZCkKICAgICAgICAgW193ZWJWaWV3IF9zY2hlZHVsZVZp c2libGVDb250ZW50UmVjdFVwZGF0ZV07Ci0gICAgCi0gICAgaWYgKCFzaG91bGREZWZlclpvb21p bmdUb1NlbGVjdGlvbldoZW5SZXZlYWxpbmdGb2N1c2VkRWxlbWVudChfZm9jdXNlZEVsZW1lbnRJ bmZvcm1hdGlvbi5lbGVtZW50VHlwZSkpCisKKyAgICAvLyBGb3IgZWxlbWVudHMgdGhhdCBoYXZl IHNlbGVjdGFibGUgY29udGVudCAoZS5nLiB0ZXh0IGZpZWxkKSB3ZSBuZWVkIHRvIHdhaXQgZm9y IHRoZSB3ZWIgcHJvY2VzcyB0byBzZW5kIGFuIHVwLXRvLWRhdGUKKyAgICAvLyBzZWxlY3Rpb24g cmVjdCBiZWZvcmUgd2UgY2FuIHpvb20gYW5kIHJldmVhbCB0aGUgc2VsZWN0aW9uLiBOb24tc2Vs ZWN0YWJsZSBlbGVtZW50cyAoZS5nLiA8c2VsZWN0PikgY2FuIGJlIHpvb21lZAorICAgIC8vIGlt bWVkaWF0ZWx5IGJlY2F1c2UgdGhleSBoYXZlIG5vIHNlbGVjdGlvbiB0byByZXZlYWwuCisgICAg Qk9PTCBuZWVkc0VkaXRvclN0YXRlVXBkYXRlID0gbWF5QmVTZWxlY3RhYmxlKF9mb2N1c2VkRWxl bWVudEluZm9ybWF0aW9uLmVsZW1lbnRUeXBlKTsKKyAgICBpZiAoIW5lZWRzRWRpdG9yU3RhdGVV cGRhdGUpCiAgICAgICAgIFtzZWxmIF96b29tVG9SZXZlYWxGb2N1c2VkRWxlbWVudF07CiAKICAg ICBbc2VsZiBfdXBkYXRlQWNjZXNzb3J5XTsKQEAgLTUxMzgsNyArNTE0Myw3IEBAIC0gKHZvaWQp X2RpZFJlY2VpdmVFZGl0b3JTdGF0ZVVwZGF0ZUFmdGVyRm9jdXMKIAogICAgIC8vIEZJWE1FOiBJ ZiB0aGUgaW5pdGlhbCB3cml0aW5nIGRpcmVjdGlvbiBqdXN0IGNoYW5nZWQsIHdlIHNob3VsZCB3 YWl0IHVudGlsIHdlIGdldCB0aGUgbmV4dCBwb3N0LWxheW91dCBlZGl0b3Igc3RhdGUKICAgICAv LyBiZWZvcmUgem9vbWluZyB0byByZXZlYWwgdGhlIHNlbGVjdGlvbiByZWN0LgotICAgIGlmIChz aG91bGREZWZlclpvb21pbmdUb1NlbGVjdGlvbldoZW5SZXZlYWxpbmdGb2N1c2VkRWxlbWVudChf Zm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5lbGVtZW50VHlwZSkpCisgICAgaWYgKG1heUJlU2Vs ZWN0YWJsZShfZm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5lbGVtZW50VHlwZSkpCiAgICAgICAg IFtzZWxmIF96b29tVG9SZXZlYWxGb2N1c2VkRWxlbWVudF07CiB9CiAK 366010 2019-03-26 15:07:14 -0700 2019-03-26 15:07:14 -0700 To Land bug-196264-20190326150713.patch text/plain 6697 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzNDQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDM0ZDVhM2ZmMjE2NTJiYjBj ZTA0OWNiMjkxZTZhNWY5MTRkZGRjMDcuLjczOTYyZjFkM2JlYTQ1MTM2YzdkYmI3Nzk3OWUwY2Iy ZDYxMTMyMzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTktMDMtMjYgIERhbmllbCBC YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW1dLMl0gVXNlIGEgYmV0 dGVyIGNvbmNlcHQgdG8gZGVzY3JpYmUgdGhlIHJlYXNvbiB3ZSBkZWZlciB6b29taW5nIGEgZm9j dXNlZCBlbGVtZW50OiBzZWxlY3RhYmlsdGl5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xOTYyNjQKKworICAgICAgICBSZXZpZXdlZCBieSBXZW5zb24g SHNpZWguCisKKyAgICAgICAgUmVuYW1lIHNob3VsZERlZmVyWm9vbWluZ1RvU2VsZWN0aW9uV2hl blJldmVhbGluZ0ZvY3VzZWRFbGVtZW50KCkgdG8gbWF5Q29udGFpblNlbGVjdGFibGVUZXh0KCkg dG8gZGVzY3JpYmUKKyAgICAgICAgdGhlIGNyaXRlcmlvbiB0aGF0IHdlIHdpbGwgdXNlIHRvIGRl Y2lkZSB3aGV0aGVyIHRvIGRlZmVyIHpvb21pbmcgb3Igbm90LiBXZSBkZWZlciB6b29taW5nIG9u bHkgZm9yIGVsZW1lbnRzCisgICAgICAgIHRoYXQgbWF5IHN1cHBvcnQgdGV4dCBzZWxlY3Rpb24g b24gaW5pdGlhbCBmb2N1cyBiZWNhdXNlIHdlIGRvIG5vdCBoYXZlIGFuIHVwLXRvLWRhdGUgc2Vs ZWN0aW9uIHJlY3QgYXQgdGhhdAorICAgICAgICB0aW1lLiBGb3IgZWxlbWVudCwgbGlrZSA8c2Vs ZWN0PiwgdGhhdCBkbyBub3Qgc3VwcG9ydCB0ZXh0IHNlbGVjdGlvbiwgd2UgY2FuIHpvb20gdGhl bSBpbW1lZGlhdGVseSB3aGVuIGZvY3VzZWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dL Q29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKG1heUNvbnRhaW5TZWxlY3RhYmxl VGV4dCk6IFJlbmFtZWQgZnJvbSBzaG91bGREZWZlclpvb21pbmdUb1NlbGVjdGlvbldoZW5SZXZl YWxpbmdGb2N1c2VkRWxlbWVudC4KKyAgICAgICAgTGlzdCBhbGwgdGhlIGlucHV0IHR5cGVzIGlu IHRoZSBzd2l0Y2ggYmxvY2sgYW5kIHJlbW92ZSB0aGUgZGVmYXVsdCBjYXNlIHRvIGZvcmNlIHRo ZSBjb21waWxlciB0byBjaGVjayB0aGF0IHdlCisgICAgICAgIGNvdmVyZWQgYWxsIGNhc2VzLiBU aGlzIHdpbGwgcHJldmVudCB1bmZvcnNlZW4ga2V5Ym9hcmQgaXNzdWVzICh3aHkgaXNuJ3QgdGhl IGtleWJvYXJkIHNob3duPyBvciB3aHkgaXMgdGhlIGtleWJvYXJkIHNob3duPykKKyAgICAgICAg Zm9yIGZ1dHVyZSBpbnB1dCB0eXBlcyB0aGF0IHdlIG1heSBhZGQuCisgICAgICAgIChyZWN0VG9S ZXZlYWxXaGVuWm9vbWluZ1RvRm9jdXNlZEVsZW1lbnQpOiBVcGRhdGUgZm9yIHJlbmFtaW5nLgor ICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9lbGVtZW50RGlkRm9jdXM6dXNlcklzSW50ZXJhY3Rp bmc6Ymx1clByZXZpb3VzTm9kZTpjaGFuZ2luZ0FjdGl2aXR5U3RhdGU6dXNlck9iamVjdDpdKTog QWRkIGEKKyAgICAgICAgY29tbWVudCB0byBleHBsYWluIHdoeSB3ZSBtYXkgbmVlZCB0byBkZWZl ciB0aGUgem9vbTogdGhlIGZvY3VzZWQgZWxlbWVudCBzdXBwb3J0cyB0ZXh0IHNlbGVjdGlvbiBh bmQgd2UgbmVlZAorICAgICAgICB0byB3YWl0IGZvciB0aGUgd2ViIHByb2Nlc3MgdG8gY2FsbCBi YWNrIHRvIHByb3ZpZGUgYW4gdXAtdG8tZGF0ZSBzZWxlY3Rpb24gcmVjdCBmb3IgdXMgdG8gem9v bSBhbmQgcmV2ZWFsLgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9kaWRSZWNlaXZlRWRpdG9y U3RhdGVVcGRhdGVBZnRlckZvY3VzXSk6IFVwZGF0ZSBmb3IgcmVuYW1pbmcuCisgICAgICAgIChz aG91bGREZWZlclpvb21pbmdUb1NlbGVjdGlvbldoZW5SZXZlYWxpbmdGb2N1c2VkRWxlbWVudCk6 IERlbGV0ZWQuCisKIDIwMTktMDMtMjUgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4K IAogICAgICAgICBVbnJldmlld2VkLCB0aW55IGZpeCBhZnRlciByMjQzMzg4IHRvIGFkZHJlc3Mg QVBJIHRlc3QgZmFpbHVyZXMgb24gaU9TCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQppbmRleCBjMGI4MWYzOTMyYzQx ZjEwMmRlOTZiOGRhZTNiODNkZDUxMWZmYWUyLi43MTRjMWZlYWI4MjdkYTI2MjJiMzc3YmI3ZTFj NmVlYTFiM2QzZjY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tD b250ZW50Vmlld0ludGVyYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv cy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAgLTQ4MDQsMjIgKzQ4MDQsMzYgQEAgLSAo VmVjdG9yPFdlYktpdDo6T3B0aW9uSXRlbT4mKWZvY3VzZWRTZWxlY3RFbGVtZW50T3B0aW9ucwog ICAgIHJldHVybiBfZm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5zZWxlY3RPcHRpb25zOwogfQog Ci1zdGF0aWMgYm9vbCBzaG91bGREZWZlclpvb21pbmdUb1NlbGVjdGlvbldoZW5SZXZlYWxpbmdG b2N1c2VkRWxlbWVudChXZWJLaXQ6OklucHV0VHlwZSB0eXBlKQorLy8gTm90ZSB0aGF0IHNlbGVj dGFiaWxpdHkgaXMgYWxzbyBhZmZlY3RlZCBieSB0aGUgQ1NTIHByb3BlcnR5IHVzZXItc2VsZWN0 Lgorc3RhdGljIGJvb2wgbWF5Q29udGFpblNlbGVjdGFibGVUZXh0KFdlYktpdDo6SW5wdXRUeXBl IHR5cGUpCiB7CiAgICAgc3dpdGNoICh0eXBlKSB7CisgICAgY2FzZSBXZWJLaXQ6OklucHV0VHlw ZTo6Tm9uZToKKyAgICAvLyBUaGUgZm9sbG93aW5nIHR5cGVzIGhhdmUgY3VzdG9tIFVJIGFuZCBk byBub3QgbG9vayBvciBiZWhhdmUgbGlrZSBhIHRleHQgZmllbGQuCisjaWYgRU5BQkxFKElOUFVU X1RZUEVfQ09MT1IpCisgICAgY2FzZSBXZWJLaXQ6OklucHV0VHlwZTo6Q29sb3I6CisjZW5kaWYK KyAgICBjYXNlIFdlYktpdDo6SW5wdXRUeXBlOjpEYXRlOgorICAgIGNhc2UgV2ViS2l0OjpJbnB1 dFR5cGU6OkRhdGVUaW1lTG9jYWw6CisgICAgY2FzZSBXZWJLaXQ6OklucHV0VHlwZTo6RHJhd2lu ZzoKKyAgICBjYXNlIFdlYktpdDo6SW5wdXRUeXBlOjpNb250aDoKKyAgICBjYXNlIFdlYktpdDo6 SW5wdXRUeXBlOjpTZWxlY3Q6CisgICAgY2FzZSBXZWJLaXQ6OklucHV0VHlwZTo6VGltZToKKyAg ICAgICAgcmV0dXJuIGZhbHNlOworICAgIC8vIFRoZSBmb2xsb3dpbmcgdHlwZXMgbG9vayBhbmQg YmVoYXZlIGxpa2UgYSB0ZXh0IGZpZWxkLgogICAgIGNhc2UgV2ViS2l0OjpJbnB1dFR5cGU6OkNv bnRlbnRFZGl0YWJsZToKLSAgICBjYXNlIFdlYktpdDo6SW5wdXRUeXBlOjpUZXh0OgotICAgIGNh c2UgV2ViS2l0OjpJbnB1dFR5cGU6OlBhc3N3b3JkOgotICAgIGNhc2UgV2ViS2l0OjpJbnB1dFR5 cGU6OlRleHRBcmVhOgotICAgIGNhc2UgV2ViS2l0OjpJbnB1dFR5cGU6OlNlYXJjaDoKKyAgICBj YXNlIFdlYktpdDo6SW5wdXRUeXBlOjpEYXRlVGltZToKICAgICBjYXNlIFdlYktpdDo6SW5wdXRU eXBlOjpFbWFpbDoKLSAgICBjYXNlIFdlYktpdDo6SW5wdXRUeXBlOjpVUkw6Ci0gICAgY2FzZSBX ZWJLaXQ6OklucHV0VHlwZTo6UGhvbmU6CiAgICAgY2FzZSBXZWJLaXQ6OklucHV0VHlwZTo6TnVt YmVyOgogICAgIGNhc2UgV2ViS2l0OjpJbnB1dFR5cGU6Ok51bWJlclBhZDoKKyAgICBjYXNlIFdl YktpdDo6SW5wdXRUeXBlOjpQYXNzd29yZDoKKyAgICBjYXNlIFdlYktpdDo6SW5wdXRUeXBlOjpQ aG9uZToKKyAgICBjYXNlIFdlYktpdDo6SW5wdXRUeXBlOjpTZWFyY2g6CisgICAgY2FzZSBXZWJL aXQ6OklucHV0VHlwZTo6VGV4dDoKKyAgICBjYXNlIFdlYktpdDo6SW5wdXRUeXBlOjpUZXh0QXJl YToKKyAgICBjYXNlIFdlYktpdDo6SW5wdXRUeXBlOjpVUkw6CisgICAgY2FzZSBXZWJLaXQ6Oklu cHV0VHlwZTo6V2VlazoKICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgZGVmYXVsdDoKLSAgICAg ICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIH0KIApAQCAtNDgyOSw3ICs0ODQzLDcgQEAgc3RhdGlj IFdlYkNvcmU6OkZsb2F0UmVjdCByZWN0VG9SZXZlYWxXaGVuWm9vbWluZ1RvRm9jdXNlZEVsZW1l bnQoY29uc3QgV2ViS2l0OjoKICAgICBpZiAoZWxlbWVudEluZm8uZWxlbWVudFJlY3QuY29udGFp bnMoZWxlbWVudEluZm8ubGFzdEludGVyYWN0aW9uTG9jYXRpb24pKQogICAgICAgICBlbGVtZW50 SW50ZXJhY3Rpb25SZWN0ID0geyBlbGVtZW50SW5mby5sYXN0SW50ZXJhY3Rpb25Mb2NhdGlvbiwg eyAxLCAxIH0gfTsKIAotICAgIGlmICghc2hvdWxkRGVmZXJab29taW5nVG9TZWxlY3Rpb25XaGVu UmV2ZWFsaW5nRm9jdXNlZEVsZW1lbnQoZWxlbWVudEluZm8uZWxlbWVudFR5cGUpKQorICAgIGlm ICghbWF5Q29udGFpblNlbGVjdGFibGVUZXh0KGVsZW1lbnRJbmZvLmVsZW1lbnRUeXBlKSkKICAg ICAgICAgcmV0dXJuIGVsZW1lbnRJbnRlcmFjdGlvblJlY3Q7CiAKICAgICBpZiAoZWRpdG9yU3Rh dGUuaXNNaXNzaW5nUG9zdExheW91dERhdGEpIHsKQEAgLTQ5NjUsMjggKzQ5NzksMTkgQEAgLSAo dm9pZClfZWxlbWVudERpZEZvY3VzOihjb25zdCBXZWJLaXQ6OkZvY3VzZWRFbGVtZW50SW5mb3Jt YXRpb24mKWluZm9ybWF0aW9uIHUKICNlbHNlCiAgICAgW3NlbGYgcmVsb2FkSW5wdXRWaWV3c107 CiAjZW5kaWYKLSAgICAKLSAgICBzd2l0Y2ggKGluZm9ybWF0aW9uLmVsZW1lbnRUeXBlKSB7Ci0g ICAgY2FzZSBXZWJLaXQ6OklucHV0VHlwZTo6U2VsZWN0OgotICAgIGNhc2UgV2ViS2l0OjpJbnB1 dFR5cGU6OkRhdGVUaW1lTG9jYWw6Ci0gICAgY2FzZSBXZWJLaXQ6OklucHV0VHlwZTo6VGltZToK LSAgICBjYXNlIFdlYktpdDo6SW5wdXRUeXBlOjpNb250aDoKLSAgICBjYXNlIFdlYktpdDo6SW5w dXRUeXBlOjpEYXRlOgotICAgIGNhc2UgV2ViS2l0OjpJbnB1dFR5cGU6OkRyYXdpbmc6Ci0jaWYg RU5BQkxFKElOUFVUX1RZUEVfQ09MT1IpCi0gICAgY2FzZSBXZWJLaXQ6OklucHV0VHlwZTo6Q29s b3I6Ci0jZW5kaWYKLSAgICAgICAgYnJlYWs7Ci0gICAgZGVmYXVsdDoKKworICAgIGlmIChtYXlD b250YWluU2VsZWN0YWJsZVRleHQoX2ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uZWxlbWVudFR5 cGUpKQogICAgICAgICBbc2VsZiBfc2hvd0tleWJvYXJkXTsKLSAgICAgICAgYnJlYWs7Ci0gICAg fQotICAgIAorCiAgICAgLy8gVGhlIGN1c3RvbSBmaXhlZCBwb3NpdGlvbiByZWN0IGJlaGF2aW9y IGlzIGFmZmVjdGVkIGJ5IC1pc0ZvY3VzaW5nRWxlbWVudCwgc28gaWYgdGhhdCBjaGFuZ2VzIHdl IG5lZWQgdG8gcmVjb21wdXRlIHJlY3RzLgogICAgIGlmIChlZGl0YWJsZUNoYW5nZWQpCiAgICAg ICAgIFtfd2ViVmlldyBfc2NoZWR1bGVWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVdOwotICAgIAot ICAgIGlmICghc2hvdWxkRGVmZXJab29taW5nVG9TZWxlY3Rpb25XaGVuUmV2ZWFsaW5nRm9jdXNl ZEVsZW1lbnQoX2ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uZWxlbWVudFR5cGUpKQorCisgICAg Ly8gRm9yIGVsZW1lbnRzIHRoYXQgaGF2ZSBzZWxlY3RhYmxlIGNvbnRlbnQgKGUuZy4gdGV4dCBm aWVsZCkgd2UgbmVlZCB0byB3YWl0IGZvciB0aGUgd2ViIHByb2Nlc3MgdG8gc2VuZCBhbiB1cC10 by1kYXRlCisgICAgLy8gc2VsZWN0aW9uIHJlY3QgYmVmb3JlIHdlIGNhbiB6b29tIGFuZCByZXZl YWwgdGhlIHNlbGVjdGlvbi4gTm9uLXNlbGVjdGFibGUgZWxlbWVudHMgKGUuZy4gPHNlbGVjdD4p IGNhbiBiZSB6b29tZWQKKyAgICAvLyBpbW1lZGlhdGVseSBiZWNhdXNlIHRoZXkgaGF2ZSBubyBz ZWxlY3Rpb24gdG8gcmV2ZWFsLgorICAgIEJPT0wgbmVlZHNFZGl0b3JTdGF0ZVVwZGF0ZSA9IG1h eUNvbnRhaW5TZWxlY3RhYmxlVGV4dChfZm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5lbGVtZW50 VHlwZSk7CisgICAgaWYgKCFuZWVkc0VkaXRvclN0YXRlVXBkYXRlKQogICAgICAgICBbc2VsZiBf em9vbVRvUmV2ZWFsRm9jdXNlZEVsZW1lbnRdOwogCiAgICAgW3NlbGYgX3VwZGF0ZUFjY2Vzc29y eV07CkBAIC01MTM4LDcgKzUxNDMsNyBAQCAtICh2b2lkKV9kaWRSZWNlaXZlRWRpdG9yU3RhdGVV cGRhdGVBZnRlckZvY3VzCiAKICAgICAvLyBGSVhNRTogSWYgdGhlIGluaXRpYWwgd3JpdGluZyBk aXJlY3Rpb24ganVzdCBjaGFuZ2VkLCB3ZSBzaG91bGQgd2FpdCB1bnRpbCB3ZSBnZXQgdGhlIG5l eHQgcG9zdC1sYXlvdXQgZWRpdG9yIHN0YXRlCiAgICAgLy8gYmVmb3JlIHpvb21pbmcgdG8gcmV2 ZWFsIHRoZSBzZWxlY3Rpb24gcmVjdC4KLSAgICBpZiAoc2hvdWxkRGVmZXJab29taW5nVG9TZWxl Y3Rpb25XaGVuUmV2ZWFsaW5nRm9jdXNlZEVsZW1lbnQoX2ZvY3VzZWRFbGVtZW50SW5mb3JtYXRp b24uZWxlbWVudFR5cGUpKQorICAgIGlmIChtYXlDb250YWluU2VsZWN0YWJsZVRleHQoX2ZvY3Vz ZWRFbGVtZW50SW5mb3JtYXRpb24uZWxlbWVudFR5cGUpKQogICAgICAgICBbc2VsZiBfem9vbVRv UmV2ZWFsRm9jdXNlZEVsZW1lbnRdOwogfQogCg==