171453 2017-04-28 15:21:35 -0700 On-screen panel for candidate bar is in the wrong place when the caret is at the start of a paragraph 2017-05-01 10:37:18 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned bdakin enrica thorton wenson_hsieh zalan oldest_to_newest 1302818 0 bdakin 2017-04-28 15:21:35 -0700 On-screen panel for candidate bar is in the wrong place when the caret is at the start of a paragraph 1. Load any web page with a contenteditable field on a Mac with TouchBar. 2. Click on the editable field so that there is a caret at the beginning but no content yet. 3. Tap and hold on a typing suggestion in the TouchBar. Expected: There is onscreen UI just belown the blinking caret. Actual: There is onscreen UI that is arbitrarily far from caret. This bug only happens when the caret is at the beginning of the paragraph, and it seems to be becuase Range::absoluteTextQuads() returns no quads in this case. 1302819 1 bdakin 2017-04-28 15:22:09 -0700 rdar://problem/29779764 1302827 2 308602 bdakin 2017-04-28 15:31:25 -0700 Created attachment 308602 Patch 1302831 3 308602 thorton 2017-04-28 15:34:46 -0700 Comment on attachment 308602 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=308602&action=review No test? :) > Source/WebKit2/ChangeLog:13 > + is because Range::absoluteTextQuads() returns no quads in this case. I think it > + might be correct that absoluteTextQuads() returns no quads in this case, so this Should check with Zalan to see if he thinks this is actually correct or a deeper bug. 1302862 4 308613 bdakin 2017-04-28 16:32:52 -0700 Created attachment 308613 Patch+test 1302863 5 308613 thorton 2017-04-28 16:34:17 -0700 Comment on attachment 308613 Patch+test View in context: https://bugs.webkit.org/attachment.cgi?id=308613&action=review > Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WKWebViewCandidateTests.mm:250 > + EXPECT_EQ(194, candidateRect.origin.y); Will this change if the font changes? That might be annoying. Could use JS to get the real number, or use Ahem, or ... 1302952 6 zalan 2017-04-28 19:05:32 -0700 (In reply to Tim Horton from comment #3) > Comment on attachment 308602 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=308602&action=review > > No test? :) > > > Source/WebKit2/ChangeLog:13 > > + is because Range::absoluteTextQuads() returns no quads in this case. I think it > > + might be correct that absoluteTextQuads() returns no quads in this case, so this > > Should check with Zalan to see if he thinks this is actually correct or a > deeper bug. The editable element is super empty, so there's nothing to return. 1303284 7 bdakin 2017-05-01 10:37:18 -0700 https://trac.webkit.org/changeset/216018/webkit 308602 2017-04-28 15:31:25 -0700 2017-04-28 16:32:52 -0700 Patch for-review.txt text/plain 4107 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNTk1MCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE3LTA0LTI4ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBPbi1zY3JlZW4gcGFuZWwgZm9yIGNh bmRpZGF0ZSBiYXIgaXMgaW4gdGhlIHdyb25nIHBsYWNlIHdoZW4gdGhlIGNhcmV0IGlzIGF0IHRo ZSAKKyAgICAgICAgc3RhcnQgb2YgYSBwYXJhZ3JhcGgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MTQ1MworICAgICAgICAtYW5kIGNvcnJlc3BvbmRp bmctCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzI5Nzc5NzY0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBidWcgb25seSBoYXBwZW5zIHdoZW4g dGhlIGNhcmV0IGlzIGF0IHRoZSBiZWdpbm5pbmcgb2YgdGhlIHBhcmFncmFwaCwgYW5kIGl0IAor ICAgICAgICBpcyBiZWNhdXNlIFJhbmdlOjphYnNvbHV0ZVRleHRRdWFkcygpIHJldHVybnMgbm8g cXVhZHMgaW4gdGhpcyBjYXNlLiBJIHRoaW5rIGl0IAorICAgICAgICBtaWdodCBiZSBjb3JyZWN0 IHRoYXQgYWJzb2x1dGVUZXh0UXVhZHMoKSByZXR1cm5zIG5vIHF1YWRzIGluIHRoaXMgY2FzZSwg c28gdGhpcyAKKyAgICAgICAgcGF0Y2ggZml4ZXMgdGhlIGJ1ZyBhdCB0aGUgY2FsbCBzaXRlIGJ5 IHVzaW5nIGFic29sdXRlQ2FyZXRCb3VuZHMoKSBpbiB0aGlzIGNhc2UuCisKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW06CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2U6OnBsYXRmb3JtRWRpdG9yU3RhdGUpOgorCiAyMDE3LTA0LTI4ICBBbmR5IEVzdGVzICA8 YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBbbWFjT1NdIFdlYlBsYXliYWNrQ29udHJvbHNN YW5hZ2VyIG5lZWRzIHRvIGtub3cgd2hlbiB0aGUgc2VsZWN0ZWQgdGV4dCBvciBhdWRpbyB0cmFj ayBjaGFuZ2VzCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dl YlBhZ2VNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL21hYy9XZWJQYWdlTWFjLm1tCShyZXZpc2lvbiAyMTU2ODgpCisrKyBTb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW0JKHdvcmtpbmcgY29weSkKQEAg LTE0OSw2ICsxNDksMTEgQEAgdm9pZCBXZWJQYWdlOjpwbGF0Zm9ybUVkaXRvclN0YXRlKEZyYW1l JgogICAgIHNlbGVjdGVkUmFuZ2UtPmFic29sdXRlVGV4dFF1YWRzKHF1YWRzKTsKICAgICBpZiAo IXF1YWRzLmlzRW1wdHkoKSkKICAgICAgICAgcG9zdExheW91dERhdGEuc2VsZWN0aW9uQ2xpcFJl Y3QgPSBmcmFtZS52aWV3KCktPmNvbnRlbnRzVG9XaW5kb3cocXVhZHNbMF0uZW5jbG9zaW5nQm91 bmRpbmdCb3goKSk7CisgICAgZWxzZSB7CisgICAgICAgIC8vIFJhbmdlOjphYnNvbHV0ZVRleHRR dWFkcygpIHdpbGwgYmUgZW1wdHkgYXQgdGhlIHN0YXJ0IG9mIGEgcGFyYWdyYXBoLgorICAgICAg ICBpZiAoc2VsZWN0aW9uLmlzQ2FyZXQoKSkKKyAgICAgICAgICAgIHBvc3RMYXlvdXREYXRhLnNl bGVjdGlvbkNsaXBSZWN0ID0gZnJhbWUudmlldygpLT5jb250ZW50c1RvV2luZG93KGZyYW1lLnNl bGVjdGlvbigpLmFic29sdXRlQ2FyZXRCb3VuZHMoKSk7CisgICAgfQogfQogCiB2b2lkIFdlYlBh Z2U6OmhhbmRsZUFjY2VwdGVkQ2FuZGlkYXRlKFdlYkNvcmU6OlRleHRDaGVja2luZ1Jlc3VsdCBh Y2NlcHRlZENhbmRpZGF0ZSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNTk1MCkK KysrIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDIxIEBACisyMDE3LTA0LTI4ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAg ICAgICBPbi1zY3JlZW4gcGFuZWwgZm9yIGNhbmRpZGF0ZSBiYXIgaXMgaW4gdGhlIHdyb25nIHBs YWNlIHdoZW4gdGhlIGNhcmV0IGlzIGF0IHRoZSAKKyAgICAgICAgc3RhcnQgb2YgYSBwYXJhZ3Jh cGgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MTQ1 MworICAgICAgICAtYW5kIGNvcnJlc3BvbmRpbmctCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzI5 Nzc5NzY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VGhpcyBidWcgb25seSBoYXBwZW5zIHdoZW4gdGhlIGNhcmV0IGlzIGF0IHRoZSBiZWdpbm5pbmcg b2YgdGhlIHBhcmFncmFwaCwgYW5kIGl0IAorICAgICAgICBpcyBiZWNhdXNlIFJhbmdlOjphYnNv bHV0ZVRleHRRdWFkcygpIHJldHVybnMgbm8gcXVhZHMgaW4gdGhpcyBjYXNlLiBJIHRoaW5rIGl0 IAorICAgICAgICBtaWdodCBiZSBjb3JyZWN0IHRoYXQgYWJzb2x1dGVUZXh0UXVhZHMoKSByZXR1 cm5zIG5vIHF1YWRzIGluIHRoaXMgY2FzZSwgc28gdGhpcyAKKyAgICAgICAgcGF0Y2ggZml4ZXMg dGhlIGJ1ZyBhdCB0aGUgY2FsbCBzaXRlIGJ5IHVzaW5nIGFic29sdXRlQ2FyZXRCb3VuZHMoKSBp biB0aGlzIGNhc2UuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJFZGl0b3JDbGllbnQu bW06CisgICAgICAgIChXZWJFZGl0b3JDbGllbnQ6OmhhbmRsZVJlcXVlc3RlZENhbmRpZGF0ZXMp OgorCiAyMDE3LTA0LTI4ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAg ICAgICBBZGRpbmcgYSBydW50aW1lIGZsYWcgc3BlY2lmaWMgdG8gTWVkaWFEZXZpY2VzCkluZGV4 OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJFZGl0b3JDbGllbnQubW0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRWRpdG9yQ2xp ZW50Lm1tCShyZXZpc2lvbiAyMTU2ODgpCisrKyBTb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3Vw cG9ydC9XZWJFZGl0b3JDbGllbnQubW0JKHdvcmtpbmcgY29weSkKQEAgLTEyNTEsNiArMTI1MSwx MSBAQCB2b2lkIFdlYkVkaXRvckNsaWVudDo6aGFuZGxlUmVxdWVzdGVkQ2FuCiAgICAgc2VsZWN0 ZWRSYW5nZS0+YWJzb2x1dGVUZXh0UXVhZHMocXVhZHMpOwogICAgIGlmICghcXVhZHMuaXNFbXB0 eSgpKQogICAgICAgICByZWN0Rm9yU2VsZWN0aW9uQ2FuZGlkYXRlcyA9IGZyYW1lLT52aWV3KCkt PmNvbnRlbnRzVG9XaW5kb3cocXVhZHNbMF0uZW5jbG9zaW5nQm91bmRpbmdCb3goKSk7CisgICAg ZWxzZSB7CisgICAgICAgIC8vIFJhbmdlOjphYnNvbHV0ZVRleHRRdWFkcygpIHdpbGwgYmUgZW1w dHkgYXQgdGhlIHN0YXJ0IG9mIGEgcGFyYWdyYXBoLgorICAgICAgICBpZiAoc2VsZWN0aW9uLmlz Q2FyZXQoKSkKKyAgICAgICAgICAgIHJlY3RGb3JTZWxlY3Rpb25DYW5kaWRhdGVzID0gZnJhbWUt PnZpZXcoKS0+Y29udGVudHNUb1dpbmRvdyhmcmFtZS0+c2VsZWN0aW9uKCkuYWJzb2x1dGVDYXJl dEJvdW5kcygpKTsKKyAgICB9CiAKICAgICBbbV93ZWJWaWV3IHNob3dDYW5kaWRhdGVzOmNhbmRp ZGF0ZXMgZm9yU3RyaW5nOm1fcGFyYWdyYXBoQ29udGV4dEZvckNhbmRpZGF0ZVJlcXVlc3QuZ2V0 KCkgaW5SZWN0OnJlY3RGb3JTZWxlY3Rpb25DYW5kaWRhdGVzIGZvclNlbGVjdGVkUmFuZ2U6bV9y YW5nZUZvckNhbmRpZGF0ZXMgdmlldzptX3dlYlZpZXcgY29tcGxldGlvbkhhbmRsZXI6bmlsXTsK IH0K 308613 2017-04-28 16:32:52 -0700 2017-04-28 16:34:17 -0700 Patch+test for-review-2.txt text/plain 7333 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNTk1NCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE3LTA0LTI4ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBPbi1zY3JlZW4gcGFuZWwgZm9yIGNh bmRpZGF0ZSBiYXIgaXMgaW4gdGhlIHdyb25nIHBsYWNlIHdoZW4gdGhlIGNhcmV0IGlzIGF0IHRo ZSAKKyAgICAgICAgc3RhcnQgb2YgYSBwYXJhZ3JhcGgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MTQ1MworICAgICAgICAtYW5kIGNvcnJlc3BvbmRp bmctCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzI5Nzc5NzY0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBidWcgb25seSBoYXBwZW5zIHdoZW4g dGhlIGNhcmV0IGlzIGF0IHRoZSBiZWdpbm5pbmcgb2YgdGhlIHBhcmFncmFwaCwgYW5kIGl0IAor ICAgICAgICBpcyBiZWNhdXNlIFJhbmdlOjphYnNvbHV0ZVRleHRRdWFkcygpIHJldHVybnMgbm8g cXVhZHMgaW4gdGhpcyBjYXNlLiBJIHRoaW5rIGl0IAorICAgICAgICBtaWdodCBiZSBjb3JyZWN0 IHRoYXQgYWJzb2x1dGVUZXh0UXVhZHMoKSByZXR1cm5zIG5vIHF1YWRzIGluIHRoaXMgY2FzZSwg c28gdGhpcyAKKyAgICAgICAgcGF0Y2ggZml4ZXMgdGhlIGJ1ZyBhdCB0aGUgY2FsbCBzaXRlIGJ5 IHVzaW5nIGFic29sdXRlQ2FyZXRCb3VuZHMoKSBpbiB0aGlzIGNhc2UuCisKKyAgICAgICAgU1BJ IGZvciB0ZXN0aW5nLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1t OgorICAgICAgICAoLVtXS1dlYlZpZXcgX2NhbmRpZGF0ZVJlY3RdKToKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaDoKKworICAgICAgICBCdWcgZml4Lgor ICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbToKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZTo6cGxhdGZvcm1FZGl0b3JTdGF0ZSk6CisKIDIwMTctMDQtMjggIENo cmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBXZSBzaG91bGQg bm90IHRha2UgYSBiYWNrZ3JvdW5kIGFzc2VydGlvbiBmb3IgdGhlIFVJUHJvY2VzcyB3aGVuIGFw cCBpcyBNb2JpbGVNYWlsCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29h L1dLV2ViVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0NvY29hL1dLV2ViVmlldy5tbQkocmV2aXNpb24gMjE1Njg4KQorKysgU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTUzNDAs NiArNTM0MCwxMSBAQCAtICh2b2lkKV9pbnNlcnRUZXh0OihpZClzdHJpbmcgcmVwbGFjZW1lCiAg ICAgW3NlbGYgaW5zZXJ0VGV4dDpzdHJpbmcgcmVwbGFjZW1lbnRSYW5nZTpyZXBsYWNlbWVudFJh bmdlXTsKIH0KIAorLSAoTlNSZWN0KV9jYW5kaWRhdGVSZWN0Cit7CisgICAgcmV0dXJuIF9wYWdl LT5lZGl0b3JTdGF0ZSgpLnBvc3RMYXlvdXREYXRhKCkuc2VsZWN0aW9uQ2xpcFJlY3Q7Cit9CisK IC0gKHZvaWQpX3NldEhlYWRlckJhbm5lckhlaWdodDooaW50KWhlaWdodAogewogICAgIF9wYWdl LT5zZXRIZWFkZXJCYW5uZXJIZWlnaHRGb3JUZXN0aW5nKGhlaWdodCk7CkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUu aAkocmV2aXNpb24gMjE1Njg4KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYlZpZXdQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTM1Nyw2ICszNTcsNyBAQCB0 eXBlZGVmIE5TX0VOVU0oTlNJbnRlZ2VyLCBfV0tJbW1lZGlhdGVBCiAtICh2b2lkKV9kaWRVcGRh dGVDYW5kaWRhdGVMaXN0VmlzaWJpbGl0eTooQk9PTCl2aXNpYmxlIFdLX0FQSV9BVkFJTEFCTEUo bWFjb3N4KFdLX01BQ19UQkEpKTsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSkgQk9P TCBfc2hvdWxkUmVxdWVzdENhbmRpZGF0ZXMgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goV0tfTUFD X1RCQSkpOwogLSAodm9pZClfaW5zZXJ0VGV4dDooaWQpc3RyaW5nIHJlcGxhY2VtZW50UmFuZ2U6 KE5TUmFuZ2UpcmVwbGFjZW1lbnRSYW5nZSBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNf VEJBKSk7CistIChOU1JlY3QpX2NhbmRpZGF0ZVJlY3QgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3go V0tfTUFDX1RCQSkpOwogCiAtICh2b2lkKV9zZXRIZWFkZXJCYW5uZXJIZWlnaHQ6KGludCloZWln aHQgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSkpOwogLSAodm9pZClfc2V0Rm9v dGVyQmFubmVySGVpZ2h0OihpbnQpaGVpZ2h0IFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KFdLX01B Q19UQkEpKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV2Vi UGFnZU1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvbWFjL1dlYlBhZ2VNYWMubW0JKHJldmlzaW9uIDIxNTY4OCkKKysrIFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAt MTQ5LDYgKzE0OSwxMSBAQCB2b2lkIFdlYlBhZ2U6OnBsYXRmb3JtRWRpdG9yU3RhdGUoRnJhbWUm CiAgICAgc2VsZWN0ZWRSYW5nZS0+YWJzb2x1dGVUZXh0UXVhZHMocXVhZHMpOwogICAgIGlmICgh cXVhZHMuaXNFbXB0eSgpKQogICAgICAgICBwb3N0TGF5b3V0RGF0YS5zZWxlY3Rpb25DbGlwUmVj dCA9IGZyYW1lLnZpZXcoKS0+Y29udGVudHNUb1dpbmRvdyhxdWFkc1swXS5lbmNsb3NpbmdCb3Vu ZGluZ0JveCgpKTsKKyAgICBlbHNlIHsKKyAgICAgICAgLy8gUmFuZ2U6OmFic29sdXRlVGV4dFF1 YWRzKCkgd2lsbCBiZSBlbXB0eSBhdCB0aGUgc3RhcnQgb2YgYSBwYXJhZ3JhcGguCisgICAgICAg IGlmIChzZWxlY3Rpb24uaXNDYXJldCgpKQorICAgICAgICAgICAgcG9zdExheW91dERhdGEuc2Vs ZWN0aW9uQ2xpcFJlY3QgPSBmcmFtZS52aWV3KCktPmNvbnRlbnRzVG9XaW5kb3coZnJhbWUuc2Vs ZWN0aW9uKCkuYWJzb2x1dGVDYXJldEJvdW5kcygpKTsKKyAgICB9CiB9CiAKIHZvaWQgV2ViUGFn ZTo6aGFuZGxlQWNjZXB0ZWRDYW5kaWRhdGUoV2ViQ29yZTo6VGV4dENoZWNraW5nUmVzdWx0IGFj Y2VwdGVkQ2FuZGlkYXRlKQpJbmRleDogU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkocmV2aXNpb24gMjE1OTUwKQor KysgU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEs MjEgQEAKKzIwMTctMDQtMjggIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgorCisgICAg ICAgIE9uLXNjcmVlbiBwYW5lbCBmb3IgY2FuZGlkYXRlIGJhciBpcyBpbiB0aGUgd3JvbmcgcGxh Y2Ugd2hlbiB0aGUgY2FyZXQgaXMgYXQgdGhlIAorICAgICAgICBzdGFydCBvZiBhIHBhcmFncmFw aAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcxNDUz CisgICAgICAgIC1hbmQgY29ycmVzcG9uZGluZy0KKyAgICAgICAgcmRhcjovL3Byb2JsZW0vMjk3 Nzk3NjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGlzIGJ1ZyBvbmx5IGhhcHBlbnMgd2hlbiB0aGUgY2FyZXQgaXMgYXQgdGhlIGJlZ2lubmluZyBv ZiB0aGUgcGFyYWdyYXBoLCBhbmQgaXQgCisgICAgICAgIGlzIGJlY2F1c2UgUmFuZ2U6OmFic29s dXRlVGV4dFF1YWRzKCkgcmV0dXJucyBubyBxdWFkcyBpbiB0aGlzIGNhc2UuIEkgdGhpbmsgaXQg CisgICAgICAgIG1pZ2h0IGJlIGNvcnJlY3QgdGhhdCBhYnNvbHV0ZVRleHRRdWFkcygpIHJldHVy bnMgbm8gcXVhZHMgaW4gdGhpcyBjYXNlLCBzbyB0aGlzIAorICAgICAgICBwYXRjaCBmaXhlcyB0 aGUgYnVnIGF0IHRoZSBjYWxsIHNpdGUgYnkgdXNpbmcgYWJzb2x1dGVDYXJldEJvdW5kcygpIGlu IHRoaXMgY2FzZS4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5t bToKKyAgICAgICAgKFdlYkVkaXRvckNsaWVudDo6aGFuZGxlUmVxdWVzdGVkQ2FuZGlkYXRlcyk6 CisKIDIwMTctMDQtMjggIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAg ICAgIEFkZGluZyBhIHJ1bnRpbWUgZmxhZyBzcGVjaWZpYyB0byBNZWRpYURldmljZXMKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJFZGl0b3JDbGll bnQubW0JKHJldmlzaW9uIDIxNTY4OCkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBw b3J0L1dlYkVkaXRvckNsaWVudC5tbQkod29ya2luZyBjb3B5KQpAQCAtMTI1MSw2ICsxMjUxLDEx IEBAIHZvaWQgV2ViRWRpdG9yQ2xpZW50OjpoYW5kbGVSZXF1ZXN0ZWRDYW4KICAgICBzZWxlY3Rl ZFJhbmdlLT5hYnNvbHV0ZVRleHRRdWFkcyhxdWFkcyk7CiAgICAgaWYgKCFxdWFkcy5pc0VtcHR5 KCkpCiAgICAgICAgIHJlY3RGb3JTZWxlY3Rpb25DYW5kaWRhdGVzID0gZnJhbWUtPnZpZXcoKS0+ Y29udGVudHNUb1dpbmRvdyhxdWFkc1swXS5lbmNsb3NpbmdCb3VuZGluZ0JveCgpKTsKKyAgICBl bHNlIHsKKyAgICAgICAgLy8gUmFuZ2U6OmFic29sdXRlVGV4dFF1YWRzKCkgd2lsbCBiZSBlbXB0 eSBhdCB0aGUgc3RhcnQgb2YgYSBwYXJhZ3JhcGguCisgICAgICAgIGlmIChzZWxlY3Rpb24uaXND YXJldCgpKQorICAgICAgICAgICAgcmVjdEZvclNlbGVjdGlvbkNhbmRpZGF0ZXMgPSBmcmFtZS0+ dmlldygpLT5jb250ZW50c1RvV2luZG93KGZyYW1lLT5zZWxlY3Rpb24oKS5hYnNvbHV0ZUNhcmV0 Qm91bmRzKCkpOworICAgIH0KIAogICAgIFttX3dlYlZpZXcgc2hvd0NhbmRpZGF0ZXM6Y2FuZGlk YXRlcyBmb3JTdHJpbmc6bV9wYXJhZ3JhcGhDb250ZXh0Rm9yQ2FuZGlkYXRlUmVxdWVzdC5nZXQo KSBpblJlY3Q6cmVjdEZvclNlbGVjdGlvbkNhbmRpZGF0ZXMgZm9yU2VsZWN0ZWRSYW5nZTptX3Jh bmdlRm9yQ2FuZGlkYXRlcyB2aWV3Om1fd2ViVmlldyBjb21wbGV0aW9uSGFuZGxlcjpuaWxdOwog fQpJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwko cmV2aXNpb24gMjE1OTU0KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0x LDMgKzEsMTcgQEAKKzIwMTctMDQtMjggIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgor CisgICAgICAgIE9uLXNjcmVlbiBwYW5lbCBmb3IgY2FuZGlkYXRlIGJhciBpcyBpbiB0aGUgd3Jv bmcgcGxhY2Ugd2hlbiB0aGUgY2FyZXQgaXMgYXQgdGhlIAorICAgICAgICBzdGFydCBvZiBhIHBh cmFncmFwaAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTcxNDUzCisgICAgICAgIC1hbmQgY29ycmVzcG9uZGluZy0KKyAgICAgICAgcmRhcjovL3Byb2Js ZW0vMjk3Nzk3NjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBUaGlzIHRlc3QgaGFyZC1jb2RlcyB0aGUgeS1jb29yZGluYXRlIGZvciB0aGUgZXhwZWN0 ZWQgY2FuZGlkYXRlUmVjdC4gCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQy Q29jb2EvV0tXZWJWaWV3Q2FuZGlkYXRlVGVzdHMubW06CisgICAgICAgIChURVNUKToKKwogMjAx Ny0wNC0yOCAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAg VW5yZXZpZXdlZCBmb2xsb3ctdXAgdG8gcjIxNDcwNS4KSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0MkNvY29hL1dLV2ViVmlld0NhbmRpZGF0ZVRlc3RzLm1tCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0MkNvY29hL1dLV2ViVmlld0Nh bmRpZGF0ZVRlc3RzLm1tCShyZXZpc2lvbiAyMTU2ODgpCisrKyBUb29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdDJDb2NvYS9XS1dlYlZpZXdDYW5kaWRhdGVUZXN0cy5tbQkod29ya2luZyBj b3B5KQpAQCAtMjQzLDQgKzI0MywxMSBAQCBURVNUKFdLV2ViVmlld0NhbmRpZGF0ZVRlc3RzLCBT aG91bGRSZXF1CiAKICNlbmRpZgogCitURVNUKFdLV2ViVmlld0NhbmRpZGF0ZVRlc3RzLCBDYW5k aWRhdGVSZWN0Rm9yRW1wdHlQYXJhZ3JhcGgpCit7CisgICAgQ2FuZGlkYXRlVGVzdFdlYlZpZXcg KndrV2ViVmlldyA9IFtDYW5kaWRhdGVUZXN0V2ViVmlldyBzZXRVcFdpdGhGcmFtZTpOU01ha2VS ZWN0KDAsIDAsIDgwMCwgNjAwKSB0ZXN0UGFnZTpAImlucHV0LWZpZWxkLWluLXNjcm9sbGFibGUt ZG9jdW1lbnQiXTsKKyAgICBOU1JlY3QgY2FuZGlkYXRlUmVjdCA9IFt3a1dlYlZpZXcgX2NhbmRp ZGF0ZVJlY3RdOworICAgIEVYUEVDVF9FUSgxOTQsIGNhbmRpZGF0ZVJlY3Qub3JpZ2luLnkpOwor fQorCiAjZW5kaWYgLyogV0tfQVBJX0VOQUJMRUQgJiYgUExBVEZPUk0oTUFDKSAmJiBfX01BQ19P U19YX1ZFUlNJT05fTUFYX0FMTE9XRUQgPj0gMTAxMjAxICovCg==