141210 2015-02-03 13:55:56 -0800 [iOS] Selection Callout should not immediately disappear on pages with frequent layouts 2015-02-03 18:09:48 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck benjamin commit-queue enrica joepeck mitz oldest_to_newest 1066556 0 joepeck 2015-02-03 13:55:56 -0800 * SUMMARY Selection Callout should not immediately disappear on pages with frequent layouts. At the same time, the caret should be blinking, instead of staying constant blue. * STEPS TO REPRODUCE 1. Load http://archive.org/web/ 2. Focus text field 3. Attempt to paste => callout dismisses immediately after showing * NOTES - JavaScript animation is triggering layout -> triggers selection update -> dismisses callout and re-updates caret 1066558 1 mitz 2015-02-03 14:00:20 -0800 rdar://problem/18301801 1066560 2 245966 joepeck 2015-02-03 14:06:04 -0800 Created attachment 245966 [PATCH] Proposed Fix Not really sure if there is a way to test this. Any pointers? 1066561 3 commit-queue 2015-02-03 14:08:28 -0800 Attachment 245966 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h:78: The parameter name "editorState" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1066582 4 245972 joepeck 2015-02-03 15:10:02 -0800 Created attachment 245972 [PATCH] Proposed Fix Fixed style. 1066591 5 245966 enrica 2015-02-03 15:15:07 -0800 Comment on attachment 245966 [PATCH] Proposed Fix The patch looks good.I'm assuming you tested zooming on a page where a field is focused. Please check the windows build failure before submitting. 1066592 6 245966 enrica 2015-02-03 15:15:52 -0800 Comment on attachment 245966 [PATCH] Proposed Fix The patch looks good.I'm assuming you tested zooming on a page where a field is focused. Please check the windows build failure before submitting. 1066602 7 joepeck 2015-02-03 15:33:03 -0800 (In reply to comment #6) > Comment on attachment 245966 [details] > [PATCH] Proposed Fix > > The patch looks good.I'm assuming you tested zooming on a page where a field > is focused. Yep, testing zooming is exactly why there is the force path. > Please check the windows build failure before submitting. This patch doesn't modify anything for Windows, so I'll assume it was just a passing thing. 1066635 8 245972 commit-queue 2015-02-03 16:18:46 -0800 Comment on attachment 245972 [PATCH] Proposed Fix Clearing flags on attachment: 245972 Committed r179578: <http://trac.webkit.org/changeset/179578> 1066636 9 commit-queue 2015-02-03 16:18:49 -0800 All reviewed patches have been landed. Closing bug. 1066690 10 245972 sam 2015-02-03 18:09:48 -0800 Comment on attachment 245972 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=245972&action=review > Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h:75 > +struct WKSelectionDrawingInfo { This does not need, and should not have, a WK prefix. I realize there is a counter example right below, but that is wrong. > Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h:76 > + enum class SelectionType { None, Plugin, Range }; We usually put this on multiple lines. > Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h:81 > + WKSelectionDrawingInfo(); > + explicit WKSelectionDrawingInfo(const EditorState&); > + SelectionType type; > + WebCore::IntRect caretRect; > + Vector<WebCore::SelectionRect> selectionRects; This would read nicer if you put a space between the constructors and the members. 245966 2015-02-03 14:06:04 -0800 2015-02-03 15:15:07 -0800 [PATCH] Proposed Fix selection.patch text/plain 6475 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAxMjIzYjEzLi41ODdiNGNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzgg QEAKKzIwMTUtMDItMDMgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwor ICAgICAgICBbaU9TXSBTZWxlY3Rpb24gQ2FsbG91dCBzaG91bGQgbm90IGltbWVkaWF0ZWx5IGRp c2FwcGVhciBvbiBwYWdlcyB3aXRoIGZyZXF1ZW50IGxheW91dHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MTIxMAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIGlPUyBXZWJLaXQyIGluIG9yZGVyIHRv IGtlZXAgY2FyZXQgcmVmcmVzaGVzIGluIHN5bmMgd2l0aCBXZWJDb3JlIGxheW91dHMKKyAgICAg ICAgdGhlIHNlbGVjdGlvbiBhc3Npc3RhbnQgaXMgdG9sZCB0byB1cGRhdGUgd2hlbmV2ZXIgV2Vi S2l0J3MgbGF5ZXIgdHJlZQorICAgICAgICBjb21taXRzLiBVbmZvcnR1bmF0ZWx5LCBmb3IgcGFn ZXMgd2l0aCBKYXZhU2NyaXB0IGFuaW1hdGlvbiB0aGF0IGFyZQorICAgICAgICBmcmVxdWVudGx5 IGRvaW5nIGEgbGF5b3V0IC8gbGF5ZXIgdHJlZSB1cGRhdGUsIHRoaXMgd291bGQgdHJpZ2dlciB2 ZXJ5CisgICAgICAgIGZyZXF1ZW50IHNlbGVjdGlvbiB1cGRhdGVzIHRoYXQgd291bGQga2VlcCB0 aGUgY2FyZXQgZnJvbSBibGlua2luZyBhbmQKKyAgICAgICAgZGlzbWlzcyBhbnkgc2VsZWN0aW9u IGNhbGxvdXRzLgorCisgICAgICAgIFRoaXMgY2hhbmdlIHRyYWNrcyB0aGUgbGFzdCBzZWxlY3Rp b24gZHJhd2luZyBpbmZvcm1hdGlvbiBzbyB0aGF0IHdlIGNhbgorICAgICAgICBhdm9pZCBpbmZv cm1pbmcgdGhlIGFzc2lzdGFudCBvZiBhIHNlbGVjdGlvbiB1cGRhdGVzIHVubGVzcyBpdCBoYXMg Y2hhbmdlZAorICAgICAgICB2aXN1YWxseSBvciBuZWVkcyB0byByZWRyYXcgKHpvb20pLgorCisg ICAgICAgICogU2hhcmVkL0VkaXRvclN0YXRlLmNwcDoKKyAgICAgICAgUmVtb3ZlIGluY2x1ZGUg YWxyZWFkeSBpbiBoZWFkZXIuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXdJbnRlcmFjdGlvbi5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0lu dGVyYWN0aW9uLm1tOgorICAgICAgICAoV2ViS2l0OjpXS1NlbGVjdGlvbkRyYXdpbmdJbmZvOjpX S1NlbGVjdGlvbkRyYXdpbmdJbmZvKToKKyAgICAgICAgKFdlYktpdDo6b3BlcmF0b3I9PSk6Cisg ICAgICAgIChXZWJLaXQ6Om9wZXJhdG9yIT0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IG9i c2VydmVWYWx1ZUZvcktleVBhdGg6b2ZPYmplY3Q6Y2hhbmdlOmNvbnRleHQ6XSk6CisgICAgICAg IFdoZW4gem9vbWluZywgZm9yY2UgdGhlIHNlbGVjdGlvbiB1cGRhdGUsIGV2ZW4gdGhvdWdoIHRo ZSBkcmF3aW5nCisgICAgICAgIGluZm9ybWF0aW9uIGhhc24ndCBjaGFuZ2VkLCB0aGUgdmlld3Mg d2lsbCBuZWVkIHRvIGJlIHVwZGF0ZWQuCisKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfdXBk YXRlQ2hhbmdlZFNlbGVjdGlvbl0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF91cGRhdGVD aGFuZ2VkU2VsZWN0aW9uOl0pOgorICAgICAgICBNb25pdG9yIEVkaXRvclN0YXRlIGZvciBjaGFu Z2VzIGluIHNlbGVjdGlvbiBkcmF3aW5nIGFuZCBhdm9pZAorICAgICAgICBpbmZvcm1pbmcgdGhl IHNlbGVjdGlvbiBhc3Npc3RhbnQgdW5sZXNzIG5lY2Vzc2FyeS4KKwogMjAxNS0wMi0wMyAgQW50 dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgTWVtb3J5IGNhY2hlIGZv ciByZXNvdXJjZXMgcGVuZGluZyBkaXNrIHdyaXRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvRWRpdG9yU3RhdGUuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0VkaXRvclN0 YXRlLmNwcAppbmRleCA2MTljZmJhLi45YmMwYjhmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvRWRpdG9yU3RhdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9FZGl0 b3JTdGF0ZS5jcHAKQEAgLTI5LDEwICsyOSw2IEBACiAjaW5jbHVkZSAiQXJndW1lbnRzLmgiCiAj aW5jbHVkZSAiV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmgiCiAKLSNpZiBQTEFURk9STShJT1MpCi0j aW5jbHVkZSA8V2ViQ29yZS9TZWxlY3Rpb25SZWN0Lmg+Ci0jZW5kaWYKLQogbmFtZXNwYWNlIFdl YktpdCB7CiAKIHZvaWQgRWRpdG9yU3RhdGU6OmVuY29kZShJUEM6OkFyZ3VtZW50RW5jb2RlciYg ZW5jb2RlcikgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3Mv V0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9z L1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oCmluZGV4IGIyMTkxNDAuLmYyNGU4ZTcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50 ZXJhY3Rpb24uaApAQCAtMjgsNiArMjgsNyBAQAogI2ltcG9ydCAiV0tDb250ZW50Vmlldy5oIgog CiAjaW1wb3J0ICJBc3Npc3RlZE5vZGVJbmZvcm1hdGlvbi5oIgorI2ltcG9ydCAiRWRpdG9yU3Rh dGUuaCIKICNpbXBvcnQgIkdlc3R1cmVUeXBlcy5oIgogI2ltcG9ydCAiSW50ZXJhY3Rpb25JbmZv cm1hdGlvbkF0UG9zaXRpb24uaCIKICNpbXBvcnQgIlVJS2l0U1BJLmgiCkBAIC03MSw2ICs3Miwx NCBAQCB0eXBlZGVmIHZvaWQgKF5VSVdLU2VsZWN0aW9uQ29tcGxldGlvbkhhbmRsZXIpKHZvaWQp OwogdHlwZWRlZiB2b2lkICheVUlXS1NlbGVjdGlvbldpdGhEaXJlY3Rpb25Db21wbGV0aW9uSGFu ZGxlcikoQk9PTCBzZWxlY3Rpb25FbmRJc01vdmluZyk7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewor c3RydWN0IFdLU2VsZWN0aW9uRHJhd2luZ0luZm8geworICAgIGVudW0gY2xhc3MgU2VsZWN0aW9u VHlwZSB7IE5vbmUsIFBsdWdpbiwgUmFuZ2UgfTsKKyAgICBXS1NlbGVjdGlvbkRyYXdpbmdJbmZv KCk7CisgICAgZXhwbGljaXQgV0tTZWxlY3Rpb25EcmF3aW5nSW5mbyhjb25zdCBFZGl0b3JTdGF0 ZSYgZWRpdG9yU3RhdGUpOworICAgIFNlbGVjdGlvblR5cGUgdHlwZTsKKyAgICBXZWJDb3JlOjpJ bnRSZWN0IGNhcmV0UmVjdDsKKyAgICBWZWN0b3I8V2ViQ29yZTo6U2VsZWN0aW9uUmVjdD4gc2Vs ZWN0aW9uUmVjdHM7Cit9Owogc3RydWN0IFdLQXV0b0NvcnJlY3Rpb25EYXRhIHsKICAgICBTdHJp bmcgZm9udE5hbWU7CiAgICAgQ0dGbG9hdCBmb250U2l6ZTsKQEAgLTEyOSw2ICsxMzgsOCBAQCBz dHJ1Y3QgV0tBdXRvQ29ycmVjdGlvbkRhdGEgewogCiAgICAgQ0dQb2ludCBfbGFzdEludGVyYWN0 aW9uTG9jYXRpb247CiAKKyAgICBXZWJLaXQ6OldLU2VsZWN0aW9uRHJhd2luZ0luZm8gX2xhc3RT ZWxlY3Rpb25EcmF3aW5nSW5mbzsKKwogICAgIEJPT0wgX2lzRWRpdGFibGU7CiAgICAgQk9PTCBf c2hvd2luZ1RleHRTdHlsZU9wdGlvbnM7CiAgICAgQk9PTCBfaGFzVmFsaWRQb3NpdGlvbkluZm9y bWF0aW9uOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRl bnRWaWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29u dGVudFZpZXdJbnRlcmFjdGlvbi5tbQppbmRleCAyYjAzMDM2Li5jYWRmZTJkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5t bQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFj dGlvbi5tbQpAQCAtNjUsNiArNjUsNTggQEAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogdXNp bmcgbmFtZXNwYWNlIFdlYktpdDsKIAorbmFtZXNwYWNlIFdlYktpdCB7CisKK1dLU2VsZWN0aW9u RHJhd2luZ0luZm86OldLU2VsZWN0aW9uRHJhd2luZ0luZm8oKQorICAgIDogdHlwZShTZWxlY3Rp b25UeXBlOjpOb25lKQoreworfQorCitXS1NlbGVjdGlvbkRyYXdpbmdJbmZvOjpXS1NlbGVjdGlv bkRyYXdpbmdJbmZvKGNvbnN0IEVkaXRvclN0YXRlJiBlZGl0b3JTdGF0ZSkKK3sKKyAgICBpZiAo ZWRpdG9yU3RhdGUuc2VsZWN0aW9uSXNOb25lKSB7CisgICAgICAgIHR5cGUgPSBTZWxlY3Rpb25U eXBlOjpOb25lOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKGVkaXRvclN0YXRl LmlzSW5QbHVnaW4pIHsKKyAgICAgICAgdHlwZSA9IFNlbGVjdGlvblR5cGU6OlBsdWdpbjsKKyAg ICAgICAgcmV0dXJuOworICAgIH0KKworICAgIHR5cGUgPSBTZWxlY3Rpb25UeXBlOjpSYW5nZTsK KyAgICBjYXJldFJlY3QgPSBlZGl0b3JTdGF0ZS5jYXJldFJlY3RBdEVuZDsKKyAgICBzZWxlY3Rp b25SZWN0cyA9IGVkaXRvclN0YXRlLnNlbGVjdGlvblJlY3RzOworfQorCitpbmxpbmUgYm9vbCBv cGVyYXRvcj09KGNvbnN0IFdLU2VsZWN0aW9uRHJhd2luZ0luZm8mIGEsIGNvbnN0IFdLU2VsZWN0 aW9uRHJhd2luZ0luZm8mIGIpCit7CisgICAgaWYgKGEudHlwZSAhPSBiLnR5cGUpCisgICAgICAg IHJldHVybiBmYWxzZTsKKworICAgIGlmIChhLnR5cGUgPT0gV0tTZWxlY3Rpb25EcmF3aW5nSW5m bzo6U2VsZWN0aW9uVHlwZTo6UmFuZ2UpIHsKKyAgICAgICAgaWYgKGEuY2FyZXRSZWN0ICE9IGIu Y2FyZXRSZWN0KQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgICAgIGlmIChhLnNl bGVjdGlvblJlY3RzLnNpemUoKSAhPSBiLnNlbGVjdGlvblJlY3RzLnNpemUoKSkKKyAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgYS5z ZWxlY3Rpb25SZWN0cy5zaXplKCk7ICsraSkgeworICAgICAgICAgICAgaWYgKGEuc2VsZWN0aW9u UmVjdHNbaV0ucmVjdCgpICE9IGIuc2VsZWN0aW9uUmVjdHNbaV0ucmVjdCgpKQorICAgICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorICAgIH0KKworICAgIHJldHVybiB0cnVl OworfQorCitpbmxpbmUgYm9vbCBvcGVyYXRvciE9KGNvbnN0IFdLU2VsZWN0aW9uRHJhd2luZ0lu Zm8mIGEsIGNvbnN0IFdLU2VsZWN0aW9uRHJhd2luZ0luZm8mIGIpCit7CisgICAgcmV0dXJuICEo YSA9PSBiKTsKK30KKworfSAvLyBuYW1lc3BhY2UgV2ViS2l0CisKIHN0YXRpYyBjb25zdCBmbG9h dCBoaWdobGlnaHREZWxheSA9IDAuMTI7CiBzdGF0aWMgY29uc3QgZmxvYXQgdGFwQW5kSG9sZERl bGF5ICA9IDAuNzU7CiBjb25zdCBDR0Zsb2F0IG1pbmltdW1UYXBIaWdobGlnaHRSYWRpdXMgPSAy LjA7CkBAIC0zODIsNyArNDM0LDcgQEAgc3RhdGljIFVJV2ViU2VsZWN0aW9uTW9kZSB0b1VJV2Vi U2VsZWN0aW9uTW9kZShXS1NlbGVjdGlvbkdyYW51bGFyaXR5IGdyYW51bGFyaXQKICAgICB9CiAK ICAgICBfc2VsZWN0aW9uTmVlZHNVcGRhdGUgPSBZRVM7Ci0gICAgW3NlbGYgX3VwZGF0ZUNoYW5n ZWRTZWxlY3Rpb25dOworICAgIFtzZWxmIF91cGRhdGVDaGFuZ2VkU2VsZWN0aW9uOllFU107CiAg ICAgW3NlbGYgX3VwZGF0ZVRhcEhpZ2hsaWdodF07CiB9CiAKQEAgLTI3NTUsOSArMjgwNywyMCBA QCBzdGF0aWMgVUlUZXh0QXV0b2NhcGl0YWxpemF0aW9uVHlwZSB0b1VJVGV4dEF1dG9jYXBpdGFs aXplKFdlYkF1dG9jYXBpdGFsaXplVHlwZQogCiAtICh2b2lkKV91cGRhdGVDaGFuZ2VkU2VsZWN0 aW9uCiB7CisgICAgW3NlbGYgX3VwZGF0ZUNoYW5nZWRTZWxlY3Rpb246Tk9dOworfQorCistICh2 b2lkKV91cGRhdGVDaGFuZ2VkU2VsZWN0aW9uOihCT09MKWZvcmNlCit7CiAgICAgaWYgKCFfc2Vs ZWN0aW9uTmVlZHNVcGRhdGUpCiAgICAgICAgIHJldHVybjsKIAorICAgIFdLU2VsZWN0aW9uRHJh d2luZ0luZm8gc2VsZWN0aW9uRHJhd2luZ0luZm8oX3BhZ2UtPmVkaXRvclN0YXRlKCkpOworICAg IGlmICghZm9yY2UgJiYgc2VsZWN0aW9uRHJhd2luZ0luZm8gPT0gX2xhc3RTZWxlY3Rpb25EcmF3 aW5nSW5mbykKKyAgICAgICAgcmV0dXJuOworCisgICAgX2xhc3RTZWxlY3Rpb25EcmF3aW5nSW5m byA9IHNlbGVjdGlvbkRyYXdpbmdJbmZvOworCiAgICAgLy8gRklYTUU6IFdlIG5lZWQgdG8gZmln dXJlIG91dCB3aGF0IHRvIGRvIGlmIHRoZSBzZWxlY3Rpb24gaXMgY2hhbmdlZCBieSBKYXZhc2Ny aXB0LgogICAgIGlmIChfdGV4dFNlbGVjdGlvbkFzc2lzdGFudCkgewogICAgICAgICBfbWFya2Vk VGV4dCA9IChfcGFnZS0+ZWRpdG9yU3RhdGUoKS5oYXNDb21wb3NpdGlvbikgPyBfcGFnZS0+ZWRp dG9yU3RhdGUoKS5tYXJrZWRUZXh0IDogU3RyaW5nKCk7Cg== 245972 2015-02-03 15:10:02 -0800 2015-02-03 16:18:46 -0800 [PATCH] Proposed Fix style-fix.patch text/plain 6463 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAxMjIzYjEzLi41ODdiNGNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzgg QEAKKzIwMTUtMDItMDMgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwor ICAgICAgICBbaU9TXSBTZWxlY3Rpb24gQ2FsbG91dCBzaG91bGQgbm90IGltbWVkaWF0ZWx5IGRp c2FwcGVhciBvbiBwYWdlcyB3aXRoIGZyZXF1ZW50IGxheW91dHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MTIxMAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIGlPUyBXZWJLaXQyIGluIG9yZGVyIHRv IGtlZXAgY2FyZXQgcmVmcmVzaGVzIGluIHN5bmMgd2l0aCBXZWJDb3JlIGxheW91dHMKKyAgICAg ICAgdGhlIHNlbGVjdGlvbiBhc3Npc3RhbnQgaXMgdG9sZCB0byB1cGRhdGUgd2hlbmV2ZXIgV2Vi S2l0J3MgbGF5ZXIgdHJlZQorICAgICAgICBjb21taXRzLiBVbmZvcnR1bmF0ZWx5LCBmb3IgcGFn ZXMgd2l0aCBKYXZhU2NyaXB0IGFuaW1hdGlvbiB0aGF0IGFyZQorICAgICAgICBmcmVxdWVudGx5 IGRvaW5nIGEgbGF5b3V0IC8gbGF5ZXIgdHJlZSB1cGRhdGUsIHRoaXMgd291bGQgdHJpZ2dlciB2 ZXJ5CisgICAgICAgIGZyZXF1ZW50IHNlbGVjdGlvbiB1cGRhdGVzIHRoYXQgd291bGQga2VlcCB0 aGUgY2FyZXQgZnJvbSBibGlua2luZyBhbmQKKyAgICAgICAgZGlzbWlzcyBhbnkgc2VsZWN0aW9u IGNhbGxvdXRzLgorCisgICAgICAgIFRoaXMgY2hhbmdlIHRyYWNrcyB0aGUgbGFzdCBzZWxlY3Rp b24gZHJhd2luZyBpbmZvcm1hdGlvbiBzbyB0aGF0IHdlIGNhbgorICAgICAgICBhdm9pZCBpbmZv cm1pbmcgdGhlIGFzc2lzdGFudCBvZiBhIHNlbGVjdGlvbiB1cGRhdGVzIHVubGVzcyBpdCBoYXMg Y2hhbmdlZAorICAgICAgICB2aXN1YWxseSBvciBuZWVkcyB0byByZWRyYXcgKHpvb20pLgorCisg ICAgICAgICogU2hhcmVkL0VkaXRvclN0YXRlLmNwcDoKKyAgICAgICAgUmVtb3ZlIGluY2x1ZGUg YWxyZWFkeSBpbiBoZWFkZXIuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXdJbnRlcmFjdGlvbi5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0lu dGVyYWN0aW9uLm1tOgorICAgICAgICAoV2ViS2l0OjpXS1NlbGVjdGlvbkRyYXdpbmdJbmZvOjpX S1NlbGVjdGlvbkRyYXdpbmdJbmZvKToKKyAgICAgICAgKFdlYktpdDo6b3BlcmF0b3I9PSk6Cisg ICAgICAgIChXZWJLaXQ6Om9wZXJhdG9yIT0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IG9i c2VydmVWYWx1ZUZvcktleVBhdGg6b2ZPYmplY3Q6Y2hhbmdlOmNvbnRleHQ6XSk6CisgICAgICAg IFdoZW4gem9vbWluZywgZm9yY2UgdGhlIHNlbGVjdGlvbiB1cGRhdGUsIGV2ZW4gdGhvdWdoIHRo ZSBkcmF3aW5nCisgICAgICAgIGluZm9ybWF0aW9uIGhhc24ndCBjaGFuZ2VkLCB0aGUgdmlld3Mg d2lsbCBuZWVkIHRvIGJlIHVwZGF0ZWQuCisKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfdXBk YXRlQ2hhbmdlZFNlbGVjdGlvbl0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF91cGRhdGVD aGFuZ2VkU2VsZWN0aW9uOl0pOgorICAgICAgICBNb25pdG9yIEVkaXRvclN0YXRlIGZvciBjaGFu Z2VzIGluIHNlbGVjdGlvbiBkcmF3aW5nIGFuZCBhdm9pZAorICAgICAgICBpbmZvcm1pbmcgdGhl IHNlbGVjdGlvbiBhc3Npc3RhbnQgdW5sZXNzIG5lY2Vzc2FyeS4KKwogMjAxNS0wMi0wMyAgQW50 dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgTWVtb3J5IGNhY2hlIGZv ciByZXNvdXJjZXMgcGVuZGluZyBkaXNrIHdyaXRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvRWRpdG9yU3RhdGUuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0VkaXRvclN0 YXRlLmNwcAppbmRleCA2MTljZmJhLi45YmMwYjhmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvRWRpdG9yU3RhdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9FZGl0 b3JTdGF0ZS5jcHAKQEAgLTI5LDEwICsyOSw2IEBACiAjaW5jbHVkZSAiQXJndW1lbnRzLmgiCiAj aW5jbHVkZSAiV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmgiCiAKLSNpZiBQTEFURk9STShJT1MpCi0j aW5jbHVkZSA8V2ViQ29yZS9TZWxlY3Rpb25SZWN0Lmg+Ci0jZW5kaWYKLQogbmFtZXNwYWNlIFdl YktpdCB7CiAKIHZvaWQgRWRpdG9yU3RhdGU6OmVuY29kZShJUEM6OkFyZ3VtZW50RW5jb2RlciYg ZW5jb2RlcikgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3Mv V0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9z L1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oCmluZGV4IGIyMTkxNDAuLjBhYTgwZTggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50 ZXJhY3Rpb24uaApAQCAtMjgsNiArMjgsNyBAQAogI2ltcG9ydCAiV0tDb250ZW50Vmlldy5oIgog CiAjaW1wb3J0ICJBc3Npc3RlZE5vZGVJbmZvcm1hdGlvbi5oIgorI2ltcG9ydCAiRWRpdG9yU3Rh dGUuaCIKICNpbXBvcnQgIkdlc3R1cmVUeXBlcy5oIgogI2ltcG9ydCAiSW50ZXJhY3Rpb25JbmZv cm1hdGlvbkF0UG9zaXRpb24uaCIKICNpbXBvcnQgIlVJS2l0U1BJLmgiCkBAIC03MSw2ICs3Miwx NCBAQCB0eXBlZGVmIHZvaWQgKF5VSVdLU2VsZWN0aW9uQ29tcGxldGlvbkhhbmRsZXIpKHZvaWQp OwogdHlwZWRlZiB2b2lkICheVUlXS1NlbGVjdGlvbldpdGhEaXJlY3Rpb25Db21wbGV0aW9uSGFu ZGxlcikoQk9PTCBzZWxlY3Rpb25FbmRJc01vdmluZyk7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewor c3RydWN0IFdLU2VsZWN0aW9uRHJhd2luZ0luZm8geworICAgIGVudW0gY2xhc3MgU2VsZWN0aW9u VHlwZSB7IE5vbmUsIFBsdWdpbiwgUmFuZ2UgfTsKKyAgICBXS1NlbGVjdGlvbkRyYXdpbmdJbmZv KCk7CisgICAgZXhwbGljaXQgV0tTZWxlY3Rpb25EcmF3aW5nSW5mbyhjb25zdCBFZGl0b3JTdGF0 ZSYpOworICAgIFNlbGVjdGlvblR5cGUgdHlwZTsKKyAgICBXZWJDb3JlOjpJbnRSZWN0IGNhcmV0 UmVjdDsKKyAgICBWZWN0b3I8V2ViQ29yZTo6U2VsZWN0aW9uUmVjdD4gc2VsZWN0aW9uUmVjdHM7 Cit9Owogc3RydWN0IFdLQXV0b0NvcnJlY3Rpb25EYXRhIHsKICAgICBTdHJpbmcgZm9udE5hbWU7 CiAgICAgQ0dGbG9hdCBmb250U2l6ZTsKQEAgLTEyOSw2ICsxMzgsOCBAQCBzdHJ1Y3QgV0tBdXRv Q29ycmVjdGlvbkRhdGEgewogCiAgICAgQ0dQb2ludCBfbGFzdEludGVyYWN0aW9uTG9jYXRpb247 CiAKKyAgICBXZWJLaXQ6OldLU2VsZWN0aW9uRHJhd2luZ0luZm8gX2xhc3RTZWxlY3Rpb25EcmF3 aW5nSW5mbzsKKwogICAgIEJPT0wgX2lzRWRpdGFibGU7CiAgICAgQk9PTCBfc2hvd2luZ1RleHRT dHlsZU9wdGlvbnM7CiAgICAgQk9PTCBfaGFzVmFsaWRQb3NpdGlvbkluZm9ybWF0aW9uOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJh Y3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRl cmFjdGlvbi5tbQppbmRleCAyYjAzMDM2Li5jYWRmZTJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAt NjUsNiArNjUsNTggQEAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogdXNpbmcgbmFtZXNwYWNl IFdlYktpdDsKIAorbmFtZXNwYWNlIFdlYktpdCB7CisKK1dLU2VsZWN0aW9uRHJhd2luZ0luZm86 OldLU2VsZWN0aW9uRHJhd2luZ0luZm8oKQorICAgIDogdHlwZShTZWxlY3Rpb25UeXBlOjpOb25l KQoreworfQorCitXS1NlbGVjdGlvbkRyYXdpbmdJbmZvOjpXS1NlbGVjdGlvbkRyYXdpbmdJbmZv KGNvbnN0IEVkaXRvclN0YXRlJiBlZGl0b3JTdGF0ZSkKK3sKKyAgICBpZiAoZWRpdG9yU3RhdGUu c2VsZWN0aW9uSXNOb25lKSB7CisgICAgICAgIHR5cGUgPSBTZWxlY3Rpb25UeXBlOjpOb25lOwor ICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKGVkaXRvclN0YXRlLmlzSW5QbHVnaW4p IHsKKyAgICAgICAgdHlwZSA9IFNlbGVjdGlvblR5cGU6OlBsdWdpbjsKKyAgICAgICAgcmV0dXJu OworICAgIH0KKworICAgIHR5cGUgPSBTZWxlY3Rpb25UeXBlOjpSYW5nZTsKKyAgICBjYXJldFJl Y3QgPSBlZGl0b3JTdGF0ZS5jYXJldFJlY3RBdEVuZDsKKyAgICBzZWxlY3Rpb25SZWN0cyA9IGVk aXRvclN0YXRlLnNlbGVjdGlvblJlY3RzOworfQorCitpbmxpbmUgYm9vbCBvcGVyYXRvcj09KGNv bnN0IFdLU2VsZWN0aW9uRHJhd2luZ0luZm8mIGEsIGNvbnN0IFdLU2VsZWN0aW9uRHJhd2luZ0lu Zm8mIGIpCit7CisgICAgaWYgKGEudHlwZSAhPSBiLnR5cGUpCisgICAgICAgIHJldHVybiBmYWxz ZTsKKworICAgIGlmIChhLnR5cGUgPT0gV0tTZWxlY3Rpb25EcmF3aW5nSW5mbzo6U2VsZWN0aW9u VHlwZTo6UmFuZ2UpIHsKKyAgICAgICAgaWYgKGEuY2FyZXRSZWN0ICE9IGIuY2FyZXRSZWN0KQor ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgICAgIGlmIChhLnNlbGVjdGlvblJlY3Rz LnNpemUoKSAhPSBiLnNlbGVjdGlvblJlY3RzLnNpemUoKSkKKyAgICAgICAgICAgIHJldHVybiBm YWxzZTsKKworICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgYS5zZWxlY3Rpb25SZWN0 cy5zaXplKCk7ICsraSkgeworICAgICAgICAgICAgaWYgKGEuc2VsZWN0aW9uUmVjdHNbaV0ucmVj dCgpICE9IGIuc2VsZWN0aW9uUmVjdHNbaV0ucmVjdCgpKQorICAgICAgICAgICAgICAgIHJldHVy biBmYWxzZTsKKyAgICAgICAgfQorICAgIH0KKworICAgIHJldHVybiB0cnVlOworfQorCitpbmxp bmUgYm9vbCBvcGVyYXRvciE9KGNvbnN0IFdLU2VsZWN0aW9uRHJhd2luZ0luZm8mIGEsIGNvbnN0 IFdLU2VsZWN0aW9uRHJhd2luZ0luZm8mIGIpCit7CisgICAgcmV0dXJuICEoYSA9PSBiKTsKK30K KworfSAvLyBuYW1lc3BhY2UgV2ViS2l0CisKIHN0YXRpYyBjb25zdCBmbG9hdCBoaWdobGlnaHRE ZWxheSA9IDAuMTI7CiBzdGF0aWMgY29uc3QgZmxvYXQgdGFwQW5kSG9sZERlbGF5ICA9IDAuNzU7 CiBjb25zdCBDR0Zsb2F0IG1pbmltdW1UYXBIaWdobGlnaHRSYWRpdXMgPSAyLjA7CkBAIC0zODIs NyArNDM0LDcgQEAgc3RhdGljIFVJV2ViU2VsZWN0aW9uTW9kZSB0b1VJV2ViU2VsZWN0aW9uTW9k ZShXS1NlbGVjdGlvbkdyYW51bGFyaXR5IGdyYW51bGFyaXQKICAgICB9CiAKICAgICBfc2VsZWN0 aW9uTmVlZHNVcGRhdGUgPSBZRVM7Ci0gICAgW3NlbGYgX3VwZGF0ZUNoYW5nZWRTZWxlY3Rpb25d OworICAgIFtzZWxmIF91cGRhdGVDaGFuZ2VkU2VsZWN0aW9uOllFU107CiAgICAgW3NlbGYgX3Vw ZGF0ZVRhcEhpZ2hsaWdodF07CiB9CiAKQEAgLTI3NTUsOSArMjgwNywyMCBAQCBzdGF0aWMgVUlU ZXh0QXV0b2NhcGl0YWxpemF0aW9uVHlwZSB0b1VJVGV4dEF1dG9jYXBpdGFsaXplKFdlYkF1dG9j YXBpdGFsaXplVHlwZQogCiAtICh2b2lkKV91cGRhdGVDaGFuZ2VkU2VsZWN0aW9uCiB7CisgICAg W3NlbGYgX3VwZGF0ZUNoYW5nZWRTZWxlY3Rpb246Tk9dOworfQorCistICh2b2lkKV91cGRhdGVD aGFuZ2VkU2VsZWN0aW9uOihCT09MKWZvcmNlCit7CiAgICAgaWYgKCFfc2VsZWN0aW9uTmVlZHNV cGRhdGUpCiAgICAgICAgIHJldHVybjsKIAorICAgIFdLU2VsZWN0aW9uRHJhd2luZ0luZm8gc2Vs ZWN0aW9uRHJhd2luZ0luZm8oX3BhZ2UtPmVkaXRvclN0YXRlKCkpOworICAgIGlmICghZm9yY2Ug JiYgc2VsZWN0aW9uRHJhd2luZ0luZm8gPT0gX2xhc3RTZWxlY3Rpb25EcmF3aW5nSW5mbykKKyAg ICAgICAgcmV0dXJuOworCisgICAgX2xhc3RTZWxlY3Rpb25EcmF3aW5nSW5mbyA9IHNlbGVjdGlv bkRyYXdpbmdJbmZvOworCiAgICAgLy8gRklYTUU6IFdlIG5lZWQgdG8gZmlndXJlIG91dCB3aGF0 IHRvIGRvIGlmIHRoZSBzZWxlY3Rpb24gaXMgY2hhbmdlZCBieSBKYXZhc2NyaXB0LgogICAgIGlm IChfdGV4dFNlbGVjdGlvbkFzc2lzdGFudCkgewogICAgICAgICBfbWFya2VkVGV4dCA9IChfcGFn ZS0+ZWRpdG9yU3RhdGUoKS5oYXNDb21wb3NpdGlvbikgPyBfcGFnZS0+ZWRpdG9yU3RhdGUoKS5t YXJrZWRUZXh0IDogU3RyaW5nKCk7Cg==