134672 2014-07-06 18:56:08 -0700 [Mac] No need to paint focus ring if paintRect is completely contained 2014-07-09 19:33:10 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 1 dino dino commit-queue darin esprehn+autocc glenn kondapallykalyan oldest_to_newest 1020743 0 dino 2014-07-06 18:56:08 -0700 [Mac] No need to paint focus ring if paintRect is completely contained 1020744 1 234474 dino 2014-07-06 19:02:23 -0700 Created attachment 234474 Patch 1020751 2 234474 darin 2014-07-06 19:53:24 -0700 Comment on attachment 234474 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=234474&action=review What if a focus ring rectangle intersects, but does not contain, the painting rect? For example, consider that a small thin line might be at the top of a text field input element, in front of it, and that line could change color. This seems OK, but I think it could leave the focus ring damaged in cases like that. I think that this function should use enclosingIntRect and intersects. > Source/WebCore/rendering/RenderObject.cpp:1019 > + IntRect paintRect(paintInfo.rect); Why truncate rather than using enclosingIntRect, enclosedIntRect, or roundedIntRect? 1020752 3 darin 2014-07-06 19:54:55 -0700 I think my logic might be wrong. It might be something tricker than just intersects. I think we really need to figure out if the focus ring painted region touches a paint rect, a rectangle intersection is not a sufficient test for this. 1020787 4 dino 2014-07-07 00:03:15 -0700 Our CoreAnimation/CoreGraphics contact is suggesting they may have a fix that restores the 10.9 behaviour in this case. I'll be trying it out when I get a root tomorrow. If so, I'd much prefer to NOT land this change. 1020871 5 dino 2014-07-07 12:11:59 -0700 (In reply to comment #4) > Our CoreAnimation/CoreGraphics contact is suggesting they may have a fix that restores the 10.9 behaviour in this case. I'll be trying it out when I get a root tomorrow. > > If so, I'd much prefer to NOT land this change. It didn't work. 1020873 6 dino 2014-07-07 12:31:26 -0700 (In reply to comment #3) > I think my logic might be wrong. It might be something tricker than just intersects. I think we really need to figure out if the focus ring painted region touches a paint rect, a rectangle intersection is not a sufficient test for this. There is some subtlety to the patch that wasn't explained. Suppose you have a text area that is X,Y,W,H. When we paint it in the focused state we apply some padding to the paint rect, so it has the value X-P, Y-P, W+2P, H+2P. But the focus ring rect is still X,Y,W,H. In that case the focus ring does not contain the paintRect, so we paint focus. If we get a partial repaint (e.g. text entry), then our paint rect is a lot smaller and does not contain the focus padding. But the focus ring is still the same full size, and contains the paint rect, so we don't paint the focus. That should cover all cases where the content of the element changes (even if it is right against the edge of the element). But we still need to cover repaints caused by other, possibly overlapping, elements. You're right in that we definitely need to use enclosingIntRect. Also, I think you're on to something about needing more logic. Suppose we have another element that underlaps the top left corner of the text area. If it causes a repaint then our paint rect will intersect the focus ring rect, but not be completely enclosed. So we would not paint the focus. Maybe the logic should be: paint focus if either the focus rect does not completely contain the paint rect, or if the focus rect intersects with the paint rect. 1020879 7 dino 2014-07-07 13:05:21 -0700 (In reply to comment #6) > Maybe the logic should be: paint focus if either the focus rect does not completely contain the paint rect, or if the focus rect intersects with the paint rect. That doesn't quite work either. When we get an update paint, our paintRect does not have the focus ring padding applied, which means it is much more likely to intersect with the focus rect. You'd think that I'd be able to simply clip the drawing to hide any focus ring updates, but unfortunately they explicitly paint outside the clip bounds!! This is the cause of the problem - even a restricted update paint is still updating outside that region when drawing the focus ring. This is why I'm trying to come up with logic to stop the focus ring from attempting to render at all. 1020904 8 dino 2014-07-07 14:21:04 -0700 And I just tested with elements that have partial overlap causing repaints. The focus ring does not render correctly if I just consider containment, so I will need some form of intersection (but it sounds like it has to be absolute intersection, not just touching - or at least some part of the paint rect needs to be outside the focusring rect). I'm quite disturbed by the logic here :( 1020924 9 dino 2014-07-07 15:16:36 -0700 After a bit of experimentation I have something that mostly works, but might be the best we can do at the moment: - Only paint the focus ring if has at least one corner inside the painting rectangle (completely inside). This still causes some repaint cruft if we have a partial over/underlap, but much better than we have at the moment. Since we extend painting rectangles by outline (focus ring radius) we will hit the rectangles even if they are adjacent rather than overlapping. There is still an edge case that doesn't work, which is if the repaint rectangle is adjacent to the expanded focus ring. But I'm not sure we can fix that without getting the cruft from partial line updates. (Note: I still need a fix in WKSI to manage this, which is just setting the focus ring clip to the paint rect) 1020925 10 dino 2014-07-07 15:17:51 -0700 <rdar://problem/17188871> 1020926 11 234518 dino 2014-07-07 15:20:04 -0700 Created attachment 234518 Patch 1020943 12 234518 dino 2014-07-07 15:44:31 -0700 Comment on attachment 234518 Patch Discussion with Simon on IRC concluded with us thinking this doesn't actually address the problem. We're going to ask CG for a fix. 1021532 13 dino 2014-07-09 19:33:10 -0700 There is no need to apply such a fix. I can configure the internal focus ring code such that the clip is correct. 234474 2014-07-06 19:02:23 -0700 2014-07-06 19:53:24 -0700 Patch bug-134672-20140707120204.patch text/plain 3123 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwODI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGIxYTI1YTA3YjNiOTNh MGJkYmFjNDNhMzNiMzBiZDE4OWU2NzhiNS4uNWRkMzc4ZDY0MjZmZmY1ZmZiNWU4NTgzZTI3NGIz MDFiYmVlMDdiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE0LTA3LTA2ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBbTWFjXSBObyBuZWVkIHRvIHBh aW50IGZvY3VzIHJpbmcgaWYgcGFpbnRSZWN0IGlzIGNvbXBsZXRlbHkgY29udGFpbmVkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQ2NzIKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzE3MTg4ODcxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRoZSBuZXcgT1MgWCBZb3NlbWl0ZSBmb2N1cyByaW5nIHN0 eWxlIHVuY292ZXJlZCBhIGJ1ZyB3aGVyZQorICAgICAgICB3ZSByZXBhaW50IHRoZSBmb2N1cyBy aW5nIHVubmVjZXNzYXJpbHkuIFRoZSBmaXggaXMgdG8gaXRlcmF0ZQorICAgICAgICBvdmVyIHRo ZSBmb2N1cyByaW5nIHJlY3RhbmdsZXMgYW5kIGNoZWNrIGlmIHRoZSBwYWludGluZyByZWdpb24K KyAgICAgICAgaXMgY29tcGxldGVseSBjb250YWluZWQuIEZvciBleGFtcGxlLCBhIGJsaW5raW5n IGNhcmV0IGlzIHN1Y2gKKyAgICAgICAgYSBzbWFsbCByZXBhaW50IHJlZ2lvbiB0aGF0IGl0IGlz IHVubGlrZWx5IHRvIGludGVyc2VjdCB3aXRoIHRoZQorICAgICAgICBmb2N1cyByaW5nLgorCisg ICAgICAgIEkgZGlkbid0IGFwcGx5IHRoaXMgZml4IHRvIGFsbCBwb3J0cyBiZWNhdXNlIEkgd2Fz bid0IGNvbmZpZGVudAorICAgICAgICBpbiBob3cgdGhlaXIgZm9jdXMgcmluZ3MgcmVuZGVyLiBU aGUgZmFjdCB0aGF0IG5vIG9uZSBoYWQgbm90aWNlZAorICAgICAgICBpdCB1bnRpbCBub3cgbWFr ZXMgbWUgdGhpbmsgdGhleSBhbHNvIGhhZCBmdWxseS1vcGFxdWUgcmluZ3MgKHN1Y2gKKyAgICAg ICAgYXMgT1MgWCBiZWZvcmUgWW9zZW1pdGUpLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OnBhaW50Rm9jdXNS aW5nKTogSXRlcmF0ZSB0aHJvdWdoIGZvY3VzCisgICAgICAgIHJpbmdzIHRvIGNoZWNrIGlmIHRo ZXkgZW5jbG9zZSB0aGUgcGFpbnRpbmcgcmVnaW9uLCBhbmQgb25seQorICAgICAgICBkcmF3IHRo ZSBmb2N1cyByaW5nIGlmIG5lY2Vzc2FyeS4KKwogMjAxNC0wNy0wNSAgRGVhbiBKYWNrc29uICA8 ZGlub0BhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gTWVkaWFEb2N1bWVudCBzaG91bGQgc2V0 IGEgdmlld3BvcnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJP YmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKaW5k ZXggNzJiZTQxZWJiOWRiM2MxOGRmMzhkYmUyZTNlODNjYTJjNTgzNTMwYy4uNzlkMmE4N2MzZjVj OWNhODhjMDlkODBjMjU2ZWQxMDg1YmZiZjIzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlck9iamVjdC5jcHAKQEAgLTEwMTYsMTAgKzEwMTYsMjEgQEAgdm9pZCBSZW5kZXJPYmpl Y3Q6OnBhaW50Rm9jdXNSaW5nKFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2lu dCYgcGFpbnQKICAgICBWZWN0b3I8SW50UmVjdD4gZm9jdXNSaW5nUmVjdHM7CiAgICAgYWRkRm9j dXNSaW5nUmVjdHMoZm9jdXNSaW5nUmVjdHMsIHBhaW50T2Zmc2V0LCBwYWludEluZm8ucGFpbnRD b250YWluZXIpOwogI2lmIFBMQVRGT1JNKE1BQykKLSAgICBib29sIG5lZWRzUmVwYWludDsKLSAg ICBwYWludEluZm8uY29udGV4dC0+ZHJhd0ZvY3VzUmluZyhmb2N1c1JpbmdSZWN0cywgc3R5bGUt Pm91dGxpbmVXaWR0aCgpLCBzdHlsZS0+b3V0bGluZU9mZnNldCgpLCBkb2N1bWVudCgpLnBhZ2Uo KS0+Zm9jdXNDb250cm9sbGVyKCkudGltZVNpbmNlRm9jdXNXYXNTZXQoKSwgbmVlZHNSZXBhaW50 KTsKLSAgICBpZiAobmVlZHNSZXBhaW50KQotICAgICAgICBkb2N1bWVudCgpLnBhZ2UoKS0+Zm9j dXNDb250cm9sbGVyKCkuc2V0Rm9jdXNlZEVsZW1lbnROZWVkc1JlcGFpbnQoKTsKKyAgICBJbnRS ZWN0IHBhaW50UmVjdChwYWludEluZm8ucmVjdCk7CisgICAgYm9vbCBmb2N1c1JpbmdDb250YWlu c1BhaW50UmVjdCA9IHRydWU7CisgICAgZm9yIChhdXRvJiByZWN0IDogZm9jdXNSaW5nUmVjdHMp IHsKKyAgICAgICAgaWYgKCFyZWN0LmNvbnRhaW5zKHBhaW50UmVjdCkpIHsKKyAgICAgICAgICAg IGZvY3VzUmluZ0NvbnRhaW5zUGFpbnRSZWN0ID0gZmFsc2U7CisgICAgICAgICAgICBicmVhazsK KyAgICAgICAgfQorICAgIH0KKworICAgIGlmICghZm9jdXNSaW5nQ29udGFpbnNQYWludFJlY3Qp IHsKKyAgICAgICAgYm9vbCBuZWVkc1JlcGFpbnQ7CisgICAgICAgIHBhaW50SW5mby5jb250ZXh0 LT5kcmF3Rm9jdXNSaW5nKGZvY3VzUmluZ1JlY3RzLCBzdHlsZS0+b3V0bGluZVdpZHRoKCksIHN0 eWxlLT5vdXRsaW5lT2Zmc2V0KCksIGRvY3VtZW50KCkucGFnZSgpLT5mb2N1c0NvbnRyb2xsZXIo KS50aW1lU2luY2VGb2N1c1dhc1NldCgpLCBuZWVkc1JlcGFpbnQpOworICAgICAgICBpZiAobmVl ZHNSZXBhaW50KQorICAgICAgICAgICAgZG9jdW1lbnQoKS5wYWdlKCktPmZvY3VzQ29udHJvbGxl cigpLnNldEZvY3VzZWRFbGVtZW50TmVlZHNSZXBhaW50KCk7CisgICAgfQogI2Vsc2UKICAgICBw YWludEluZm8uY29udGV4dC0+ZHJhd0ZvY3VzUmluZyhmb2N1c1JpbmdSZWN0cywgc3R5bGUtPm91 dGxpbmVXaWR0aCgpLCBzdHlsZS0+b3V0bGluZU9mZnNldCgpLCBzdHlsZS0+dmlzaXRlZERlcGVu ZGVudENvbG9yKENTU1Byb3BlcnR5T3V0bGluZUNvbG9yKSk7CiAjZW5kaWYK 234518 2014-07-07 15:20:04 -0700 2014-07-07 15:44:30 -0700 Patch bug-134672-20140708081945.patch text/plain 3741 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwODI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGIxYTI1YTA3YjNiOTNh MGJkYmFjNDNhMzNiMzBiZDE4OWU2NzhiNS4uMGJmMDMyYjU5NzI5NGM5YTFlYzY1NWEwNjRjZTk3 ZGFlNzIyNjczNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE0LTA3LTA3ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBbTWFjXSBObyBuZWVkIHRvIHBh aW50IGZvY3VzIHJpbmcgaWYgcGFpbnRSZWN0IGlzIGNvbXBsZXRlbHkgY29udGFpbmVkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQ2NzIKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzE3MTg4ODcxPgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmlu IEFkbGVyLgorCisgICAgICAgIFRoZSBuZXcgT1MgWCBZb3NlbWl0ZSBmb2N1cyByaW5nIHN0eWxl IHVuY292ZXJlZCBhIGJ1ZyB3aGVyZQorICAgICAgICB3ZSByZXBhaW50IHRoZSBmb2N1cyByaW5n IHVubmVjZXNzYXJpbHkuIFRoZSBmaXggaXMgdG8gaXRlcmF0ZQorICAgICAgICBvdmVyIHRoZSBm b2N1cyByaW5nIHJlY3RhbmdsZXMgYW5kIGNoZWNrIGlmIHRoZSBmb2N1cyByaW5nIGhhcyBzb21l CisgICAgICAgIHBvcnRpb24gY29udGFpbmVkIHdpdGhpbiB0aGUgcGFpbnQgcmVjdGFuZ2xlLiBG b3IgZXhhbXBsZSwgYSBibGlua2luZworICAgICAgICBjYXJldCBpcyBzdWNoIGEgc21hbGwgcmVw YWludCByZWdpb24gdGhhdCBpdCBpcyB1bmxpa2VseSB0byBpbnRlcnNlY3Qgd2l0aCB0aGUKKyAg ICAgICAgZm9jdXMgcmluZy4KKworICAgICAgICBJIGRpZG4ndCBhcHBseSB0aGlzIGZpeCB0byBh bGwgcG9ydHMgYmVjYXVzZSBJIHdhc24ndCBjb25maWRlbnQKKyAgICAgICAgaW4gaG93IHRoZWly IGZvY3VzIHJpbmdzIHJlbmRlci4gVGhlIGZhY3QgdGhhdCBubyBvbmUgaGFkIG5vdGljZWQKKyAg ICAgICAgaXQgdW50aWwgbm93IG1ha2VzIG1lIHRoaW5rIHRoZXkgYWxzbyBoYWQgZnVsbHktb3Bh cXVlIHJpbmdzIChzdWNoCisgICAgICAgIGFzIE9TIFggYmVmb3JlIFlvc2VtaXRlKS4KKworICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyT2JqZWN0OjpwYWludEZvY3VzUmluZyk6IEl0ZXJhdGUgdGhyb3VnaCBmb2N1cworICAgICAg ICByaW5ncyB0byBjaGVjayBpZiB0aGV5IG92ZXJsYXAgdGhlIGVkZ2VzIG9mIHRoZSBwYWludGlu ZyByZWN0YW5nbGUsIGFuZCBvbmx5CisgICAgICAgIGRyYXcgdGhlIGZvY3VzIHJpbmcgaWYgbmVj ZXNzYXJ5LgorCiAyMDE0LTA3LTA1ICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAog ICAgICAgICBbaU9TXSBNZWRpYURvY3VtZW50IHNob3VsZCBzZXQgYSB2aWV3cG9ydApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAppbmRleCA3MmJlNDFlYmI5ZGIzYzE4 ZGYzOGRiZTJlM2U4M2NhMmM1ODM1MzBjLi42YjAzNGFlMGRhMGY1ZWM1OGRlOWU3OGU3ODkxZDBm NjQyY2Y0NTEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2Jq ZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcApA QCAtMTAwOSw2ICsxMDA5LDE0IEBAIHZvaWQgUmVuZGVyT2JqZWN0OjpkcmF3TGluZUZvckJveFNp ZGUoR3JhcGhpY3NDb250ZXh0KiBncmFwaGljc0NvbnRleHQsIGZsb2F0IHgxCiAgICAgfQogfQog CitzdGF0aWMgYm9vbCByZWN0T3ZlcmxhcHNSZWN0KGNvbnN0IEludFJlY3QmIG91dGVyLCBjb25z dCBJbnRSZWN0JiBpbm5lcikKK3sKKyAgICByZXR1cm4gb3V0ZXIuY29udGFpbnMoaW5uZXIubWlu WE1pbllDb3JuZXIoKSkKKyAgICAgICAgfHwgb3V0ZXIuY29udGFpbnMoaW5uZXIubWF4WE1pbllD b3JuZXIoKSkKKyAgICAgICAgfHwgb3V0ZXIuY29udGFpbnMoaW5uZXIubWluWE1heFlDb3JuZXIo KSkKKyAgICAgICAgfHwgb3V0ZXIuY29udGFpbnMoaW5uZXIubWF4WE1heFlDb3JuZXIoKSk7Cit9 CisKIHZvaWQgUmVuZGVyT2JqZWN0OjpwYWludEZvY3VzUmluZyhQYWludEluZm8mIHBhaW50SW5m bywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2Zmc2V0LCBSZW5kZXJTdHlsZSogc3R5bGUpCiB7 CiAgICAgQVNTRVJUKHN0eWxlLT5vdXRsaW5lU3R5bGVJc0F1dG8oKSk7CkBAIC0xMDE2LDEwICsx MDI0LDIxIEBAIHZvaWQgUmVuZGVyT2JqZWN0OjpwYWludEZvY3VzUmluZyhQYWludEluZm8mIHBh aW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50CiAgICAgVmVjdG9yPEludFJlY3Q+IGZv Y3VzUmluZ1JlY3RzOwogICAgIGFkZEZvY3VzUmluZ1JlY3RzKGZvY3VzUmluZ1JlY3RzLCBwYWlu dE9mZnNldCwgcGFpbnRJbmZvLnBhaW50Q29udGFpbmVyKTsKICNpZiBQTEFURk9STShNQUMpCi0g ICAgYm9vbCBuZWVkc1JlcGFpbnQ7Ci0gICAgcGFpbnRJbmZvLmNvbnRleHQtPmRyYXdGb2N1c1Jp bmcoZm9jdXNSaW5nUmVjdHMsIHN0eWxlLT5vdXRsaW5lV2lkdGgoKSwgc3R5bGUtPm91dGxpbmVP ZmZzZXQoKSwgZG9jdW1lbnQoKS5wYWdlKCktPmZvY3VzQ29udHJvbGxlcigpLnRpbWVTaW5jZUZv Y3VzV2FzU2V0KCksIG5lZWRzUmVwYWludCk7Ci0gICAgaWYgKG5lZWRzUmVwYWludCkKLSAgICAg ICAgZG9jdW1lbnQoKS5wYWdlKCktPmZvY3VzQ29udHJvbGxlcigpLnNldEZvY3VzZWRFbGVtZW50 TmVlZHNSZXBhaW50KCk7CisgICAgSW50UmVjdCBwYWludFJlY3QoZW5jbG9zaW5nSW50UmVjdChw YWludEluZm8ucmVjdCkpOworICAgIGJvb2wgZm9jdXNSaW5nTmVlZHNQYWludGluZyA9IGZhbHNl OworICAgIGZvciAoYXV0byYgZm9jdXNSZWN0IDogZm9jdXNSaW5nUmVjdHMpIHsKKyAgICAgICAg aWYgKHJlY3RPdmVybGFwc1JlY3QocGFpbnRSZWN0LCBmb2N1c1JlY3QpKSB7CisgICAgICAgICAg ICBmb2N1c1JpbmdOZWVkc1BhaW50aW5nID0gdHJ1ZTsKKyAgICAgICAgICAgIGJyZWFrOworICAg ICAgICB9CisgICAgfQorCisgICAgaWYgKGZvY3VzUmluZ05lZWRzUGFpbnRpbmcpIHsKKyAgICAg ICAgYm9vbCBuZWVkc1JlcGFpbnQ7CisgICAgICAgIHBhaW50SW5mby5jb250ZXh0LT5kcmF3Rm9j dXNSaW5nKGZvY3VzUmluZ1JlY3RzLCBzdHlsZS0+b3V0bGluZVdpZHRoKCksIHN0eWxlLT5vdXRs aW5lT2Zmc2V0KCksIGRvY3VtZW50KCkucGFnZSgpLT5mb2N1c0NvbnRyb2xsZXIoKS50aW1lU2lu Y2VGb2N1c1dhc1NldCgpLCBuZWVkc1JlcGFpbnQpOworICAgICAgICBpZiAobmVlZHNSZXBhaW50 KQorICAgICAgICAgICAgZG9jdW1lbnQoKS5wYWdlKCktPmZvY3VzQ29udHJvbGxlcigpLnNldEZv Y3VzZWRFbGVtZW50TmVlZHNSZXBhaW50KCk7CisgICAgfQogI2Vsc2UKICAgICBwYWludEluZm8u Y29udGV4dC0+ZHJhd0ZvY3VzUmluZyhmb2N1c1JpbmdSZWN0cywgc3R5bGUtPm91dGxpbmVXaWR0 aCgpLCBzdHlsZS0+b3V0bGluZU9mZnNldCgpLCBzdHlsZS0+dmlzaXRlZERlcGVuZGVudENvbG9y KENTU1Byb3BlcnR5T3V0bGluZUNvbG9yKSk7CiAjZW5kaWYK