132830 2014-05-12 11:53:50 -0700 DataDetector UI doesn't update with resize 2014-05-12 17:30:00 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham oldest_to_newest 1008674 0 bfulgham 2014-05-12 11:53:50 -0700 The DataDetector UI decorations on the page do not move with the elements they represent as the page is resized. 1008676 1 bfulgham 2014-05-12 11:55:59 -0700 <rdar://problem/16871179> 1008680 2 231311 bfulgham 2014-05-12 11:59:40 -0700 Created attachment 231311 Patch 1008681 3 231311 simon.fraser 2014-05-12 12:01:18 -0700 Comment on attachment 231311 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=231311&action=review > Source/WebCore/page/FrameView.cpp:559 > +#if ENABLE(TELEPHONE_NUMBER_DETECTION) && !PLATFORM(IOS) > + if (m_frame) > + m_frame->editor().contentsResized(); > +#endif You should wire this up to any layout, not just resizing. 1008791 4 231340 bfulgham 2014-05-12 16:49:49 -0700 Created attachment 231340 Patch 1008792 5 231340 simon.fraser 2014-05-12 16:52:01 -0700 Comment on attachment 231340 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=231340&action=review > Source/WebCore/page/FrameView.cpp:2753 > frame().selection().setCaretRectNeedsUpdate(); > frame().selection().updateAndRevealSelection(); > + frame().selection().updateDataDetectorsForSelection(); Maybe selection can have a layoutDidChange() function that does these three things? 1008817 6 bfulgham 2014-05-12 17:30:00 -0700 Committed r168664: <http://trac.webkit.org/changeset/168664> 231311 2014-05-12 11:59:40 -0700 2014-05-12 16:49:48 -0700 Patch bug-132830-20140512115917.patch text/plain 5032 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2ODYzMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE0LTA1LTEyICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIERhdGFEZXRlY3RvclVJIGRv ZXNuJ3QgdXBkYXRlIHdpdGggcmVzaXplCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMzI4MzAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2ODcxMTc5 PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZWRp dGluZy9FZGl0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjpzY2FuU2VsZWN0aW9u Rm9yVGVsZXBob25lTnVtYmVycyk6IEFkZCBuby1hcmd1bWVudAorICAgICAgICB2ZXJzaW9uIHRo YXQgY2FuIGJlIGNhbGxlZCB3aGVuIHNpemUgY2hhbmdlcy4KKyAgICAgICAgKFdlYkNvcmU6OkVk aXRvcjo6Y29udGVudHNSZXNpemVkKTogUmVwcm9jZXNzIHRlbGVwaG9uZSBudW1iZXIgZGF0YQor ICAgICAgICBzaW5jZSBSYW5nZXMgd2lsbCBoYXZlIGNoYW5nZWQuCisgICAgICAgICogZWRpdGlu Zy9FZGl0b3IuaDoKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpGcmFtZVZpZXc6OnNldENvbnRlbnRzU2l6ZSk6IEFzayBlZGl0b3IgdG8gdXBkYXRlIHRo ZQorICAgICAgICBSYW5nZSBpbmZvcm1hdGlvbiBmb3Igc2VsZWN0ZWQgcGhvbmUgbnVtYmVycy4K KwogMjAxNC0wNS0xMiAgSm96c2VmIEJlcnRhICA8amJlcnRhLnUtc3plZ2VkQHBhcnRuZXIuc2Ft c3VuZy5jb20+CiAKICAgICAgICAgV2luQ2Fpcm8gYnVpbGRmaXggYWZ0ZXIgcjE2ODYxMQpJbmRl eDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAkocmV2aXNpb24gMTY4NTU0KQorKysgU291cmNl L1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBA QAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAwNiwgMjAwNywgMjAwOCwgMjAxMSwgMjAxMyBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDYsIDIwMDcs IDIwMDgsIDIwMTEsIDIwMTMsIDIwMTQgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgog ICogQ29weXJpZ2h0IChDKSAyMDA4IE5va2lhIENvcnBvcmF0aW9uIGFuZC9vciBpdHMgc3Vic2lk aWFyeSgtaWVzKQogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBi aW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dApAQCAtMzM1MSwxNSArMzM1MSwxOSBAQCBib29s IEVkaXRvcjo6c2hvdWxkRGV0ZWN0VGVsZXBob25lTnVtYmVyCiAKIHZvaWQgRWRpdG9yOjpzY2Fu U2VsZWN0aW9uRm9yVGVsZXBob25lTnVtYmVycyhUaW1lcjxFZGl0b3I+JikKIHsKLSAgICBpZiAo IXNob3VsZERldGVjdFRlbGVwaG9uZU51bWJlcnMoKSkKKyAgICBzY2FuU2VsZWN0aW9uRm9yVGVs ZXBob25lTnVtYmVycygpOworfQorCit2b2lkIEVkaXRvcjo6c2NhblNlbGVjdGlvbkZvclRlbGVw aG9uZU51bWJlcnMoKQoreworICAgIGlmICghc2hvdWxkRGV0ZWN0VGVsZXBob25lTnVtYmVycygp IHx8ICFjbGllbnQoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgVmVjdG9yPFJlZlB0cjxSYW5n ZT4+IG1hcmtlZFJhbmdlczsKIAogICAgIFJlZlB0cjxSYW5nZT4gc2VsZWN0ZWRSYW5nZSA9IG1f ZnJhbWUuc2VsZWN0aW9uKCkudG9Ob3JtYWxpemVkUmFuZ2UoKTsKICAgICBpZiAoIXNlbGVjdGVk UmFuZ2UgfHwgKHNlbGVjdGVkUmFuZ2UtPnN0YXJ0Q29udGFpbmVyKCkgPT0gc2VsZWN0ZWRSYW5n ZS0+ZW5kQ29udGFpbmVyKCkgJiYgc2VsZWN0ZWRSYW5nZS0+c3RhcnRPZmZzZXQoKSA9PSBzZWxl Y3RlZFJhbmdlLT5lbmRPZmZzZXQoKSkpIHsKLSAgICAgICAgaWYgKGNsaWVudCgpKQotICAgICAg ICAgICAgY2xpZW50KCktPnNlbGVjdGVkVGVsZXBob25lTnVtYmVyUmFuZ2VzQ2hhbmdlZChtYXJr ZWRSYW5nZXMpOworICAgICAgICBjbGllbnQoKS0+c2VsZWN0ZWRUZWxlcGhvbmVOdW1iZXJSYW5n ZXNDaGFuZ2VkKG1hcmtlZFJhbmdlcyk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTMz NzMsOCArMzM3Nyw3IEBAIHZvaWQgRWRpdG9yOjpzY2FuU2VsZWN0aW9uRm9yVGVsZXBob25lTnUK ICAgICAgICAgc2NhblJhbmdlRm9yVGVsZXBob25lTnVtYmVycygqdGV4dENodW5rLnJhbmdlKCks IHRleHRDaHVuay50ZXh0KCksIG1hcmtlZFJhbmdlcyk7CiAgICAgfQogCi0gICAgaWYgKGNsaWVu dCgpKQotICAgICAgICBjbGllbnQoKS0+c2VsZWN0ZWRUZWxlcGhvbmVOdW1iZXJSYW5nZXNDaGFu Z2VkKG1hcmtlZFJhbmdlcyk7CisgICAgY2xpZW50KCktPnNlbGVjdGVkVGVsZXBob25lTnVtYmVy UmFuZ2VzQ2hhbmdlZChtYXJrZWRSYW5nZXMpOwogfQogCiB2b2lkIEVkaXRvcjo6c2NhblJhbmdl Rm9yVGVsZXBob25lTnVtYmVycyhSYW5nZSYgcmFuZ2UsIGNvbnN0IFN0cmluZ1ZpZXcmIHN0cmlu Z1ZpZXcsIFZlY3RvcjxSZWZQdHI8UmFuZ2U+PiYgbWFya2VkUmFuZ2VzKQpAQCAtMzYxMCw0ICsz NjEzLDEyIEBAIERvY3VtZW50JiBFZGl0b3I6OmRvY3VtZW50KCkgY29uc3QKICAgICByZXR1cm4g Km1fZnJhbWUuZG9jdW1lbnQoKTsKIH0KIAordm9pZCBFZGl0b3I6OmNvbnRlbnRzUmVzaXplZCgp Cit7CisjaWYgRU5BQkxFKFRFTEVQSE9ORV9OVU1CRVJfREVURUNUSU9OKSAmJiAhUExBVEZPUk0o SU9TKQorICAgIHNjYW5TZWxlY3Rpb25Gb3JUZWxlcGhvbmVOdW1iZXJzKCk7CisjZW5kaWYKK30K KworCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5n L0VkaXRvci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmgJ KHJldmlzaW9uIDE2ODU1NCkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmgJKHdv cmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDA2LCAy MDA3LCAyMDA4LCAyMDEzIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHly aWdodCAoQykgMjAwNiwgMjAwNywgMjAwOCwgMjAxMywgMjAxNCBBcHBsZSBJbmMuIEFsbCByaWdo dHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5k IGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJt aXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTE2Miw2ICsx NjIsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBkZWNyZWFzZVNlbGVjdGlvbkxpc3RMZXZlbCgpOwog ICAgCiAgICAgdm9pZCByZW1vdmVGb3JtYXR0aW5nQW5kU3R5bGUoKTsKKyAgICB2b2lkIGNvbnRl bnRzUmVzaXplZCgpOwogCiAgICAgdm9pZCBjbGVhckxhc3RFZGl0Q29tbWFuZCgpOwogI2lmIFBM QVRGT1JNKElPUykKQEAgLTUwOSw2ICs1MTAsNyBAQCBwcml2YXRlOgogCiAjaWYgRU5BQkxFKFRF TEVQSE9ORV9OVU1CRVJfREVURUNUSU9OKSAmJiAhUExBVEZPUk0oSU9TKQogICAgIGJvb2wgc2hv dWxkRGV0ZWN0VGVsZXBob25lTnVtYmVycygpOworICAgIHZvaWQgc2NhblNlbGVjdGlvbkZvclRl bGVwaG9uZU51bWJlcnMoKTsKICAgICB2b2lkIHNjYW5TZWxlY3Rpb25Gb3JUZWxlcGhvbmVOdW1i ZXJzKFRpbWVyPEVkaXRvcj4mKTsKICAgICB2b2lkIHNjYW5SYW5nZUZvclRlbGVwaG9uZU51bWJl cnMoUmFuZ2UmLCBjb25zdCBTdHJpbmdWaWV3JiwgVmVjdG9yPFJlZlB0cjxSYW5nZT4+JiBtYXJr ZWRSYW5nZXMpOwogICAgIHZvaWQgY2xlYXJEYXRhRGV0ZWN0ZWRUZWxlcGhvbmVOdW1iZXJzKCk7 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCShyZXZpc2lvbiAxNjg1NTQpCisrKyBT b3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM2LDYg KzM2LDcgQEAKICNpbmNsdWRlICJDaHJvbWVDbGllbnQuaCIKICNpbmNsdWRlICJET01XaW5kb3cu aCIKICNpbmNsdWRlICJEb2N1bWVudE1hcmtlckNvbnRyb2xsZXIuaCIKKyNpbmNsdWRlICJFZGl0 b3IuaCIKICNpbmNsdWRlICJFdmVudEhhbmRsZXIuaCIKICNpbmNsdWRlICJGbG9hdFJlY3QuaCIK ICNpbmNsdWRlICJGb2N1c0NvbnRyb2xsZXIuaCIKQEAgLTU1MSw2ICs1NTIsMTEgQEAgdm9pZCBG cmFtZVZpZXc6OnNldENvbnRlbnRzU2l6ZShjb25zdCBJbgogICAgIAogICAgIGlmICghbV9kZWZl clNldE5lZWRzTGF5b3V0cykKICAgICAgICAgbV9zZXROZWVkc0xheW91dFdhc0RlZmVycmVkID0g ZmFsc2U7IC8vIEZJWE1FOiBGaW5kIGEgd2F5IHRvIG1ha2UgdGhlIGRlZmVycmVkIGxheW91dCBh Y3R1YWxseSBoYXBwZW4uCisKKyNpZiBFTkFCTEUoVEVMRVBIT05FX05VTUJFUl9ERVRFQ1RJT04p ICYmICFQTEFURk9STShJT1MpCisgICAgaWYgKG1fZnJhbWUpCisgICAgICAgIG1fZnJhbWUtPmVk aXRvcigpLmNvbnRlbnRzUmVzaXplZCgpOworI2VuZGlmCiB9CiAKIHZvaWQgRnJhbWVWaWV3Ojph ZGp1c3RWaWV3U2l6ZSgpCg== 231340 2014-05-12 16:49:49 -0700 2014-05-12 16:52:01 -0700 Patch bug-132830-20140512164926.patch text/plain 6108 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2ODYzMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE0LTA1LTEyICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIERhdGFEZXRlY3RvclVJIGRv ZXNuJ3QgdXBkYXRlIHdpdGggcmVzaXplCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMzI4MzAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2ODcxMTc5 PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZWRp dGluZy9FZGl0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjpzY2FuU2VsZWN0aW9u Rm9yVGVsZXBob25lTnVtYmVycyk6IEFkZCBwdWJsaWMsIG5vLWFyZ3VtZW50CisgICAgICAgIHZl cnNpb24gdGhhdCBjYW4gYmUgY2FsbGVkIGFmdGVyIGxheW91dCBjaGFuZ2VzLgorICAgICAgICAo V2ViQ29yZTo6RWRpdG9yOjpkaWRMYXlvdXQpOiBSZXByb2Nlc3MgdGVsZXBob25lIG51bWJlciBk YXRhCisgICAgICAgIHNpbmNlIFJhbmdlcyB3aWxsIGhhdmUgY2hhbmdlZC4KKyAgICAgICAgKiBl ZGl0aW5nL0VkaXRvci5oOgorICAgICAgICAqIGVkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwOgor ICAgICAgICAoV2ViQ29yZTo6RnJhbWVTZWxlY3Rpb246OnVwZGF0ZURhdGFEZXRlY3RvcnNGb3JT ZWxlY3Rpb24pOiBBZGRlZC4KKyAgICAgICAgKiBlZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmg6Cisg ICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3 OjpwZXJmb3JtUG9zdExheW91dFRhc2tzKTogQXNrIHRoZSBGcmFtZVNlbGVjdGlvbiB0byB1cGRh dGUgdGhlCisgICAgICAgIFJhbmdlIGluZm9ybWF0aW9uIGZvciBzZWxlY3RlZCBwaG9uZSBudW1i ZXJzLgorCiAyMDE0LTA1LTEyICBKb3pzZWYgQmVydGEgIDxqYmVydGEudS1zemVnZWRAcGFydG5l ci5zYW1zdW5nLmNvbT4KIAogICAgICAgICBXaW5DYWlybyBidWlsZGZpeCBhZnRlciByMTY4NjEx CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwCShyZXZpc2lvbiAxNjg1NTQpCisrKyBT b3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEsNSAr MSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDA2LCAyMDA3LCAyMDA4LCAyMDExLCAyMDEz IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAwNiwg MjAwNywgMjAwOCwgMjAxMSwgMjAxMywgMjAxNCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDggTm9raWEgQ29ycG9yYXRpb24gYW5kL29yIGl0cyBz dWJzaWRpYXJ5KC1pZXMpCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2Ug YW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CkBAIC0zMzUxLDE1ICszMzUxLDE5IEBA IGJvb2wgRWRpdG9yOjpzaG91bGREZXRlY3RUZWxlcGhvbmVOdW1iZXIKIAogdm9pZCBFZGl0b3I6 OnNjYW5TZWxlY3Rpb25Gb3JUZWxlcGhvbmVOdW1iZXJzKFRpbWVyPEVkaXRvcj4mKQogewotICAg IGlmICghc2hvdWxkRGV0ZWN0VGVsZXBob25lTnVtYmVycygpKQorICAgIHNjYW5TZWxlY3Rpb25G b3JUZWxlcGhvbmVOdW1iZXJzKCk7Cit9CisKK3ZvaWQgRWRpdG9yOjpzY2FuU2VsZWN0aW9uRm9y VGVsZXBob25lTnVtYmVycygpCit7CisgICAgaWYgKCFzaG91bGREZXRlY3RUZWxlcGhvbmVOdW1i ZXJzKCkgfHwgIWNsaWVudCgpKQogICAgICAgICByZXR1cm47CiAKICAgICBWZWN0b3I8UmVmUHRy PFJhbmdlPj4gbWFya2VkUmFuZ2VzOwogCiAgICAgUmVmUHRyPFJhbmdlPiBzZWxlY3RlZFJhbmdl ID0gbV9mcmFtZS5zZWxlY3Rpb24oKS50b05vcm1hbGl6ZWRSYW5nZSgpOwogICAgIGlmICghc2Vs ZWN0ZWRSYW5nZSB8fCAoc2VsZWN0ZWRSYW5nZS0+c3RhcnRDb250YWluZXIoKSA9PSBzZWxlY3Rl ZFJhbmdlLT5lbmRDb250YWluZXIoKSAmJiBzZWxlY3RlZFJhbmdlLT5zdGFydE9mZnNldCgpID09 IHNlbGVjdGVkUmFuZ2UtPmVuZE9mZnNldCgpKSkgewotICAgICAgICBpZiAoY2xpZW50KCkpCi0g ICAgICAgICAgICBjbGllbnQoKS0+c2VsZWN0ZWRUZWxlcGhvbmVOdW1iZXJSYW5nZXNDaGFuZ2Vk KG1hcmtlZFJhbmdlcyk7CisgICAgICAgIGNsaWVudCgpLT5zZWxlY3RlZFRlbGVwaG9uZU51bWJl clJhbmdlc0NoYW5nZWQobWFya2VkUmFuZ2VzKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApA QCAtMzM3Myw4ICszMzc3LDcgQEAgdm9pZCBFZGl0b3I6OnNjYW5TZWxlY3Rpb25Gb3JUZWxlcGhv bmVOdQogICAgICAgICBzY2FuUmFuZ2VGb3JUZWxlcGhvbmVOdW1iZXJzKCp0ZXh0Q2h1bmsucmFu Z2UoKSwgdGV4dENodW5rLnRleHQoKSwgbWFya2VkUmFuZ2VzKTsKICAgICB9CiAKLSAgICBpZiAo Y2xpZW50KCkpCi0gICAgICAgIGNsaWVudCgpLT5zZWxlY3RlZFRlbGVwaG9uZU51bWJlclJhbmdl c0NoYW5nZWQobWFya2VkUmFuZ2VzKTsKKyAgICBjbGllbnQoKS0+c2VsZWN0ZWRUZWxlcGhvbmVO dW1iZXJSYW5nZXNDaGFuZ2VkKG1hcmtlZFJhbmdlcyk7CiB9CiAKIHZvaWQgRWRpdG9yOjpzY2Fu UmFuZ2VGb3JUZWxlcGhvbmVOdW1iZXJzKFJhbmdlJiByYW5nZSwgY29uc3QgU3RyaW5nVmlldyYg c3RyaW5nVmlldywgVmVjdG9yPFJlZlB0cjxSYW5nZT4+JiBtYXJrZWRSYW5nZXMpCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2VkaXRpbmcvRWRpdG9yLmgJKHJldmlzaW9uIDE2ODU1NCkKKysrIFNvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvRWRpdG9yLmgJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICog Q29weXJpZ2h0IChDKSAyMDA2LCAyMDA3LCAyMDA4LCAyMDEzIEFwcGxlIEluYy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAwNiwgMjAwNywgMjAwOCwgMjAxMywgMjAx NCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24g YW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBt b2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNv bmRpdGlvbnMKQEAgLTQ0Miw2ICs0NDIsMTAgQEAgcHVibGljOgogICAgIHZvaWQgd3JpdGVJbWFn ZVRvUGFzdGVib2FyZChQYXN0ZWJvYXJkJiwgRWxlbWVudCYgaW1hZ2VFbGVtZW50LCBjb25zdCBV UkwmLCBjb25zdCBTdHJpbmcmIHRpdGxlKTsKICNlbmRpZgogCisjaWYgRU5BQkxFKFRFTEVQSE9O RV9OVU1CRVJfREVURUNUSU9OKSAmJiAhUExBVEZPUk0oSU9TKQorICAgIHZvaWQgc2NhblNlbGVj dGlvbkZvclRlbGVwaG9uZU51bWJlcnMoKTsKKyNlbmRpZgorCiBwcml2YXRlOgogICAgIGNsYXNz IFdlYkNvbnRlbnRSZWFkZXI7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVT ZWxlY3Rpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVT ZWxlY3Rpb24uY3BwCShyZXZpc2lvbiAxNjg1NTQpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5n L0ZyYW1lU2VsZWN0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0g KiBDb3B5cmlnaHQgKEMpIDIwMDQsIDIwMDgsIDIwMDksIDIwMTAgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA0LCAyMDA4LCAyMDA5LCAyMDEwLCAy MDE0IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlv biBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAq IG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcg Y29uZGl0aW9ucwpAQCAtMzc1LDYgKzM3NSwxMyBAQCB2b2lkIEZyYW1lU2VsZWN0aW9uOjp1cGRh dGVBbmRSZXZlYWxTZWxlCiAgICAgbm90aWZ5QWNjZXNzaWJpbGl0eUZvclNlbGVjdGlvbkNoYW5n ZSgpOwogfQogCit2b2lkIEZyYW1lU2VsZWN0aW9uOjp1cGRhdGVEYXRhRGV0ZWN0b3JzRm9yU2Vs ZWN0aW9uKCkKK3sKKyNpZiBFTkFCTEUoVEVMRVBIT05FX05VTUJFUl9ERVRFQ1RJT04pICYmICFQ TEFURk9STShJT1MpCisgICAgbV9mcmFtZS0+ZWRpdG9yKCkuc2NhblNlbGVjdGlvbkZvclRlbGVw aG9uZU51bWJlcnMoKTsKKyNlbmRpZgorfQorCiBzdGF0aWMgYm9vbCByZW1vdmluZ05vZGVSZW1v dmVzUG9zaXRpb24oTm9kZSogbm9kZSwgY29uc3QgUG9zaXRpb24mIHBvc2l0aW9uKQogewogICAg IGlmICghcG9zaXRpb24uYW5jaG9yTm9kZSgpKQpJbmRleDogU291cmNlL1dlYkNvcmUvZWRpdGlu Zy9GcmFtZVNlbGVjdGlvbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcv RnJhbWVTZWxlY3Rpb24uaAkocmV2aXNpb24gMTY4NTU0KQorKysgU291cmNlL1dlYkNvcmUvZWRp dGluZy9GcmFtZVNlbGVjdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNDUsNiArMTQ1LDcgQEAg cHVibGljOgogICAgIGNvbnN0IFZpc2libGVTZWxlY3Rpb24mIHNlbGVjdGlvbigpIGNvbnN0IHsg cmV0dXJuIG1fc2VsZWN0aW9uOyB9CiAgICAgdm9pZCBzZXRTZWxlY3Rpb24oY29uc3QgVmlzaWJs ZVNlbGVjdGlvbiYsIFNldFNlbGVjdGlvbk9wdGlvbnMgPSBkZWZhdWx0U2V0U2VsZWN0aW9uT3B0 aW9ucygpLCBDdXJzb3JBbGlnbk9uU2Nyb2xsID0gQWxpZ25DdXJzb3JPblNjcm9sbElmTmVlZGVk LCBUZXh0R3JhbnVsYXJpdHkgPSBDaGFyYWN0ZXJHcmFudWxhcml0eSk7CiAgICAgdm9pZCB1cGRh dGVBbmRSZXZlYWxTZWxlY3Rpb24oKTsKKyAgICB2b2lkIHVwZGF0ZURhdGFEZXRlY3RvcnNGb3JT ZWxlY3Rpb24oKTsKICAgICBib29sIHNldFNlbGVjdGVkUmFuZ2UoUmFuZ2UqLCBFQWZmaW5pdHks IGJvb2wgY2xvc2VUeXBpbmcpOwogICAgIHZvaWQgc2VsZWN0QWxsKCk7CiAgICAgdm9pZCBjbGVh cigpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkocmV2aXNpb24gMTY4NTU0KQor KysgU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0y NzUwLDYgKzI3NTAsNyBAQCB2b2lkIEZyYW1lVmlldzo6cGVyZm9ybVBvc3RMYXlvdXRUYXNrcygp CiAKICAgICBmcmFtZSgpLnNlbGVjdGlvbigpLnNldENhcmV0UmVjdE5lZWRzVXBkYXRlKCk7CiAg ICAgZnJhbWUoKS5zZWxlY3Rpb24oKS51cGRhdGVBbmRSZXZlYWxTZWxlY3Rpb24oKTsKKyAgICBm cmFtZSgpLnNlbGVjdGlvbigpLnVwZGF0ZURhdGFEZXRlY3RvcnNGb3JTZWxlY3Rpb24oKTsKIAog ICAgIGlmIChtX25lc3RlZExheW91dENvdW50IDw9IDEgJiYgZnJhbWUoKS5kb2N1bWVudCgpLT5k b2N1bWVudEVsZW1lbnQoKSkKICAgICAgICAgZmlyZUxheW91dFJlbGF0ZWRNaWxlc3RvbmVzSWZO ZWVkZWQoKTsK