117621 2013-06-13 18:52:36 -0700 [Mac] clicking caption track glyph should dismiss menu 2013-06-14 07:43:15 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 0 graouts graouts commit-queue eric.carlson esprehn+autocc glenn jer.noble webkit-bug-importer oldest_to_newest 900355 0 graouts 2013-06-13 18:52:36 -0700 Clicking on the caption glyph shows the caption menu if it is not visible. Clicking on it when the caption menu is already visible does nothing, it should dismiss the menu. 900356 1 graouts 2013-06-13 18:52:46 -0700 <rdar://problem/14143083> 900361 2 204662 graouts 2013-06-13 19:09:10 -0700 Created attachment 204662 Patch 900435 3 204662 joepeck 2013-06-13 23:47:19 -0700 Comment on attachment 204662 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=204662&action=review > Source/WebCore/html/shadow/MediaControlsApple.cpp:600 > if (event->type() == eventNames().mousewheelEvent && event->hasInterface(eventNames().interfaceForWheelEvent)) { Nit (not your code, but): This if can be an else if since if the top case is true, this case can never be true. Or early return here and no need to else if. 900540 4 204662 eric.carlson 2013-06-14 06:44:51 -0700 Comment on attachment 204662 Patch r=me, although it would be nice to address Joe's nit before landing. 900548 5 204711 graouts 2013-06-14 07:16:37 -0700 Created attachment 204711 Patch for landing 900550 6 graouts 2013-06-14 07:21:17 -0700 (In reply to comment #3) > (From update of attachment 204662 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=204662&action=review > > > Source/WebCore/html/shadow/MediaControlsApple.cpp:600 > > if (event->type() == eventNames().mousewheelEvent && event->hasInterface(eventNames().interfaceForWheelEvent)) { > > Nit (not your code, but): This if can be an else if since if the top case is true, this case can never be true. Or early return here and no need to else if. Actually, very much my code from a previous patch, fixed in patch for landing. 900562 7 204711 commit-queue 2013-06-14 07:43:13 -0700 Comment on attachment 204711 Patch for landing Clearing flags on attachment: 204711 Committed r151592: <http://trac.webkit.org/changeset/151592> 900563 8 commit-queue 2013-06-14 07:43:15 -0700 All reviewed patches have been landed. Closing bug. 204662 2013-06-13 19:09:10 -0700 2013-06-14 07:16:34 -0700 Patch bug-117621-20130613190729.patch text/plain 6341 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxNTMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmY3NjI2NDcyMmM0Njc0 ZWI5NzA4ZmNmYzUyZTJkY2QzNGU1NmNlMS4uZGE4ODdlMzQ2YmE5ZjQ3ODM2ODA4NDEwZjFjZDhm ZDgxMDcwYjczYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDEzLTA2LTEzICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW01hY10gY2xpY2tpbmcg Y2FwdGlvbiB0cmFjayBnbHlwaCBzaG91bGQgZGlzbWlzcyBtZW51CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTc2MjEKKworICAgICAgICBXZSBub3cg Y29ycmVjdGx5IGNhcHR1cmUgYWxsIGNsaWNrIGV2ZW50cyB3aGlsZSB0aGUgY2FwdGlvbnMgdHJh Y2sgbWVudQorICAgICAgICBpcyBzaG93aW5nLCBhbmQgZW5zdXJlIHRoYXQgbm8gb3RoZXIgY29u dHJvbCBpbiB0aGUgbWVkaWEgcGxheWVyIGNhbiBiZQorICAgICAgICBhY3RpdmF0ZWQgYXMgdGhl IHRyYWNrIGxpc3QgZ2V0cyBkaXNtaXNzZWQgYnkgY2xpY2tpbmcgYW55d2hlcmUgYnV0IG9uCisg ICAgICAgIGl0c2VsZi4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIGh0bWwvc2hhZG93L01lZGlhQ29udHJvbHNBcHBsZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpNZWRpYUNvbnRyb2xzQXBwbGU6OnNob3dDbG9zZWRDYXB0aW9uVHJhY2tMaXN0KToK KyAgICAgICAgTWFrZSB0aGUgY29udHJvbHMgcGFuZWwgbm9uLWludGVyYWN0aXZlIGFuZCB0cmFj ayBjbGljayBldmVudHMgaW4gdGhlCisgICAgICAgIGNhcHR1cmUgcGhhc2UgYWxzbyBvbiB0aGUg Y29udHJvbHMgY29udGFpbmVyIGl0c2VsZiBzdWNoIHRoYXQgd2UgY2FuCisgICAgICAgIGlkZW50 aWZ5IGNvcnJlY3RseSB3aGV0aGVyIGEgY2xpY2sgaW4gdGhlIDx2aWRlbz4gc2hhZG93IHRyZWUg aXMgb24KKyAgICAgICAgdGhlIHRyYWNrIGxpc3Qgb3IgYW5vdGhlciBlbGVtZW50ICh0aGUgdGFy Z2V0IGNvdWxkIG9ubHkgYmUgcmVzb2x2ZWQKKyAgICAgICAgdG8gYSBzaGFkb3cgdHJlZSBub2Rl IGlmIHRoZSBldmVudCBpcyBoYW5kbGVkIHdpdGhpbiB0aGUgc2hhZG93IHRyZWUpLgorCisgICAg ICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xzQXBwbGU6OmhpZGVDbG9zZWRDYXB0aW9uVHJhY2tM aXN0KToKKyAgICAgICAgTWFrZSB0aGUgY29udHJvbHMgcGFuZWwgaW50ZXJhY3RpdmUgYWdhaW4g YW5kIHJlbW92ZSB0aGUgbmV3IGNsaWNrCisgICAgICAgIGV2ZW50IGhhbmRsZXIgb24gdGhlIGNv bnRyb2xzIGNvbnRhaW5lci4KKworICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sc0FwcGxl OjpoYW5kbGVDbGlja0V2ZW50KToKKyAgICAgICAgQ2FwdHVyZSBhbnkgY2xpY2sgZXZlbnQgdGhh dCB0YXJnZXRzIGEgbm9kZSBhbnl3aGVyZSBvdXRzaWRlIG9mIHRoZSB0cmFjaworICAgICAgICBs aXN0IGNvbnRhaW5lciBhbmQgaXRzIHN1YnRyZWUgYW5kIGhpZGUgdGhlIHRyYWNrIGxpc3QgaW4g dGhpcyBjb25kaXRpb24uCisKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbHNBcHBsZUV2 ZW50TGlzdGVuZXI6OmhhbmRsZUV2ZW50KToKKyAgICAgICAgQ2FsbCBoYW5kbGVDbGlja0V2ZW50 KCkgb24gdGhlIG1lZGlhIGNvbnRyb2xzIHdoZW4gYSBjbGljayBldmVudCBpcyBoYW5kbGVkLgor CisgICAgICAgICogaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sc0FwcGxlLmg6CisgICAgICAgIE5l dyBwdWJsaWMgaGFuZGxlQ2xpY2tFdmVudCgpIEFQSSBzdWNoIHRoYXQgaXQgY2FuIGJlIGNhbGxl ZCBmcm9tCisgICAgICAgIE1lZGlhQ29udHJvbHNBcHBsZUV2ZW50TGlzdGVuZXI6OmhhbmRsZUV2 ZW50KCkuCisKIDIwMTMtMDYtMTIgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNv bT4KIAogICAgICAgICBSZW1vdmUgdGhlIG5vdGlvbiBvZiBpbmFjdGl2ZSBwbHVnLWlucwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sc0FwcGxlLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbHNBcHBsZS5jcHAKaW5k ZXggZDEwZGFmYWJlMWQxYzI2N2UyYjcyNjBmZTcwNjc3MzYwYmQ3Y2MxMC4uZDJhZWE2Y2VlNTQ1 NTkyN2VjMjNkMWFjYmFkMmY4NDI3YzkyMmU1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aHRtbC9zaGFkb3cvTWVkaWFDb250cm9sc0FwcGxlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xzQXBwbGUuY3BwCkBAIC0yOSw2ICsyOSw3IEBACiAjaWYg RU5BQkxFKFZJREVPKQogI2luY2x1ZGUgIk1lZGlhQ29udHJvbHNBcHBsZS5oIgogCisjaW5jbHVk ZSAiQ1NTVmFsdWVLZXl3b3Jkcy5oIgogI2luY2x1ZGUgIkNocm9tZS5oIgogI2luY2x1ZGUgIkV4 Y2VwdGlvbkNvZGVQbGFjZWhvbGRlci5oIgogI2luY2x1ZGUgIkhUTUxNZWRpYUVsZW1lbnQuaCIK QEAgLTUxNSw5ICs1MTYsMjEgQEAgdm9pZCBNZWRpYUNvbnRyb2xzQXBwbGU6OnNob3dDbG9zZWRD YXB0aW9uVHJhY2tMaXN0KCkKIAogICAgIG1fY2xvc2VkQ2FwdGlvbnNDb250YWluZXItPnNob3co KTsKIAorICAgIC8vIEVuc3VyZSB0aGUgY29udHJvbHMgcGFuZWwgZG9lcyBub3QgcmVjZWl2ZSBh bnkgZXZlbnRzIHdoaWxlIHRoZSBjYXB0aW9ucworICAgIC8vIHRyYWNrIGxpc3QgaXMgdmlzaWJs ZSBhcyBhbGwgZXZlbnRzIG5vdyBuZWVkIHRvIGJlIGNhcHR1cmVkIGJ5IHRoZQorICAgIC8vIHRy YWNrIGxpc3QuCisgICAgbV9wYW5lbC0+c2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0 eVBvaW50ZXJFdmVudHMsIENTU1ZhbHVlTm9uZSk7CisKICAgICBSZWZQdHI8RXZlbnRMaXN0ZW5l cj4gbGlzdGVuZXIgPSBldmVudExpc3RlbmVyKCk7CiAgICAgbV9jbG9zZWRDYXB0aW9uc0NvbnRh aW5lci0+YWRkRXZlbnRMaXN0ZW5lcihldmVudE5hbWVzKCkubW91c2V3aGVlbEV2ZW50LCBsaXN0 ZW5lciwgdHJ1ZSk7CisKKyAgICAvLyBUcmFjayBjbGljayBldmVudHMgaW4gdGhlIGNhcHR1cmUg cGhhc2UgYXQgdHdvIGxldmVscywgZmlyc3QgYXQgdGhlIGRvY3VtZW50IGxldmVsCisgICAgLy8g c3VjaCB0aGF0IGEgY2xpY2sgb3V0c2lkZSBvZiB0aGUgPHZpZGVvPiBtYXkgZGlzbWlzcyB0aGUg dHJhY2sgbGlzdCwgc2Vjb25kIGF0IHRoZQorICAgIC8vIG1lZGlhIGNvbnRyb2xzIGxldmVsIHN1 Y2ggdGhhdCBhIGNsaWNrIGFueXdoZXJlIG91dHNpZGUgb2YgdGhlIHRyYWNrIGxpc3QgaGlkZXMg dGhlCisgICAgLy8gdHJhY2sgbGlzdC4gVGhlc2UgdHdvIGxldmVscyBhcmUgbmVjZXNzYXJ5IHNp bmNlIGl0IHdvdWxkIG5vdCBiZSBwb3NzaWJsZSB0byBnZXQgYQorICAgIC8vIHJlZmVyZW5jZSB0 byB0aGUgdHJhY2sgbGlzdCB3aGVuIGhhbmRsaW5nIHRoZSBldmVudCBvdXRzaWRlIG9mIHRoZSBz aGFkb3cgdHJlZS4KICAgICBkb2N1bWVudCgpLT5hZGRFdmVudExpc3RlbmVyKGV2ZW50TmFtZXMo KS5jbGlja0V2ZW50LCBsaXN0ZW5lciwgdHJ1ZSk7CisgICAgYWRkRXZlbnRMaXN0ZW5lcihldmVu dE5hbWVzKCkuY2xpY2tFdmVudCwgbGlzdGVuZXIsIHRydWUpOwogfQogCiB2b2lkIE1lZGlhQ29u dHJvbHNBcHBsZTo6aGlkZUNsb3NlZENhcHRpb25UcmFja0xpc3QoKQpAQCAtNTI3LDkgKzU0MCwx MyBAQCB2b2lkIE1lZGlhQ29udHJvbHNBcHBsZTo6aGlkZUNsb3NlZENhcHRpb25UcmFja0xpc3Qo KQogCiAgICAgbV9jbG9zZWRDYXB0aW9uc0NvbnRhaW5lci0+aGlkZSgpOwogCisgICAgLy8gQnV0 dG9ucyBpbiB0aGUgY29udHJvbHMgcGFuZWwgbWF5IG5vdyBiZSBpbnRlcmFjdGl2ZS4KKyAgICBt X3BhbmVsLT5yZW1vdmVJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5UG9pbnRlckV2ZW50 cyk7CisKICAgICBFdmVudExpc3RlbmVyKiBsaXN0ZW5lciA9IGV2ZW50TGlzdGVuZXIoKS5nZXQo KTsKICAgICBtX2Nsb3NlZENhcHRpb25zQ29udGFpbmVyLT5yZW1vdmVFdmVudExpc3RlbmVyKGV2 ZW50TmFtZXMoKS5tb3VzZXdoZWVsRXZlbnQsIGxpc3RlbmVyLCB0cnVlKTsKICAgICBkb2N1bWVu dCgpLT5yZW1vdmVFdmVudExpc3RlbmVyKGV2ZW50TmFtZXMoKS5jbGlja0V2ZW50LCBsaXN0ZW5l ciwgdHJ1ZSk7CisgICAgcmVtb3ZlRXZlbnRMaXN0ZW5lcihldmVudE5hbWVzKCkuY2xpY2tFdmVu dCwgbGlzdGVuZXIsIHRydWUpOwogfQogCiBib29sIE1lZGlhQ29udHJvbHNBcHBsZTo6c2hvdWxk Q2xvc2VkQ2FwdGlvbnNDb250YWluZXJQcmV2ZW50UGFnZVNjcm9sbGluZyhpbnQgd2hlZWxEZWx0 YVkpCkBAIC01NDQsNiArNTYxLDE4IEBAIGJvb2wgTWVkaWFDb250cm9sc0FwcGxlOjpzaG91bGRD bG9zZWRDYXB0aW9uc0NvbnRhaW5lclByZXZlbnRQYWdlU2Nyb2xsaW5nKGludCB3CiAgICAgcmV0 dXJuIGZhbHNlOwogfQogCit2b2lkIE1lZGlhQ29udHJvbHNBcHBsZTo6aGFuZGxlQ2xpY2tFdmVu dChFdmVudCogZXZlbnQpCit7CisgICAgTm9kZSogY3VycmVudFRhcmdldCA9IGV2ZW50LT5jdXJy ZW50VGFyZ2V0KCktPnRvTm9kZSgpOworICAgIE5vZGUqIHRhcmdldCA9IGV2ZW50LT50YXJnZXQo KS0+dG9Ob2RlKCk7CisKKyAgICBpZiAoKGN1cnJlbnRUYXJnZXQgPT0gZG9jdW1lbnQoKSAmJiAh c2hhZG93SG9zdCgpLT5jb250YWlucyh0YXJnZXQpKSB8fCAoY3VycmVudFRhcmdldCA9PSB0aGlz ICYmICFtX2Nsb3NlZENhcHRpb25zQ29udGFpbmVyLT5jb250YWlucyh0YXJnZXQpKSkgeworICAg ICAgICBoaWRlQ2xvc2VkQ2FwdGlvblRyYWNrTGlzdCgpOworICAgICAgICBldmVudC0+c3RvcElt bWVkaWF0ZVByb3BhZ2F0aW9uKCk7CisgICAgICAgIGV2ZW50LT5zZXREZWZhdWx0SGFuZGxlZCgp OworICAgIH0KK30KKwogdm9pZCBNZWRpYUNvbnRyb2xzQXBwbGU6OmNsb3NlZENhcHRpb25UcmFj a3NDaGFuZ2VkKCkKIHsKICAgICBpZiAobV90b2dnbGVDbG9zZWRDYXB0aW9uc0J1dHRvbikgewpA QCAtNTY1LDggKzU5NCw4IEBAIFBhc3NSZWZQdHI8TWVkaWFDb250cm9sc0FwcGxlRXZlbnRMaXN0 ZW5lcj4gTWVkaWFDb250cm9sc0FwcGxlOjpldmVudExpc3RlbmVyKCkKIAogdm9pZCBNZWRpYUNv bnRyb2xzQXBwbGVFdmVudExpc3RlbmVyOjpoYW5kbGVFdmVudChTY3JpcHRFeGVjdXRpb25Db250 ZXh0KiwgRXZlbnQqIGV2ZW50KQogewotICAgIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFt ZXMoKS5jbGlja0V2ZW50ICYmICFtX21lZGlhQ29udHJvbHMtPmNvbnRhaW5zKGV2ZW50LT50YXJn ZXQoKS0+dG9Ob2RlKCkpKQotICAgICAgICBtX21lZGlhQ29udHJvbHMtPnRvZ2dsZUNsb3NlZENh cHRpb25UcmFja0xpc3QoKTsKKyAgICBpZiAoZXZlbnQtPnR5cGUoKSA9PSBldmVudE5hbWVzKCku Y2xpY2tFdmVudCkKKyAgICAgICAgbV9tZWRpYUNvbnRyb2xzLT5oYW5kbGVDbGlja0V2ZW50KGV2 ZW50KTsKIAogICAgIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5tb3VzZXdoZWVs RXZlbnQgJiYgZXZlbnQtPmhhc0ludGVyZmFjZShldmVudE5hbWVzKCkuaW50ZXJmYWNlRm9yV2hl ZWxFdmVudCkpIHsKICAgICAgICAgV2hlZWxFdmVudCogd2hlZWxFdmVudCA9IHN0YXRpY19jYXN0 PFdoZWVsRXZlbnQqPihldmVudCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3No YWRvdy9NZWRpYUNvbnRyb2xzQXBwbGUuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01l ZGlhQ29udHJvbHNBcHBsZS5oCmluZGV4IDhkYmU1YmU5YTE3Yjc2OTc2YTM1MzM4NjlmNGZhYWQw YTg1MzI5MTAuLmM3ZTFkOWM4ZjkwZTE1NzcyZDVhNjUxYmZkOGQzZGFiODE3MWJhODIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbHNBcHBsZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbHNBcHBsZS5oCkBAIC04 OSw2ICs4OSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgY2xvc2VkQ2FwdGlvblRyYWNr c0NoYW5nZWQoKSBPVkVSUklERTsKIAogICAgIGJvb2wgc2hvdWxkQ2xvc2VkQ2FwdGlvbnNDb250 YWluZXJQcmV2ZW50UGFnZVNjcm9sbGluZyhpbnQgd2hlZWxEZWx0YVkpOworICAgIHZvaWQgaGFu ZGxlQ2xpY2tFdmVudChFdmVudCopOwogCiBwcml2YXRlOgogICAgIE1lZGlhQ29udHJvbHNBcHBs ZShEb2N1bWVudCopOwo= 204711 2013-06-14 07:16:37 -0700 2013-06-14 07:43:13 -0700 Patch for landing bug-117621-20130614071456.patch text/plain 6610 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxNTMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmY3NjI2NDcyMmM0Njc0 ZWI5NzA4ZmNmYzUyZTJkY2QzNGU1NmNlMS4uZmNmZDA5YTk3NTkyYjcwMGJhNDVkYTZhYjMxMTQz OTE1YmZhYWUxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDEzLTA2LTEzICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW01hY10gY2xpY2tpbmcg Y2FwdGlvbiB0cmFjayBnbHlwaCBzaG91bGQgZGlzbWlzcyBtZW51CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTc2MjEKKworICAgICAgICBXZSBub3cg Y29ycmVjdGx5IGNhcHR1cmUgYWxsIGNsaWNrIGV2ZW50cyB3aGlsZSB0aGUgY2FwdGlvbnMgdHJh Y2sgbWVudQorICAgICAgICBpcyBzaG93aW5nLCBhbmQgZW5zdXJlIHRoYXQgbm8gb3RoZXIgY29u dHJvbCBpbiB0aGUgbWVkaWEgcGxheWVyIGNhbiBiZQorICAgICAgICBhY3RpdmF0ZWQgYXMgdGhl IHRyYWNrIGxpc3QgZ2V0cyBkaXNtaXNzZWQgYnkgY2xpY2tpbmcgYW55d2hlcmUgYnV0IG9uCisg ICAgICAgIGl0c2VsZi4KKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24uCisKKyAg ICAgICAgKiBodG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xzQXBwbGUuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFDb250cm9sc0FwcGxlOjpzaG93Q2xvc2VkQ2FwdGlvblRyYWNrTGlzdCk6Cisg ICAgICAgIE1ha2UgdGhlIGNvbnRyb2xzIHBhbmVsIG5vbi1pbnRlcmFjdGl2ZSBhbmQgdHJhY2sg Y2xpY2sgZXZlbnRzIGluIHRoZQorICAgICAgICBjYXB0dXJlIHBoYXNlIGFsc28gb24gdGhlIGNv bnRyb2xzIGNvbnRhaW5lciBpdHNlbGYgc3VjaCB0aGF0IHdlIGNhbgorICAgICAgICBpZGVudGlm eSBjb3JyZWN0bHkgd2hldGhlciBhIGNsaWNrIGluIHRoZSA8dmlkZW8+IHNoYWRvdyB0cmVlIGlz IG9uCisgICAgICAgIHRoZSB0cmFjayBsaXN0IG9yIGFub3RoZXIgZWxlbWVudCAodGhlIHRhcmdl dCBjb3VsZCBvbmx5IGJlIHJlc29sdmVkCisgICAgICAgIHRvIGEgc2hhZG93IHRyZWUgbm9kZSBp ZiB0aGUgZXZlbnQgaXMgaGFuZGxlZCB3aXRoaW4gdGhlIHNoYWRvdyB0cmVlKS4KKworICAgICAg ICAoV2ViQ29yZTo6TWVkaWFDb250cm9sc0FwcGxlOjpoaWRlQ2xvc2VkQ2FwdGlvblRyYWNrTGlz dCk6CisgICAgICAgIE1ha2UgdGhlIGNvbnRyb2xzIHBhbmVsIGludGVyYWN0aXZlIGFnYWluIGFu ZCByZW1vdmUgdGhlIG5ldyBjbGljaworICAgICAgICBldmVudCBoYW5kbGVyIG9uIHRoZSBjb250 cm9scyBjb250YWluZXIuCisKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbHNBcHBsZTo6 aGFuZGxlQ2xpY2tFdmVudCk6CisgICAgICAgIENhcHR1cmUgYW55IGNsaWNrIGV2ZW50IHRoYXQg dGFyZ2V0cyBhIG5vZGUgYW55d2hlcmUgb3V0c2lkZSBvZiB0aGUgdHJhY2sKKyAgICAgICAgbGlz dCBjb250YWluZXIgYW5kIGl0cyBzdWJ0cmVlIGFuZCBoaWRlIHRoZSB0cmFjayBsaXN0IGluIHRo aXMgY29uZGl0aW9uLgorCisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xzQXBwbGVFdmVu dExpc3RlbmVyOjpoYW5kbGVFdmVudCk6CisgICAgICAgIENhbGwgaGFuZGxlQ2xpY2tFdmVudCgp IG9uIHRoZSBtZWRpYSBjb250cm9scyB3aGVuIGEgY2xpY2sgZXZlbnQgaXMgaGFuZGxlZC4KKwor ICAgICAgICAqIGh0bWwvc2hhZG93L01lZGlhQ29udHJvbHNBcHBsZS5oOgorICAgICAgICBOZXcg cHVibGljIGhhbmRsZUNsaWNrRXZlbnQoKSBBUEkgc3VjaCB0aGF0IGl0IGNhbiBiZSBjYWxsZWQg ZnJvbQorICAgICAgICBNZWRpYUNvbnRyb2xzQXBwbGVFdmVudExpc3RlbmVyOjpoYW5kbGVFdmVu dCgpLgorCiAyMDEzLTA2LTEyICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+ CiAKICAgICAgICAgUmVtb3ZlIHRoZSBub3Rpb24gb2YgaW5hY3RpdmUgcGx1Zy1pbnMKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbHNBcHBsZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xzQXBwbGUuY3BwCmluZGV4 IGQxMGRhZmFiZTFkMWMyNjdlMmI3MjYwZmU3MDY3NzM2MGJkN2NjMTAuLjViZTg0NmY0Yjg4MGMx MjE0YTUzYmZlYzM1OGY5NDAwOGY2YTEyMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvc2hhZG93L01lZGlhQ29udHJvbHNBcHBsZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRt bC9zaGFkb3cvTWVkaWFDb250cm9sc0FwcGxlLmNwcApAQCAtMjksNiArMjksNyBAQAogI2lmIEVO QUJMRShWSURFTykKICNpbmNsdWRlICJNZWRpYUNvbnRyb2xzQXBwbGUuaCIKIAorI2luY2x1ZGUg IkNTU1ZhbHVlS2V5d29yZHMuaCIKICNpbmNsdWRlICJDaHJvbWUuaCIKICNpbmNsdWRlICJFeGNl cHRpb25Db2RlUGxhY2Vob2xkZXIuaCIKICNpbmNsdWRlICJIVE1MTWVkaWFFbGVtZW50LmgiCkBA IC01MTUsOSArNTE2LDIxIEBAIHZvaWQgTWVkaWFDb250cm9sc0FwcGxlOjpzaG93Q2xvc2VkQ2Fw dGlvblRyYWNrTGlzdCgpCiAKICAgICBtX2Nsb3NlZENhcHRpb25zQ29udGFpbmVyLT5zaG93KCk7 CiAKKyAgICAvLyBFbnN1cmUgdGhlIGNvbnRyb2xzIHBhbmVsIGRvZXMgbm90IHJlY2VpdmUgYW55 IGV2ZW50cyB3aGlsZSB0aGUgY2FwdGlvbnMKKyAgICAvLyB0cmFjayBsaXN0IGlzIHZpc2libGUg YXMgYWxsIGV2ZW50cyBub3cgbmVlZCB0byBiZSBjYXB0dXJlZCBieSB0aGUKKyAgICAvLyB0cmFj ayBsaXN0LgorICAgIG1fcGFuZWwtPnNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlQ b2ludGVyRXZlbnRzLCBDU1NWYWx1ZU5vbmUpOworCiAgICAgUmVmUHRyPEV2ZW50TGlzdGVuZXI+ IGxpc3RlbmVyID0gZXZlbnRMaXN0ZW5lcigpOwogICAgIG1fY2xvc2VkQ2FwdGlvbnNDb250YWlu ZXItPmFkZEV2ZW50TGlzdGVuZXIoZXZlbnROYW1lcygpLm1vdXNld2hlZWxFdmVudCwgbGlzdGVu ZXIsIHRydWUpOworCisgICAgLy8gVHJhY2sgY2xpY2sgZXZlbnRzIGluIHRoZSBjYXB0dXJlIHBo YXNlIGF0IHR3byBsZXZlbHMsIGZpcnN0IGF0IHRoZSBkb2N1bWVudCBsZXZlbAorICAgIC8vIHN1 Y2ggdGhhdCBhIGNsaWNrIG91dHNpZGUgb2YgdGhlIDx2aWRlbz4gbWF5IGRpc21pc3MgdGhlIHRy YWNrIGxpc3QsIHNlY29uZCBhdCB0aGUKKyAgICAvLyBtZWRpYSBjb250cm9scyBsZXZlbCBzdWNo IHRoYXQgYSBjbGljayBhbnl3aGVyZSBvdXRzaWRlIG9mIHRoZSB0cmFjayBsaXN0IGhpZGVzIHRo ZQorICAgIC8vIHRyYWNrIGxpc3QuIFRoZXNlIHR3byBsZXZlbHMgYXJlIG5lY2Vzc2FyeSBzaW5j ZSBpdCB3b3VsZCBub3QgYmUgcG9zc2libGUgdG8gZ2V0IGEKKyAgICAvLyByZWZlcmVuY2UgdG8g dGhlIHRyYWNrIGxpc3Qgd2hlbiBoYW5kbGluZyB0aGUgZXZlbnQgb3V0c2lkZSBvZiB0aGUgc2hh ZG93IHRyZWUuCiAgICAgZG9jdW1lbnQoKS0+YWRkRXZlbnRMaXN0ZW5lcihldmVudE5hbWVzKCku Y2xpY2tFdmVudCwgbGlzdGVuZXIsIHRydWUpOworICAgIGFkZEV2ZW50TGlzdGVuZXIoZXZlbnRO YW1lcygpLmNsaWNrRXZlbnQsIGxpc3RlbmVyLCB0cnVlKTsKIH0KIAogdm9pZCBNZWRpYUNvbnRy b2xzQXBwbGU6OmhpZGVDbG9zZWRDYXB0aW9uVHJhY2tMaXN0KCkKQEAgLTUyNyw5ICs1NDAsMTMg QEAgdm9pZCBNZWRpYUNvbnRyb2xzQXBwbGU6OmhpZGVDbG9zZWRDYXB0aW9uVHJhY2tMaXN0KCkK IAogICAgIG1fY2xvc2VkQ2FwdGlvbnNDb250YWluZXItPmhpZGUoKTsKIAorICAgIC8vIEJ1dHRv bnMgaW4gdGhlIGNvbnRyb2xzIHBhbmVsIG1heSBub3cgYmUgaW50ZXJhY3RpdmUuCisgICAgbV9w YW5lbC0+cmVtb3ZlSW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eVBvaW50ZXJFdmVudHMp OworCiAgICAgRXZlbnRMaXN0ZW5lciogbGlzdGVuZXIgPSBldmVudExpc3RlbmVyKCkuZ2V0KCk7 CiAgICAgbV9jbG9zZWRDYXB0aW9uc0NvbnRhaW5lci0+cmVtb3ZlRXZlbnRMaXN0ZW5lcihldmVu dE5hbWVzKCkubW91c2V3aGVlbEV2ZW50LCBsaXN0ZW5lciwgdHJ1ZSk7CiAgICAgZG9jdW1lbnQo KS0+cmVtb3ZlRXZlbnRMaXN0ZW5lcihldmVudE5hbWVzKCkuY2xpY2tFdmVudCwgbGlzdGVuZXIs IHRydWUpOworICAgIHJlbW92ZUV2ZW50TGlzdGVuZXIoZXZlbnROYW1lcygpLmNsaWNrRXZlbnQs IGxpc3RlbmVyLCB0cnVlKTsKIH0KIAogYm9vbCBNZWRpYUNvbnRyb2xzQXBwbGU6OnNob3VsZENs b3NlZENhcHRpb25zQ29udGFpbmVyUHJldmVudFBhZ2VTY3JvbGxpbmcoaW50IHdoZWVsRGVsdGFZ KQpAQCAtNTQ0LDYgKzU2MSwxOCBAQCBib29sIE1lZGlhQ29udHJvbHNBcHBsZTo6c2hvdWxkQ2xv c2VkQ2FwdGlvbnNDb250YWluZXJQcmV2ZW50UGFnZVNjcm9sbGluZyhpbnQgdwogICAgIHJldHVy biBmYWxzZTsKIH0KIAordm9pZCBNZWRpYUNvbnRyb2xzQXBwbGU6OmhhbmRsZUNsaWNrRXZlbnQo RXZlbnQqIGV2ZW50KQoreworICAgIE5vZGUqIGN1cnJlbnRUYXJnZXQgPSBldmVudC0+Y3VycmVu dFRhcmdldCgpLT50b05vZGUoKTsKKyAgICBOb2RlKiB0YXJnZXQgPSBldmVudC0+dGFyZ2V0KCkt PnRvTm9kZSgpOworCisgICAgaWYgKChjdXJyZW50VGFyZ2V0ID09IGRvY3VtZW50KCkgJiYgIXNo YWRvd0hvc3QoKS0+Y29udGFpbnModGFyZ2V0KSkgfHwgKGN1cnJlbnRUYXJnZXQgPT0gdGhpcyAm JiAhbV9jbG9zZWRDYXB0aW9uc0NvbnRhaW5lci0+Y29udGFpbnModGFyZ2V0KSkpIHsKKyAgICAg ICAgaGlkZUNsb3NlZENhcHRpb25UcmFja0xpc3QoKTsKKyAgICAgICAgZXZlbnQtPnN0b3BJbW1l ZGlhdGVQcm9wYWdhdGlvbigpOworICAgICAgICBldmVudC0+c2V0RGVmYXVsdEhhbmRsZWQoKTsK KyAgICB9Cit9CisKIHZvaWQgTWVkaWFDb250cm9sc0FwcGxlOjpjbG9zZWRDYXB0aW9uVHJhY2tz Q2hhbmdlZCgpCiB7CiAgICAgaWYgKG1fdG9nZ2xlQ2xvc2VkQ2FwdGlvbnNCdXR0b24pIHsKQEAg LTU2NSwxMCArNTk0LDEwIEBAIFBhc3NSZWZQdHI8TWVkaWFDb250cm9sc0FwcGxlRXZlbnRMaXN0 ZW5lcj4gTWVkaWFDb250cm9sc0FwcGxlOjpldmVudExpc3RlbmVyKCkKIAogdm9pZCBNZWRpYUNv bnRyb2xzQXBwbGVFdmVudExpc3RlbmVyOjpoYW5kbGVFdmVudChTY3JpcHRFeGVjdXRpb25Db250 ZXh0KiwgRXZlbnQqIGV2ZW50KQogewotICAgIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFt ZXMoKS5jbGlja0V2ZW50ICYmICFtX21lZGlhQ29udHJvbHMtPmNvbnRhaW5zKGV2ZW50LT50YXJn ZXQoKS0+dG9Ob2RlKCkpKQotICAgICAgICBtX21lZGlhQ29udHJvbHMtPnRvZ2dsZUNsb3NlZENh cHRpb25UcmFja0xpc3QoKTsKKyAgICBpZiAoZXZlbnQtPnR5cGUoKSA9PSBldmVudE5hbWVzKCku Y2xpY2tFdmVudCkKKyAgICAgICAgbV9tZWRpYUNvbnRyb2xzLT5oYW5kbGVDbGlja0V2ZW50KGV2 ZW50KTsKIAotICAgIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5tb3VzZXdoZWVs RXZlbnQgJiYgZXZlbnQtPmhhc0ludGVyZmFjZShldmVudE5hbWVzKCkuaW50ZXJmYWNlRm9yV2hl ZWxFdmVudCkpIHsKKyAgICBlbHNlIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5t b3VzZXdoZWVsRXZlbnQgJiYgZXZlbnQtPmhhc0ludGVyZmFjZShldmVudE5hbWVzKCkuaW50ZXJm YWNlRm9yV2hlZWxFdmVudCkpIHsKICAgICAgICAgV2hlZWxFdmVudCogd2hlZWxFdmVudCA9IHN0 YXRpY19jYXN0PFdoZWVsRXZlbnQqPihldmVudCk7CiAgICAgICAgIGlmIChtX21lZGlhQ29udHJv bHMtPnNob3VsZENsb3NlZENhcHRpb25zQ29udGFpbmVyUHJldmVudFBhZ2VTY3JvbGxpbmcod2hl ZWxFdmVudC0+d2hlZWxEZWx0YVkoKSkpCiAgICAgICAgICAgICBldmVudC0+cHJldmVudERlZmF1 bHQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJv bHNBcHBsZS5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sc0FwcGxl LmgKaW5kZXggOGRiZTViZTlhMTdiNzY5NzZhMzUzMzg2OWY0ZmFhZDBhODUzMjkxMC4uYzdlMWQ5 YzhmOTBlMTU3NzJkNWE2NTFiZmQ4ZDNkYWI4MTcxYmE4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sc0FwcGxlLmgKKysrIGIvU291cmNlL1dlYkNv cmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sc0FwcGxlLmgKQEAgLTg5LDYgKzg5LDcgQEAgcHVi bGljOgogICAgIHZpcnR1YWwgdm9pZCBjbG9zZWRDYXB0aW9uVHJhY2tzQ2hhbmdlZCgpIE9WRVJS SURFOwogCiAgICAgYm9vbCBzaG91bGRDbG9zZWRDYXB0aW9uc0NvbnRhaW5lclByZXZlbnRQYWdl U2Nyb2xsaW5nKGludCB3aGVlbERlbHRhWSk7CisgICAgdm9pZCBoYW5kbGVDbGlja0V2ZW50KEV2 ZW50Kik7CiAKIHByaXZhdGU6CiAgICAgTWVkaWFDb250cm9sc0FwcGxlKERvY3VtZW50Kik7Cg==