206716 2020-01-23 16:38:00 -0800 macCatalyst: I-Beam is too conservative, doesn't show up in editable areas with no text 2020-01-23 18:22:42 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton commit-queue ews-watchlist mifenton simon.fraser webkit-bug-importer wenson_hsieh zalan oldest_to_newest 1610406 0 thorton 2020-01-23 16:38:00 -0800 macCatalyst: I-Beam is too conservative, doesn't show up in editable areas with no text 1610407 1 388615 thorton 2020-01-23 16:38:24 -0800 Created attachment 388615 Patch 1610408 2 thorton 2020-01-23 16:38:25 -0800 <rdar://problem/58359523> 1610452 3 388615 zalan 2020-01-23 17:59:44 -0800 Comment on attachment 388615 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=388615&action=review > Source/WebCore/editing/VisiblePosition.cpp:675 > + Node* node = m_deepPosition.anchorNode(); auto* > Source/WebCore/editing/VisiblePosition.cpp:679 > + InlineBox* inlineBox; nullptr it please > Source/WebCore/editing/VisiblePosition.cpp:680 > + int caretOffset; this should have an initial value too > Source/WebCore/editing/VisiblePosition.cpp:687 > + FloatRect localRect(root.x(), root.selectionTop(), root.width(), root.selectionHeight()); isn't "auto localRect = FloatRect { }" the preferred way by now? 1610455 4 388615 zalan 2020-01-23 18:03:38 -0800 Comment on attachment 388615 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=388615&action=review > Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm:2759 > + auto renderer = hitTestResult.innerNode()->renderer(); auto* 1610462 5 388633 thorton 2020-01-23 18:11:15 -0800 Created attachment 388633 Patch 1610463 6 thorton 2020-01-23 18:22:26 -0800 https://trac.webkit.org/changeset/255046/webkit 388615 2020-01-23 16:38:24 -0800 2020-01-23 18:11:14 -0800 Patch bug-206716-20200123163823.patch text/plain 7430 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0ODU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWMwYzc3N2RkOGExYjFl ZTc1ZGU3ZTA1YjY3ODU0NGE0ZmE3ODU3Zi4uMDY1YmRlMmNmMmQxMDk1ZmZmZDc0ZDViM2M5YTE5 YjdkNDNjNzVjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTAxLTIzICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIG1hY0NhdGFseXN0 OiBJLUJlYW0gaXMgdG9vIGNvbnNlcnZhdGl2ZSwgZG9lc24ndCBzaG93IHVwIGluIGVkaXRhYmxl IGFyZWFzIHdpdGggbm8gdGV4dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjA2NzE2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81ODM1OTUyMz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGVkaXRpbmcv VmlzaWJsZVBvc2l0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlZpc2libGVQb3NpdGlvbjo6 YWJzb2x1dGVTZWxlY3Rpb25Cb3VuZHNGb3JMaW5lIGNvbnN0KToKKyAgICAgICAgKiBlZGl0aW5n L1Zpc2libGVQb3NpdGlvbi5oOgorICAgICAgICBFeHBvc2UgdGhlIGJvdW5kcyBvZiB0aGUgcG9z c2libGUgc2VsZWN0aW9uIGZvciB0aGUgbGluZSB0aGF0IHRoZSBnaXZlbiBwb3NpdGlvbiBiZWxv bmdzIHRvLgorCiAyMDIwLTAxLTIxICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAK ICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjI1NDc1My4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggYWYy OWU5NDcyNDE4MWRjZTczZWUxZDhkMmQ0MDlkOWNkNTAxNzBhOC4uYTM5MTdiZmY0NTBjZjEzZWNj MWZkNWYwMDA0OThjNzlhOTBkMjFlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAyMC0w MS0yMyAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBt YWNDYXRhbHlzdDogSS1CZWFtIGlzIHRvbyBjb25zZXJ2YXRpdmUsIGRvZXNuJ3Qgc2hvdyB1cCBp biBlZGl0YWJsZSBhcmVhcyB3aXRoIG5vIHRleHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNjcxNgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTgz NTk1MjM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAgIChXZWJLaXQ6 OmxpbmVDYXJldEV4dGVudCk6CisgICAgICAgIChXZWJLaXQ6OnBvcHVsYXRlQ2FyZXRDb250ZXh0 KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6cG9zaXRpb25JbmZvcm1hdGlvbik6CisgICAg ICAgIEluc3RlYWQgb2YgdW5pdGluZyB0aGUgY2FyZXQgcG9zaXRpb24gZm9yIHRoZSBmaXJzdCBh bmQgbGFzdCBwb3NpdGlvbgorICAgICAgICBvbiB0aGUgbGluZSB0byBmaW5kIHRoZSBJLUJlYW0g cmVnaW9uLCB1c2UgdGhlIGJvdW5kcyBvZiB0aGUgc2VsZWN0aW9uCisgICAgICAgIHJlY3QgZm9y IHRoZSBsaW5lLCB3aGljaCBleHRlbmRzIGJleW9uZCBleGlzdGluZyB0ZXh0LCBtYXRjaGluZyBv dXIKKyAgICAgICAgdHJhZGl0aW9uYWwgYmVoYXZpb3Igb2Ygc2hvd2luZyB0aGUgSS1CZWFtIG92 ZXIgYmxhbmsgcmVnaW9ucy4KKwogMjAyMC0wMS0yMSAgQWxlamFuZHJvIEcuIENhc3RybyAgPGFs ZXhAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXVtXUEVdIFRlc3RXZWJLaXRVc2VyQ29udGVu dEZpbHRlclN0b3JlIGlzIGNyYXNoaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL1Zpc2libGVQb3NpdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVQ b3NpdGlvbi5jcHAKaW5kZXggNGM2MGU5NzNkMjg3MmM1ODQ3ZjNiMDc1MGQ2ZGVlZmYwMDkzMGM2 OC4uOTU2OWEzMWUzZTI3MjVkZGEzNmRiODM1NGFjZjYwOGJlZWJjYzEyMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlUG9zaXRpb24uY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVBvc2l0aW9uLmNwcApAQCAtNjY3LDYgKzY2NywyNyBAQCBJ bnRSZWN0IFZpc2libGVQb3NpdGlvbjo6YWJzb2x1dGVDYXJldEJvdW5kcyhib29sKiBpbnNpZGVG aXhlZCkgY29uc3QKICAgICByZXR1cm4gYWJzb2x1dGVCb3VuZHNGb3JMb2NhbENhcmV0UmVjdChy ZW5kZXJlciwgbG9jYWxSZWN0LCBpbnNpZGVGaXhlZCk7CiB9CiAKK0Zsb2F0UmVjdCBWaXNpYmxl UG9zaXRpb246OmFic29sdXRlU2VsZWN0aW9uQm91bmRzRm9yTGluZSgpIGNvbnN0Cit7CisgICAg aWYgKG1fZGVlcFBvc2l0aW9uLmlzTnVsbCgpKQorICAgICAgICByZXR1cm4geyB9OworCisgICAg Tm9kZSogbm9kZSA9IG1fZGVlcFBvc2l0aW9uLmFuY2hvck5vZGUoKTsKKyAgICBpZiAoIW5vZGUt PnJlbmRlcmVyKCkpCisgICAgICAgIHJldHVybiB7IH07CisKKyAgICBJbmxpbmVCb3gqIGlubGlu ZUJveDsKKyAgICBpbnQgY2FyZXRPZmZzZXQ7CisgICAgZ2V0SW5saW5lQm94QW5kT2Zmc2V0KGlu bGluZUJveCwgY2FyZXRPZmZzZXQpOworCisgICAgaWYgKCFpbmxpbmVCb3gpCisgICAgICAgIHJl dHVybiB7IH07CisKKyAgICBhdXRvJiByb290ID0gaW5saW5lQm94LT5yb290KCk7CisgICAgRmxv YXRSZWN0IGxvY2FsUmVjdChyb290LngoKSwgcm9vdC5zZWxlY3Rpb25Ub3AoKSwgcm9vdC53aWR0 aCgpLCByb290LnNlbGVjdGlvbkhlaWdodCgpKTsKKyAgICByZXR1cm4gcm9vdC5yZW5kZXJlcigp LmxvY2FsVG9BYnNvbHV0ZVF1YWQobG9jYWxSZWN0KS5ib3VuZGluZ0JveCgpOworfQorCiBpbnQg VmlzaWJsZVBvc2l0aW9uOjpsaW5lRGlyZWN0aW9uUG9pbnRGb3JCbG9ja0RpcmVjdGlvbk5hdmln YXRpb24oKSBjb25zdAogewogICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXI7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVQb3NpdGlvbi5oIGIvU291cmNlL1dlYkNv cmUvZWRpdGluZy9WaXNpYmxlUG9zaXRpb24uaAppbmRleCBkNzAyMDFhY2JjMjUxNWI5MDVhZWE0 OGFiYjdlMDk3MDNlMDYwM2I5Li42YzY3MzQ0ZDg0YzA1Y2ZmMGI3NDQzZDQ4ODYwMWEyMDFjYTU1 NzFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVQb3NpdGlvbi5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVBvc2l0aW9uLmgKQEAgLTEwMiw2 ICsxMDIsOCBAQCBwdWJsaWM6CiAgICAgLy8gRklYTUU6IG5hdmlnYXRpb24gd2l0aCB0cmFuc2Zv cm1zIHNob3VsZCBiZSBzbWFydGVyLgogICAgIFdFQkNPUkVfRVhQT1JUIGludCBsaW5lRGlyZWN0 aW9uUG9pbnRGb3JCbG9ja0RpcmVjdGlvbk5hdmlnYXRpb24oKSBjb25zdDsKIAorICAgIFdFQkNP UkVfRVhQT1JUIEZsb2F0UmVjdCBhYnNvbHV0ZVNlbGVjdGlvbkJvdW5kc0ZvckxpbmUoKSBjb25z dDsKKwogICAgIC8vIFRoaXMgaXMgYSB0ZW50YXRpdmUgZW5oYW5jZW1lbnQgb2Ygb3BlcmF0b3I9 PSB0byBhY2NvdW50IGZvciBhZmZpbml0eS4KICAgICAvLyBGSVhNRTogQ29tYmluZSB0aGlzIGZ1 bmN0aW9uIHdpdGggb3BlcmF0b3I9PQogICAgIGJvb2wgZXF1YWxzKGNvbnN0IFZpc2libGVQb3Np dGlvbiYpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvaW9zL1dlYlBhZ2VJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9p b3MvV2ViUGFnZUlPUy5tbQppbmRleCAyYjg4NWQ2Mjk3MGVhNTBiZjkxMjg1NTJjN2Y0MTZlMmQw Y2U1ZGQ2Li4zNzE1MWM5OWU3MzkyNWI2OWIxYmExMTBkNTcwZGM0Y2M5MTg3YzM3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQor KysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpA QCAtMjc1MCw2ICsyNzUwLDQ5IEBAIFJlZlB0cjxTaGFyZWFibGVCaXRtYXA+IFdlYlBhZ2U6OnNo YXJlYWJsZUJpdG1hcFNuYXBzaG90Rm9yTm9kZShFbGVtZW50JiBlbGVtZW50CiAgICAgcmV0dXJu IG51bGxwdHI7CiB9CiAKK3N0YXRpYyBGbG9hdFJlY3QgbGluZUNhcmV0RXh0ZW50KGNvbnN0IElu dGVyYWN0aW9uSW5mb3JtYXRpb25SZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBIaXRUZXN0UmVzdWx0 JiBoaXRUZXN0UmVzdWx0KQoreworICAgIGF1dG8qIGZyYW1lID0gaGl0VGVzdFJlc3VsdC5pbm5l ck5vZGVGcmFtZSgpOworICAgIGlmICghZnJhbWUpCisgICAgICAgIHJldHVybiB7IH07CisKKyAg ICBhdXRvIHJlbmRlcmVyID0gaGl0VGVzdFJlc3VsdC5pbm5lck5vZGUoKS0+cmVuZGVyZXIoKTsK KyAgICBpZiAoIXJlbmRlcmVyKQorICAgICAgICByZXR1cm4geyB9OworCisgICAgd2hpbGUgKHJl bmRlcmVyICYmICFpczxSZW5kZXJCbG9ja0Zsb3c+KCpyZW5kZXJlcikpCisgICAgICAgIHJlbmRl cmVyID0gcmVuZGVyZXItPnBhcmVudCgpOworCisgICAgaWYgKCFyZW5kZXJlcikKKyAgICAgICAg cmV0dXJuIHsgfTsKKworICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgYmUgYWJsZSB0byByZXRyaWV2 ZSB0aGlzIGdlb21ldHJ5IGluZm9ybWF0aW9uIHdpdGhvdXQKKyAgICAvLyBmb3JjaW5nIHRoZSB0 ZXh0IHRvIGZhbGwgb3V0IG9mIFNpbXBsZSBMaW5lIExheW91dC4KKyAgICBhdXRvJiBibG9ja0Zs b3cgPSBkb3duY2FzdDxSZW5kZXJCbG9ja0Zsb3c+KCpyZW5kZXJlcik7CisgICAgVmlzaWJsZVBv c2l0aW9uIHBvc2l0aW9uID0gZnJhbWUtPnZpc2libGVQb3NpdGlvbkZvclBvaW50KHJlcXVlc3Qu cG9pbnQpOworICAgIGF1dG8gbGluZVJlY3QgPSBwb3NpdGlvbi5hYnNvbHV0ZVNlbGVjdGlvbkJv dW5kc0ZvckxpbmUoKTsKKyAgICBsaW5lUmVjdC5zZXRXaWR0aChibG9ja0Zsb3cuY29udGVudFdp ZHRoKCkpOworICAgIHJldHVybiBsaW5lUmVjdDsKK30KKworc3RhdGljIHZvaWQgcG9wdWxhdGVD YXJldENvbnRleHQoY29uc3QgSGl0VGVzdFJlc3VsdCYgaGl0VGVzdFJlc3VsdCwgY29uc3QgSW50 ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVlc3QmIHJlcXVlc3QsIEludGVyYWN0aW9uSW5mb3JtYXRp b25BdFBvc2l0aW9uJiBpbmZvKQoreworICAgIGF1dG8qIGZyYW1lID0gaGl0VGVzdFJlc3VsdC5p bm5lck5vZGVGcmFtZSgpOworICAgIGlmICghZnJhbWUpCisgICAgICAgIHJldHVybjsKKworICAg IGF1dG8qIGZyYW1lVmlldyA9IGZyYW1lLT52aWV3KCk7CisgICAgaWYgKCFmcmFtZVZpZXcpCisg ICAgICAgIHJldHVybjsKKworICAgIGluZm8ubGluZUNhcmV0RXh0ZW50ID0gZnJhbWVWaWV3LT5j b250ZW50c1RvUm9vdFZpZXcobGluZUNhcmV0RXh0ZW50KHJlcXVlc3QsIGhpdFRlc3RSZXN1bHQp KTsKKyAgICBpbmZvLmNhcmV0SGVpZ2h0ID0gaW5mby5saW5lQ2FyZXRFeHRlbnQuaGVpZ2h0KCk7 CisKKyAgICAvLyBGb3JjZSBhbiBJLWJlYW0gY3Vyc29yIGlmIHRoZSBwYWdlIGRpZG4ndCByZXF1 ZXN0IGEgaGFuZCwgYW5kIHdlJ3JlIGluc2lkZSB0aGUgYm91bmRzIG9mIHRoZSBsaW5lLgorICAg IGlmIChpbmZvLmxpbmVDYXJldEV4dGVudC5jb250YWlucyhyZXF1ZXN0LnBvaW50KSAmJiBpbmZv LmN1cnNvci0+dHlwZSgpICE9IEN1cnNvcjo6SGFuZCkKKyAgICAgICAgaW5mby5jdXJzb3IgPSBD dXJzb3I6OmZyb21UeXBlKEN1cnNvcjo6SUJlYW0pOworfQorCiBJbnRlcmFjdGlvbkluZm9ybWF0 aW9uQXRQb3NpdGlvbiBXZWJQYWdlOjpwb3NpdGlvbkluZm9ybWF0aW9uKGNvbnN0IEludGVyYWN0 aW9uSW5mb3JtYXRpb25SZXF1ZXN0JiByZXF1ZXN0KQogewogICAgIEludGVyYWN0aW9uSW5mb3Jt YXRpb25BdFBvc2l0aW9uIGluZm87CkBAIC0yNzY0LDE4ICsyODA3LDggQEAgSW50ZXJhY3Rpb25J bmZvcm1hdGlvbkF0UG9zaXRpb24gV2ViUGFnZTo6cG9zaXRpb25JbmZvcm1hdGlvbihjb25zdCBJ bnRlcmFjdGlvbkkKICAgICBhdXRvJiBldmVudEhhbmRsZXIgPSBtX3BhZ2UtPm1haW5GcmFtZSgp LmV2ZW50SGFuZGxlcigpOwogICAgIEhpdFRlc3RSZXN1bHQgaGl0VGVzdFJlc3VsdCA9IGV2ZW50 SGFuZGxlci5oaXRUZXN0UmVzdWx0QXRQb2ludChyZXF1ZXN0LnBvaW50LCBIaXRUZXN0UmVxdWVz dDo6UmVhZE9ubHkgfCBIaXRUZXN0UmVxdWVzdDo6QWxsb3dGcmFtZVNjcm9sbGJhcnMpOwogICAg IGluZm8uY3Vyc29yID0gZXZlbnRIYW5kbGVyLnNlbGVjdEN1cnNvcihoaXRUZXN0UmVzdWx0LCBm YWxzZSk7Ci0gICAgaWYgKHJlcXVlc3QuaW5jbHVkZUNhcmV0Q29udGV4dCkgewotICAgICAgICBp ZiAoYXV0byogZnJhbWUgPSBoaXRUZXN0UmVzdWx0LmlubmVyTm9kZUZyYW1lKCkpIHsKLSAgICAg ICAgICAgIGlmIChhdXRvKiBmcmFtZVZpZXcgPSBmcmFtZS0+dmlldygpKSB7Ci0gICAgICAgICAg ICAgICAgVmlzaWJsZVBvc2l0aW9uIHBvc2l0aW9uID0gZnJhbWUtPnZpc2libGVQb3NpdGlvbkZv clBvaW50KHJlcXVlc3QucG9pbnQpOwotICAgICAgICAgICAgICAgIGluZm8uY2FyZXRIZWlnaHQg PSBmcmFtZVZpZXctPmNvbnRlbnRzVG9Sb290Vmlldyhwb3NpdGlvbi5hYnNvbHV0ZUNhcmV0Qm91 bmRzKCkpLmhlaWdodCgpOwotCi0gICAgICAgICAgICAgICAgVmlzaWJsZVBvc2l0aW9uIHN0YXJ0 UG9zaXRpb24gPSBzdGFydE9mTGluZShwb3NpdGlvbik7Ci0gICAgICAgICAgICAgICAgVmlzaWJs ZVBvc2l0aW9uIGVuZFBvc2l0aW9uID0gZW5kT2ZMaW5lKHBvc2l0aW9uKTsKLSAgICAgICAgICAg ICAgICBpbmZvLmxpbmVDYXJldEV4dGVudCA9IHVuaW9uUmVjdChmcmFtZVZpZXctPmNvbnRlbnRz VG9Sb290VmlldyhzdGFydFBvc2l0aW9uLmFic29sdXRlQ2FyZXRCb3VuZHMoKSksIGZyYW1lVmll dy0+Y29udGVudHNUb1Jvb3RWaWV3KGVuZFBvc2l0aW9uLmFic29sdXRlQ2FyZXRCb3VuZHMoKSkp OwotICAgICAgICAgICAgfQotICAgICAgICB9Ci0gICAgfQorICAgIGlmIChyZXF1ZXN0LmluY2x1 ZGVDYXJldENvbnRleHQpCisgICAgICAgIHBvcHVsYXRlQ2FyZXRDb250ZXh0KGhpdFRlc3RSZXN1 bHQsIHJlcXVlc3QsIGluZm8pOwogCiAjaWYgRU5BQkxFKERBVEFfSU5URVJBQ1RJT04pCiAgICAg aW5mby5oYXNTZWxlY3Rpb25BdFBvc2l0aW9uID0gbV9wYWdlLT5oYXNTZWxlY3Rpb25BdFBvc2l0 aW9uKGFkanVzdGVkUG9pbnQpOwo= 388633 2020-01-23 18:11:15 -0800 2020-01-23 18:22:42 -0800 Patch bug-206716-20200123181115.patch text/plain 7489 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjU1MDQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmYyYmM1NmQ2NWQ1NzVm N2YwOWQ3ZGVmMGFhNDY0NjgzMDU4ZDUyMC4uZjIyYWViMzI3MDI1MGMyZmI2MTA1Y2I4NTJhYmVl M2U1NDg0NmRhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTAxLTIzICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIG1hY0NhdGFseXN0 OiBJLUJlYW0gaXMgdG9vIGNvbnNlcnZhdGl2ZSwgZG9lc24ndCBzaG93IHVwIGluIGVkaXRhYmxl IGFyZWFzIHdpdGggbm8gdGV4dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjA2NzE2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81ODM1OTUyMz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgKiBlZGl0aW5nL1Zp c2libGVQb3NpdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWaXNpYmxlUG9zaXRpb246OmFi c29sdXRlU2VsZWN0aW9uQm91bmRzRm9yTGluZSBjb25zdCk6CisgICAgICAgICogZWRpdGluZy9W aXNpYmxlUG9zaXRpb24uaDoKKyAgICAgICAgRXhwb3NlIHRoZSBib3VuZHMgb2YgdGhlIHBvc3Np YmxlIHNlbGVjdGlvbiBmb3IgdGhlIGxpbmUgdGhhdCB0aGUgZ2l2ZW4gcG9zaXRpb24gYmVsb25n cyB0by4KKwogMjAyMC0wMS0yMyAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgog CiAgICAgICAgIEVuYWJsZSAtV2NvbmRpdGlvbmFsLXVuaW5pdGlhbGl6ZWQgaW4gV2ViQ29yZSBw cm9qZWN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCmluZGV4IDc4N2IxNTRjYmFmMzYwOTcwYzllYWQ2MzYwMTc4ZDQ4OGQxNDA2 NDIuLjVlNjQzNDMwMzE3Njc1YzU3NjE0M2NkNmU3YmRjYTczZDlhZTJlMDYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjAgQEAKKzIwMjAtMDEtMjMgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBh cHBsZS5jb20+CisKKyAgICAgICAgbWFjQ2F0YWx5c3Q6IEktQmVhbSBpcyB0b28gY29uc2VydmF0 aXZlLCBkb2Vzbid0IHNob3cgdXAgaW4gZWRpdGFibGUgYXJlYXMgd2l0aCBubyB0ZXh0CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDY3MTYKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzU4MzU5NTIzPgorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9u IEZyYXNlci4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5t bToKKyAgICAgICAgKFdlYktpdDo6bGluZUNhcmV0RXh0ZW50KToKKyAgICAgICAgKFdlYktpdDo6 cG9wdWxhdGVDYXJldENvbnRleHQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpwb3NpdGlv bkluZm9ybWF0aW9uKToKKyAgICAgICAgSW5zdGVhZCBvZiB1bml0aW5nIHRoZSBjYXJldCBwb3Np dGlvbiBmb3IgdGhlIGZpcnN0IGFuZCBsYXN0IHBvc2l0aW9uCisgICAgICAgIG9uIHRoZSBsaW5l IHRvIGZpbmQgdGhlIEktQmVhbSByZWdpb24sIHVzZSB0aGUgYm91bmRzIG9mIHRoZSBzZWxlY3Rp b24KKyAgICAgICAgcmVjdCBmb3IgdGhlIGxpbmUsIHdoaWNoIGV4dGVuZHMgYmV5b25kIGV4aXN0 aW5nIHRleHQsIG1hdGNoaW5nIG91cgorICAgICAgICB0cmFkaXRpb25hbCBiZWhhdmlvciBvZiBz aG93aW5nIHRoZSBJLUJlYW0gb3ZlciBibGFuayByZWdpb25zLgorCiAyMDIwLTAxLTIzICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgYSB2YXJpYW50IG9m IC1zZWxlY3RQb3NpdGlvbkF0UG9pbnQgdGhhdCBjYW4gc2VsZWN0IGFuIGFyYml0cmFyeSBwb2lu dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlUG9zaXRpb24uY3Bw IGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlUG9zaXRpb24uY3BwCmluZGV4IDRjNjBl OTczZDI4NzJjNTg0N2YzYjA3NTBkNmRlZWZmMDA5MzBjNjguLjZiOTBmZmRiZTU0YWVjZTg2MzM1 MTMxMmEyNWIxMmFlOGQyY2UxYTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcv VmlzaWJsZVBvc2l0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVQ b3NpdGlvbi5jcHAKQEAgLTY2Nyw2ICs2NjcsMjcgQEAgSW50UmVjdCBWaXNpYmxlUG9zaXRpb246 OmFic29sdXRlQ2FyZXRCb3VuZHMoYm9vbCogaW5zaWRlRml4ZWQpIGNvbnN0CiAgICAgcmV0dXJu IGFic29sdXRlQm91bmRzRm9yTG9jYWxDYXJldFJlY3QocmVuZGVyZXIsIGxvY2FsUmVjdCwgaW5z aWRlRml4ZWQpOwogfQogCitGbG9hdFJlY3QgVmlzaWJsZVBvc2l0aW9uOjphYnNvbHV0ZVNlbGVj dGlvbkJvdW5kc0ZvckxpbmUoKSBjb25zdAoreworICAgIGlmIChtX2RlZXBQb3NpdGlvbi5pc051 bGwoKSkKKyAgICAgICAgcmV0dXJuIHsgfTsKKworICAgIGF1dG8qIG5vZGUgPSBtX2RlZXBQb3Np dGlvbi5hbmNob3JOb2RlKCk7CisgICAgaWYgKCFub2RlLT5yZW5kZXJlcigpKQorICAgICAgICBy ZXR1cm4geyB9OworCisgICAgSW5saW5lQm94KiBpbmxpbmVCb3ggPSBudWxscHRyOworICAgIGlu dCBjYXJldE9mZnNldCA9IDA7CisgICAgZ2V0SW5saW5lQm94QW5kT2Zmc2V0KGlubGluZUJveCwg Y2FyZXRPZmZzZXQpOworCisgICAgaWYgKCFpbmxpbmVCb3gpCisgICAgICAgIHJldHVybiB7IH07 CisKKyAgICBhdXRvJiByb290ID0gaW5saW5lQm94LT5yb290KCk7CisgICAgYXV0byBsb2NhbFJl Y3QgPSBGbG9hdFJlY3QgeyByb290LngoKSwgcm9vdC5zZWxlY3Rpb25Ub3AoKSwgcm9vdC53aWR0 aCgpLCByb290LnNlbGVjdGlvbkhlaWdodCgpIH07CisgICAgcmV0dXJuIHJvb3QucmVuZGVyZXIo KS5sb2NhbFRvQWJzb2x1dGVRdWFkKGxvY2FsUmVjdCkuYm91bmRpbmdCb3goKTsKK30KKwogaW50 IFZpc2libGVQb3NpdGlvbjo6bGluZURpcmVjdGlvblBvaW50Rm9yQmxvY2tEaXJlY3Rpb25OYXZp Z2F0aW9uKCkgY29uc3QKIHsKICAgICBSZW5kZXJPYmplY3QqIHJlbmRlcmVyOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlUG9zaXRpb24uaCBiL1NvdXJjZS9XZWJD b3JlL2VkaXRpbmcvVmlzaWJsZVBvc2l0aW9uLmgKaW5kZXggZDcwMjAxYWNiYzI1MTViOTA1YWVh NDhhYmI3ZTA5NzAzZTA2MDNiOS4uNmM2NzM0NGQ4NGMwNWNmZjBiNzQ0M2Q0ODg2MDFhMjAxY2E1 NTcxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlUG9zaXRpb24u aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVQb3NpdGlvbi5oCkBAIC0xMDIs NiArMTAyLDggQEAgcHVibGljOgogICAgIC8vIEZJWE1FOiBuYXZpZ2F0aW9uIHdpdGggdHJhbnNm b3JtcyBzaG91bGQgYmUgc21hcnRlci4KICAgICBXRUJDT1JFX0VYUE9SVCBpbnQgbGluZURpcmVj dGlvblBvaW50Rm9yQmxvY2tEaXJlY3Rpb25OYXZpZ2F0aW9uKCkgY29uc3Q7CiAKKyAgICBXRUJD T1JFX0VYUE9SVCBGbG9hdFJlY3QgYWJzb2x1dGVTZWxlY3Rpb25Cb3VuZHNGb3JMaW5lKCkgY29u c3Q7CisKICAgICAvLyBUaGlzIGlzIGEgdGVudGF0aXZlIGVuaGFuY2VtZW50IG9mIG9wZXJhdG9y PT0gdG8gYWNjb3VudCBmb3IgYWZmaW5pdHkuCiAgICAgLy8gRklYTUU6IENvbWJpbmUgdGhpcyBm dW5jdGlvbiB3aXRoIG9wZXJhdG9yPT0KICAgICBib29sIGVxdWFscyhjb25zdCBWaXNpYmxlUG9z aXRpb24mKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ YWdlL2lvcy9XZWJQYWdlSU9TLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv aW9zL1dlYlBhZ2VJT1MubW0KaW5kZXggMmI4ODVkNjI5NzBlYTUwYmY5MTI4NTUyYzdmNDE2ZTJk MGNlNWRkNi4uY2RiYzlmZTE3N2I5MjkxN2QzNzgxODNlZTRjZDQ5MjYxYTBlN2RlMCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0K KysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0K QEAgLTI3NTAsNiArMjc1MCw0OSBAQCBSZWZQdHI8U2hhcmVhYmxlQml0bWFwPiBXZWJQYWdlOjpz aGFyZWFibGVCaXRtYXBTbmFwc2hvdEZvck5vZGUoRWxlbWVudCYgZWxlbWVudAogICAgIHJldHVy biBudWxscHRyOwogfQogCitzdGF0aWMgRmxvYXRSZWN0IGxpbmVDYXJldEV4dGVudChjb25zdCBJ bnRlcmFjdGlvbkluZm9ybWF0aW9uUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgSGl0VGVzdFJlc3Vs dCYgaGl0VGVzdFJlc3VsdCkKK3sKKyAgICBhdXRvKiBmcmFtZSA9IGhpdFRlc3RSZXN1bHQuaW5u ZXJOb2RlRnJhbWUoKTsKKyAgICBpZiAoIWZyYW1lKQorICAgICAgICByZXR1cm4geyB9OworCisg ICAgYXV0byogcmVuZGVyZXIgPSBoaXRUZXN0UmVzdWx0LmlubmVyTm9kZSgpLT5yZW5kZXJlcigp OworICAgIGlmICghcmVuZGVyZXIpCisgICAgICAgIHJldHVybiB7IH07CisKKyAgICB3aGlsZSAo cmVuZGVyZXIgJiYgIWlzPFJlbmRlckJsb2NrRmxvdz4oKnJlbmRlcmVyKSkKKyAgICAgICAgcmVu ZGVyZXIgPSByZW5kZXJlci0+cGFyZW50KCk7CisKKyAgICBpZiAoIXJlbmRlcmVyKQorICAgICAg ICByZXR1cm4geyB9OworCisgICAgLy8gRklYTUU6IFdlIHNob3VsZCBiZSBhYmxlIHRvIHJldHJp ZXZlIHRoaXMgZ2VvbWV0cnkgaW5mb3JtYXRpb24gd2l0aG91dAorICAgIC8vIGZvcmNpbmcgdGhl IHRleHQgdG8gZmFsbCBvdXQgb2YgU2ltcGxlIExpbmUgTGF5b3V0LgorICAgIGF1dG8mIGJsb2Nr RmxvdyA9IGRvd25jYXN0PFJlbmRlckJsb2NrRmxvdz4oKnJlbmRlcmVyKTsKKyAgICBWaXNpYmxl UG9zaXRpb24gcG9zaXRpb24gPSBmcmFtZS0+dmlzaWJsZVBvc2l0aW9uRm9yUG9pbnQocmVxdWVz dC5wb2ludCk7CisgICAgYXV0byBsaW5lUmVjdCA9IHBvc2l0aW9uLmFic29sdXRlU2VsZWN0aW9u Qm91bmRzRm9yTGluZSgpOworICAgIGxpbmVSZWN0LnNldFdpZHRoKGJsb2NrRmxvdy5jb250ZW50 V2lkdGgoKSk7CisgICAgcmV0dXJuIGxpbmVSZWN0OworfQorCitzdGF0aWMgdm9pZCBwb3B1bGF0 ZUNhcmV0Q29udGV4dChjb25zdCBIaXRUZXN0UmVzdWx0JiBoaXRUZXN0UmVzdWx0LCBjb25zdCBJ bnRlcmFjdGlvbkluZm9ybWF0aW9uUmVxdWVzdCYgcmVxdWVzdCwgSW50ZXJhY3Rpb25JbmZvcm1h dGlvbkF0UG9zaXRpb24mIGluZm8pCit7CisgICAgYXV0byogZnJhbWUgPSBoaXRUZXN0UmVzdWx0 LmlubmVyTm9kZUZyYW1lKCk7CisgICAgaWYgKCFmcmFtZSkKKyAgICAgICAgcmV0dXJuOworCisg ICAgYXV0byogZnJhbWVWaWV3ID0gZnJhbWUtPnZpZXcoKTsKKyAgICBpZiAoIWZyYW1lVmlldykK KyAgICAgICAgcmV0dXJuOworCisgICAgaW5mby5saW5lQ2FyZXRFeHRlbnQgPSBmcmFtZVZpZXct PmNvbnRlbnRzVG9Sb290VmlldyhsaW5lQ2FyZXRFeHRlbnQocmVxdWVzdCwgaGl0VGVzdFJlc3Vs dCkpOworICAgIGluZm8uY2FyZXRIZWlnaHQgPSBpbmZvLmxpbmVDYXJldEV4dGVudC5oZWlnaHQo KTsKKworICAgIC8vIEZvcmNlIGFuIEktYmVhbSBjdXJzb3IgaWYgdGhlIHBhZ2UgZGlkbid0IHJl cXVlc3QgYSBoYW5kLCBhbmQgd2UncmUgaW5zaWRlIHRoZSBib3VuZHMgb2YgdGhlIGxpbmUuCisg ICAgaWYgKGluZm8ubGluZUNhcmV0RXh0ZW50LmNvbnRhaW5zKHJlcXVlc3QucG9pbnQpICYmIGlu Zm8uY3Vyc29yLT50eXBlKCkgIT0gQ3Vyc29yOjpIYW5kKQorICAgICAgICBpbmZvLmN1cnNvciA9 IEN1cnNvcjo6ZnJvbVR5cGUoQ3Vyc29yOjpJQmVhbSk7Cit9CisKIEludGVyYWN0aW9uSW5mb3Jt YXRpb25BdFBvc2l0aW9uIFdlYlBhZ2U6OnBvc2l0aW9uSW5mb3JtYXRpb24oY29uc3QgSW50ZXJh Y3Rpb25JbmZvcm1hdGlvblJlcXVlc3QmIHJlcXVlc3QpCiB7CiAgICAgSW50ZXJhY3Rpb25JbmZv cm1hdGlvbkF0UG9zaXRpb24gaW5mbzsKQEAgLTI3NjQsMTggKzI4MDcsOCBAQCBJbnRlcmFjdGlv bkluZm9ybWF0aW9uQXRQb3NpdGlvbiBXZWJQYWdlOjpwb3NpdGlvbkluZm9ybWF0aW9uKGNvbnN0 IEludGVyYWN0aW9uSQogICAgIGF1dG8mIGV2ZW50SGFuZGxlciA9IG1fcGFnZS0+bWFpbkZyYW1l KCkuZXZlbnRIYW5kbGVyKCk7CiAgICAgSGl0VGVzdFJlc3VsdCBoaXRUZXN0UmVzdWx0ID0gZXZl bnRIYW5kbGVyLmhpdFRlc3RSZXN1bHRBdFBvaW50KHJlcXVlc3QucG9pbnQsIEhpdFRlc3RSZXF1 ZXN0OjpSZWFkT25seSB8IEhpdFRlc3RSZXF1ZXN0OjpBbGxvd0ZyYW1lU2Nyb2xsYmFycyk7CiAg ICAgaW5mby5jdXJzb3IgPSBldmVudEhhbmRsZXIuc2VsZWN0Q3Vyc29yKGhpdFRlc3RSZXN1bHQs IGZhbHNlKTsKLSAgICBpZiAocmVxdWVzdC5pbmNsdWRlQ2FyZXRDb250ZXh0KSB7Ci0gICAgICAg IGlmIChhdXRvKiBmcmFtZSA9IGhpdFRlc3RSZXN1bHQuaW5uZXJOb2RlRnJhbWUoKSkgewotICAg ICAgICAgICAgaWYgKGF1dG8qIGZyYW1lVmlldyA9IGZyYW1lLT52aWV3KCkpIHsKLSAgICAgICAg ICAgICAgICBWaXNpYmxlUG9zaXRpb24gcG9zaXRpb24gPSBmcmFtZS0+dmlzaWJsZVBvc2l0aW9u Rm9yUG9pbnQocmVxdWVzdC5wb2ludCk7Ci0gICAgICAgICAgICAgICAgaW5mby5jYXJldEhlaWdo dCA9IGZyYW1lVmlldy0+Y29udGVudHNUb1Jvb3RWaWV3KHBvc2l0aW9uLmFic29sdXRlQ2FyZXRC b3VuZHMoKSkuaGVpZ2h0KCk7Ci0KLSAgICAgICAgICAgICAgICBWaXNpYmxlUG9zaXRpb24gc3Rh cnRQb3NpdGlvbiA9IHN0YXJ0T2ZMaW5lKHBvc2l0aW9uKTsKLSAgICAgICAgICAgICAgICBWaXNp YmxlUG9zaXRpb24gZW5kUG9zaXRpb24gPSBlbmRPZkxpbmUocG9zaXRpb24pOwotICAgICAgICAg ICAgICAgIGluZm8ubGluZUNhcmV0RXh0ZW50ID0gdW5pb25SZWN0KGZyYW1lVmlldy0+Y29udGVu dHNUb1Jvb3RWaWV3KHN0YXJ0UG9zaXRpb24uYWJzb2x1dGVDYXJldEJvdW5kcygpKSwgZnJhbWVW aWV3LT5jb250ZW50c1RvUm9vdFZpZXcoZW5kUG9zaXRpb24uYWJzb2x1dGVDYXJldEJvdW5kcygp KSk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KLSAgICB9CisgICAgaWYgKHJlcXVlc3QuaW5j bHVkZUNhcmV0Q29udGV4dCkKKyAgICAgICAgcG9wdWxhdGVDYXJldENvbnRleHQoaGl0VGVzdFJl c3VsdCwgcmVxdWVzdCwgaW5mbyk7CiAKICNpZiBFTkFCTEUoREFUQV9JTlRFUkFDVElPTikKICAg ICBpbmZvLmhhc1NlbGVjdGlvbkF0UG9zaXRpb24gPSBtX3BhZ2UtPmhhc1NlbGVjdGlvbkF0UG9z aXRpb24oYWRqdXN0ZWRQb2ludCk7Cg==