23696 2009-02-02 13:57:45 -0800 CHROMIUM: select element doesn't show new value when focus is switched in onchange event 2009-02-02 16:45:29 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fishd fishd oldest_to_newest 108030 0 fishd 2009-02-02 13:57:45 -0800 CHROMIUM: select element doesn't show new value when focus is switched in onchange event Original bug report: http://code.google.com/p/chromium/issues/detail?id=3514 It looks like we need to hide the PopupMenu before calling valueChanged. Patch coming up. 108031 1 27258 fishd 2009-02-02 13:58:09 -0800 Created attachment 27258 test case 108046 2 27262 fishd 2009-02-02 15:28:21 -0800 Created attachment 27262 v1 patch This already has R=ojan here: http://codereview.chromium.org/19765 108048 3 27262 eric 2009-02-02 15:32:35 -0800 Comment on attachment 27262 v1 patch if (!m_listBox->parent()) { 366 // Must get called after we have a client. 367 addChild(m_listBox.get()); 368 } Why? Also: PopupMenu::~PopupMenu() { hide(); + p.popup = 0; } is p.popup a smartpointer? If so, we should consider using .clear() instead. If it's not, I expect we're leaking the PopupContainer. 108052 4 fishd 2009-02-02 16:01:31 -0800 (In reply to comment #3) > (From update of attachment 27262 [review]) > if (!m_listBox->parent()) { > 366 // Must get called after we have a client. > 367 addChild(m_listBox.get()); > 368 } Whoa, that is actually a very stale comment. I removed it. > Also: > PopupMenu::~PopupMenu() > { > hide(); > + p.popup = 0; > } > > is p.popup a smartpointer? If so, we should consider using .clear() instead. > If it's not, I expect we're leaking the PopupContainer. Good catch. Nulling out this RefPtr is definitely extraneous. 108055 5 27264 fishd 2009-02-02 16:24:02 -0800 Created attachment 27264 v2 patch 108059 6 27264 eric 2009-02-02 16:35:46 -0800 Comment on attachment 27264 v2 patch LGTM. 108061 7 fishd 2009-02-02 16:45:29 -0800 http://trac.webkit.org/changeset/40504 27258 2009-02-02 13:58:09 -0800 2009-02-02 13:58:09 -0800 test case foo2.html text/html 733 fishd PGh0bWw+DQogIDxoZWFkPg0KICAgIDxzY3JpcHQgdHlwZT0ndGV4dC9qYXZhc2NyaXB0Jz4NCiAg ICAgIGJhbmcgPSBmdW5jdGlvbihmaWVsZDEpIHsNCiAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVu dEJ5SWQoJ2ZpZWxkMicpLmZvY3VzKCk7DQogICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCdmaWVsZDInKS52YWx1ZSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdmaWVsZDEnKS52YWx1 ZTsNCi8vICAgICAgICBhbGVydChkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnZmllbGQxJykudmFs dWUpOw0KICAgICAgfQ0KICAgIDwvc2NyaXB0Pg0KICA8L2hlYWQ+DQogIDxib2R5Pg0KICAgIDxk aXY+DQoJICBDaGFuZ2UgdGhlIHZhbHVlIG9mIHRoZSBzZWxlY3QgZWxlbWVudC4gVGhlIHZhbHVl IGRvZXNuJ3Qgc2hvdyBhcyANCgkgIGNoYW5nZWQgdW50aWwgeW91IHJlZm9jdXMgaXQsIGJ1dCBn ZXR0aW5nIHRoZSB2YWx1ZSB2aWEgSlMgc2hvd3MgdGhlIA0KCSAgbmV3IHZhbHVlLg0KCTwvZGl2 Pg0KDQogICAgPHNlbGVjdCBpZD0nZmllbGQxJyBvbmNoYW5nZT0nYmFuZyh0aGlzKSc+DQogICAg ICA8b3B0aW9uIHZhbHVlPSdGb28nPkZvbzwvb3B0aW9uPg0KICAgICAgPG9wdGlvbiB2YWx1ZT0n QmFyJz5CYXI8L29wdGlvbj4NCiAgICA8L3NlbGVjdD4NCg0KICAgIDxpbnB1dCBpZD0nZmllbGQy JyB0eXBlPSd0ZXh0JyB2YWx1ZT0nRm9vJy8+DQogIDwvYm9keT4NCjwvaHRtbD4NCg== 27262 2009-02-02 15:28:21 -0800 2009-02-02 16:24:02 -0800 v1 patch popup_1.diff text/plain 3605 fishd SW5kZXg6IHRoaXJkX3BhcnR5L1dlYktpdC9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVw TWVudUNocm9taXVtLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSB0aGlyZF9wYXJ0eS9XZWJLaXQvV2ViQ29y ZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHAJKHJldmlzaW9uIDkwMTAp CisrKyB0aGlyZF9wYXJ0eS9XZWJLaXQvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1l bnVDaHJvbWl1bS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTczLDYgKzczLDExIEBACiAvLyBib3gg KCJjb21ib2JveCIgb24gV2luZG93cykuCiBjbGFzcyBQb3B1cExpc3RCb3ggOiBwdWJsaWMgRnJh bWVsZXNzU2Nyb2xsVmlldywgcHVibGljIFJlZkNvdW50ZWQ8UG9wdXBMaXN0Qm94PiB7CiBwdWJs aWM6CisgICAgc3RhdGljIFBhc3NSZWZQdHI8UG9wdXBMaXN0Qm94PiBjcmVhdGUoUG9wdXBNZW51 Q2xpZW50KiBjbGllbnQpCisgICAgeworICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IFBvcHVw TGlzdEJveChjbGllbnQpKTsKKyAgICB9CisKICAgICAvLyBGcmFtZWxlc3NTY3JvbGxWaWV3CiAg ICAgdmlydHVhbCB2b2lkIHBhaW50KEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFJlY3QmKTsK ICAgICB2aXJ0dWFsIGJvb2wgaGFuZGxlTW91c2VEb3duRXZlbnQoY29uc3QgUGxhdGZvcm1Nb3Vz ZUV2ZW50Jik7CkBAIC0zMjMsMTMgKzMyOCw5IEBACiB9CiAKIFBvcHVwQ29udGFpbmVyOjpQb3B1 cENvbnRhaW5lcihQb3B1cE1lbnVDbGllbnQqIGNsaWVudCwgYm9vbCBmb2N1c09uU2hvdykKLSAg ICA6IG1fbGlzdEJveChuZXcgUG9wdXBMaXN0Qm94KGNsaWVudCkpLAotICAgICAgbV9mb2N1c09u U2hvdyhmb2N1c09uU2hvdykKKyAgICA6IG1fbGlzdEJveChQb3B1cExpc3RCb3g6OmNyZWF0ZShj bGllbnQpKQorICAgICwgbV9mb2N1c09uU2hvdyhmb2N1c09uU2hvdykKIHsKLSAgICAvLyBGcmFt ZVZpZXdzIGFyZSBjcmVhdGVkIHdpdGggYSByZWZjb3VudCBvZiAxIHNvIGl0IG5lZWRzIHJlbGVh c2luZyBhZnRlciB3ZQotICAgIC8vIGFzc2lnbiBpdCB0byBhIFJlZlB0ci4KLSAgICBtX2xpc3RC b3gtPmRlcmVmKCk7Ci0KICAgICBzZXRTY3JvbGxiYXJNb2RlcyhTY3JvbGxiYXJBbHdheXNPZmYs IFNjcm9sbGJhckFsd2F5c09mZik7CiB9CiAKQEAgLTM2MSwxMSArMzYyLDEzIEBACiAgICAgICAg IGNocm9tZUNsaWVudC0+cG9wdXBPcGVuZWQodGhpcywgd2lkZ2V0UmVjdCwgbV9mb2N1c09uU2hv dyk7CiAgICAgfQogCi0gICAgLy8gTXVzdCBnZXQgY2FsbGVkIGFmdGVyIHdlIGhhdmUgYSBjbGll bnQgYW5kIGNvbnRhaW5pbmdXaW5kb3cuCi0gICAgYWRkQ2hpbGQobV9saXN0Qm94LmdldCgpKTsK KyAgICBpZiAoIW1fbGlzdEJveC0+cGFyZW50KCkpIHsKKyAgICAgICAgLy8gTXVzdCBnZXQgY2Fs bGVkIGFmdGVyIHdlIGhhdmUgYSBjbGllbnQuCisgICAgICAgIGFkZENoaWxkKG1fbGlzdEJveC5n ZXQoKSk7CisgICAgfQogCi0gICAgLy8gRW5hYmxlIHNjcm9sbGJhcnMgYWZ0ZXIgdGhlIGxpc3Ri b3ggaXMgaW5zZXJ0ZWQgaW50byB0aGUgaGllcmFyY2h5LCBzbwotICAgIC8vIGl0IGhhcyBhIHBy b3BlciBXaWRnZXRDbGllbnQuCisgICAgLy8gRW5hYmxlIHNjcm9sbGJhcnMgYWZ0ZXIgdGhlIGxp c3Rib3ggaXMgaW5zZXJ0ZWQgaW50byB0aGUgaGllcmFyY2h5LAorICAgIC8vIHNvIGl0IGhhcyBh IHByb3BlciBXaWRnZXRDbGllbnQuCiAgICAgbV9saXN0Qm94LT5zZXRWZXJ0aWNhbFNjcm9sbGJh ck1vZGUoU2Nyb2xsYmFyQXV0byk7CiAKICAgICBtX2xpc3RCb3gtPnNjcm9sbFRvUmV2ZWFsU2Vs ZWN0aW9uKCk7CkBAIC0zNzUsMTIgKzM3OCw2IEBACiAKIHZvaWQgUG9wdXBDb250YWluZXI6Omhp ZGVQb3B1cCgpCiB7Ci0gICAgaW52YWxpZGF0ZSgpOwotCi0gICAgbV9saXN0Qm94LT5kaXNjb25u ZWN0Q2xpZW50KCk7Ci0gICAgcmVtb3ZlQ2hpbGQobV9saXN0Qm94LmdldCgpKTsKLSAgICBtX2xp c3RCb3ggPSAwOwotICAgIAogICAgIGlmIChjbGllbnQoKSkKICAgICAgICAgY2xpZW50KCktPnBv cHVwQ2xvc2VkKHRoaXMpOwogfQpAQCAtODU2LDEyICs4NTMsMTAgQEAKIAogICAgIG1fc2VsZWN0 ZWRJbmRleCA9IG1fb3JpZ2luYWxJbmRleDsKIAorICAgIG1fcG9wdXBDbGllbnQtPmhpZGVQb3B1 cCgpOworCiAgICAgaWYgKG1fd2lsbEFjY2VwdE9uQWJhbmRvbikKICAgICAgICAgbV9wb3B1cENs aWVudC0+dmFsdWVDaGFuZ2VkKG1fc2VsZWN0ZWRJbmRleCk7Ci0KLSAgICAvLyB2YWx1ZUNoYW5n ZWQgbWF5IGhhdmUgdG9ybiBkb3duIHRoZSBwb3B1cCEKLSAgICBpZiAobV9wb3B1cENsaWVudCkK LSAgICAgICAgbV9wb3B1cENsaWVudC0+aGlkZVBvcHVwKCk7CiB9CiAKIGludCBQb3B1cExpc3RC b3g6OnBvaW50VG9Sb3dJbmRleChjb25zdCBJbnRQb2ludCYgcG9pbnQpCkBAIC04OTMsMTIgKzg4 OCwxMSBAQAogICAgIGlmIChpc1NlbGVjdGFibGVJdGVtKGluZGV4KSkgewogICAgICAgICBSZWZQ dHI8UG9wdXBMaXN0Qm94PiBrZWVwQWxpdmUodGhpcyk7CiAKLSAgICAgICAgLy8gVGVsbCB0aGUg PHNlbGVjdD4gUG9wdXBNZW51Q2xpZW50IHdoYXQgaW5kZXggd2FzIHNlbGVjdGVkLCBhbmQgaGlk ZSBvdXJzZWxmLgotICAgICAgICBtX3BvcHVwQ2xpZW50LT52YWx1ZUNoYW5nZWQoaW5kZXgpOwor ICAgICAgICAvLyBIaWRlIG91cnNlbHZlcyBmaXJzdCBzaW5jZSB2YWx1ZUNoYW5nZWQgbWF5IGhh dmUgbnVtZXJvdXMgc2lkZS1lZmZlY3RzLgorICAgICAgICBtX3BvcHVwQ2xpZW50LT5oaWRlUG9w dXAoKTsKIAotICAgICAgICAvLyB2YWx1ZUNoYW5nZWQgbWF5IGhhdmUgdG9ybiBkb3duIHRoZSBw b3B1cCEKLSAgICAgICAgaWYgKG1fcG9wdXBDbGllbnQpCi0gICAgICAgICAgICBtX3BvcHVwQ2xp ZW50LT5oaWRlUG9wdXAoKTsKKyAgICAgICAgLy8gVGVsbCB0aGUgPHNlbGVjdD4gUG9wdXBNZW51 Q2xpZW50IHdoYXQgaW5kZXggd2FzIHNlbGVjdGVkLgorICAgICAgICBtX3BvcHVwQ2xpZW50LT52 YWx1ZUNoYW5nZWQoaW5kZXgpOwogICAgIH0KIH0KIApAQCAtMTE1MywyMCArMTE0NywyMCBAQAog UG9wdXBNZW51Ojp+UG9wdXBNZW51KCkKIHsKICAgICBoaWRlKCk7CisgICAgcC5wb3B1cCA9IDA7 CiB9CiAKIHZvaWQgUG9wdXBNZW51OjpzaG93KGNvbnN0IEludFJlY3QmIHIsIEZyYW1lVmlldyog diwgaW50IGluZGV4KSAKIHsKLSAgICBwLnBvcHVwID0gUG9wdXBDb250YWluZXI6OmNyZWF0ZShj bGllbnQoKSwgdHJ1ZSk7CisgICAgaWYgKCFwLnBvcHVwKQorICAgICAgICBwLnBvcHVwID0gUG9w dXBDb250YWluZXI6OmNyZWF0ZShjbGllbnQoKSwgdHJ1ZSk7CiAgICAgcC5wb3B1cC0+c2hvdyhy LCB2LCBpbmRleCk7CiB9CiAKIHZvaWQgUG9wdXBNZW51OjpoaWRlKCkKIHsKLSAgICBpZiAocC5w b3B1cCkgeworICAgIGlmIChwLnBvcHVwKQogICAgICAgICBwLnBvcHVwLT5oaWRlUG9wdXAoKTsK LSAgICAgICAgcC5wb3B1cCA9IDA7Ci0gICAgfQogfQogCiB2b2lkIFBvcHVwTWVudTo6dXBkYXRl RnJvbUVsZW1lbnQoKQo= 27264 2009-02-02 16:24:02 -0800 2009-02-02 16:35:46 -0800 v2 patch popup_2.diff text/plain 3661 fishd SW5kZXg6IEM6L2IvY2hyb21lX3RydW5rL3NyYy90aGlyZF9wYXJ0eS9XZWJLaXQvV2ViQ29yZS9w bGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHANCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBD Oi9iL2Nocm9tZV90cnVuay9zcmMvdGhpcmRfcGFydHkvV2ViS2l0L1dlYkNvcmUvcGxhdGZvcm0v Y2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3BwCShyZXZpc2lvbiA5MDEwKQ0KKysrIEM6L2Iv Y2hyb21lX3RydW5rL3NyYy90aGlyZF9wYXJ0eS9XZWJLaXQvV2ViQ29yZS9wbGF0Zm9ybS9jaHJv bWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHAJKHdvcmtpbmcgY29weSkNCkBAIC03Myw2ICs3Mywx MSBAQA0KIC8vIGJveCAoImNvbWJvYm94IiBvbiBXaW5kb3dzKS4NCiBjbGFzcyBQb3B1cExpc3RC b3ggOiBwdWJsaWMgRnJhbWVsZXNzU2Nyb2xsVmlldywgcHVibGljIFJlZkNvdW50ZWQ8UG9wdXBM aXN0Qm94PiB7DQogcHVibGljOg0KKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxQb3B1cExpc3RCb3g+ IGNyZWF0ZShQb3B1cE1lbnVDbGllbnQqIGNsaWVudCkNCisgICAgew0KKyAgICAgICAgcmV0dXJu IGFkb3B0UmVmKG5ldyBQb3B1cExpc3RCb3goY2xpZW50KSk7DQorICAgIH0NCisNCiAgICAgLy8g RnJhbWVsZXNzU2Nyb2xsVmlldw0KICAgICB2aXJ0dWFsIHZvaWQgcGFpbnQoR3JhcGhpY3NDb250 ZXh0KiwgY29uc3QgSW50UmVjdCYpOw0KICAgICB2aXJ0dWFsIGJvb2wgaGFuZGxlTW91c2VEb3du RXZlbnQoY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50Jik7DQpAQCAtMzIzLDEzICszMjgsOSBAQA0K IH0NCiANCiBQb3B1cENvbnRhaW5lcjo6UG9wdXBDb250YWluZXIoUG9wdXBNZW51Q2xpZW50KiBj bGllbnQsIGJvb2wgZm9jdXNPblNob3cpDQotICAgIDogbV9saXN0Qm94KG5ldyBQb3B1cExpc3RC b3goY2xpZW50KSksDQotICAgICAgbV9mb2N1c09uU2hvdyhmb2N1c09uU2hvdykNCisgICAgOiBt X2xpc3RCb3goUG9wdXBMaXN0Qm94OjpjcmVhdGUoY2xpZW50KSkNCisgICAgLCBtX2ZvY3VzT25T aG93KGZvY3VzT25TaG93KQ0KIHsNCi0gICAgLy8gRnJhbWVWaWV3cyBhcmUgY3JlYXRlZCB3aXRo IGEgcmVmY291bnQgb2YgMSBzbyBpdCBuZWVkcyByZWxlYXNpbmcgYWZ0ZXIgd2UNCi0gICAgLy8g YXNzaWduIGl0IHRvIGEgUmVmUHRyLg0KLSAgICBtX2xpc3RCb3gtPmRlcmVmKCk7DQotDQogICAg IHNldFNjcm9sbGJhck1vZGVzKFNjcm9sbGJhckFsd2F5c09mZiwgU2Nyb2xsYmFyQWx3YXlzT2Zm KTsNCiB9DQogDQpAQCAtMzYxLDExICszNjIsMTEgQEANCiAgICAgICAgIGNocm9tZUNsaWVudC0+ cG9wdXBPcGVuZWQodGhpcywgd2lkZ2V0UmVjdCwgbV9mb2N1c09uU2hvdyk7DQogICAgIH0NCiAN Ci0gICAgLy8gTXVzdCBnZXQgY2FsbGVkIGFmdGVyIHdlIGhhdmUgYSBjbGllbnQgYW5kIGNvbnRh aW5pbmdXaW5kb3cuDQotICAgIGFkZENoaWxkKG1fbGlzdEJveC5nZXQoKSk7DQorICAgIGlmICgh bV9saXN0Qm94LT5wYXJlbnQoKSkNCisgICAgICAgIGFkZENoaWxkKG1fbGlzdEJveC5nZXQoKSk7 DQogDQotICAgIC8vIEVuYWJsZSBzY3JvbGxiYXJzIGFmdGVyIHRoZSBsaXN0Ym94IGlzIGluc2Vy dGVkIGludG8gdGhlIGhpZXJhcmNoeSwgc28NCi0gICAgLy8gaXQgaGFzIGEgcHJvcGVyIFdpZGdl dENsaWVudC4NCisgICAgLy8gRW5hYmxlIHNjcm9sbGJhcnMgYWZ0ZXIgdGhlIGxpc3Rib3ggaXMg aW5zZXJ0ZWQgaW50byB0aGUgaGllcmFyY2h5LA0KKyAgICAvLyBzbyBpdCBoYXMgYSBwcm9wZXIg V2lkZ2V0Q2xpZW50Lg0KICAgICBtX2xpc3RCb3gtPnNldFZlcnRpY2FsU2Nyb2xsYmFyTW9kZShT Y3JvbGxiYXJBdXRvKTsNCiANCiAgICAgbV9saXN0Qm94LT5zY3JvbGxUb1JldmVhbFNlbGVjdGlv bigpOw0KQEAgLTM3NSwxMiArMzc2LDYgQEANCiANCiB2b2lkIFBvcHVwQ29udGFpbmVyOjpoaWRl UG9wdXAoKQ0KIHsNCi0gICAgaW52YWxpZGF0ZSgpOw0KLQ0KLSAgICBtX2xpc3RCb3gtPmRpc2Nv bm5lY3RDbGllbnQoKTsNCi0gICAgcmVtb3ZlQ2hpbGQobV9saXN0Qm94LmdldCgpKTsNCi0gICAg bV9saXN0Qm94ID0gMDsNCi0gICAgDQogICAgIGlmIChjbGllbnQoKSkNCiAgICAgICAgIGNsaWVu dCgpLT5wb3B1cENsb3NlZCh0aGlzKTsNCiB9DQpAQCAtODU2LDEyICs4NTEsMTAgQEANCiANCiAg ICAgbV9zZWxlY3RlZEluZGV4ID0gbV9vcmlnaW5hbEluZGV4Ow0KIA0KKyAgICBtX3BvcHVwQ2xp ZW50LT5oaWRlUG9wdXAoKTsNCisNCiAgICAgaWYgKG1fd2lsbEFjY2VwdE9uQWJhbmRvbikNCiAg ICAgICAgIG1fcG9wdXBDbGllbnQtPnZhbHVlQ2hhbmdlZChtX3NlbGVjdGVkSW5kZXgpOw0KLQ0K LSAgICAvLyB2YWx1ZUNoYW5nZWQgbWF5IGhhdmUgdG9ybiBkb3duIHRoZSBwb3B1cCENCi0gICAg aWYgKG1fcG9wdXBDbGllbnQpDQotICAgICAgICBtX3BvcHVwQ2xpZW50LT5oaWRlUG9wdXAoKTsN CiB9DQogDQogaW50IFBvcHVwTGlzdEJveDo6cG9pbnRUb1Jvd0luZGV4KGNvbnN0IEludFBvaW50 JiBwb2ludCkNCkBAIC04OTMsMTIgKzg4NiwxMSBAQA0KICAgICBpZiAoaXNTZWxlY3RhYmxlSXRl bShpbmRleCkpIHsNCiAgICAgICAgIFJlZlB0cjxQb3B1cExpc3RCb3g+IGtlZXBBbGl2ZSh0aGlz KTsNCiANCi0gICAgICAgIC8vIFRlbGwgdGhlIDxzZWxlY3Q+IFBvcHVwTWVudUNsaWVudCB3aGF0 IGluZGV4IHdhcyBzZWxlY3RlZCwgYW5kIGhpZGUgb3Vyc2VsZi4NCi0gICAgICAgIG1fcG9wdXBD bGllbnQtPnZhbHVlQ2hhbmdlZChpbmRleCk7DQorICAgICAgICAvLyBIaWRlIG91cnNlbHZlcyBm aXJzdCBzaW5jZSB2YWx1ZUNoYW5nZWQgbWF5IGhhdmUgbnVtZXJvdXMgc2lkZS1lZmZlY3RzLg0K KyAgICAgICAgbV9wb3B1cENsaWVudC0+aGlkZVBvcHVwKCk7DQogDQotICAgICAgICAvLyB2YWx1 ZUNoYW5nZWQgbWF5IGhhdmUgdG9ybiBkb3duIHRoZSBwb3B1cCENCi0gICAgICAgIGlmIChtX3Bv cHVwQ2xpZW50KQ0KLSAgICAgICAgICAgIG1fcG9wdXBDbGllbnQtPmhpZGVQb3B1cCgpOw0KKyAg ICAgICAgLy8gVGVsbCB0aGUgPHNlbGVjdD4gUG9wdXBNZW51Q2xpZW50IHdoYXQgaW5kZXggd2Fz IHNlbGVjdGVkLg0KKyAgICAgICAgbV9wb3B1cENsaWVudC0+dmFsdWVDaGFuZ2VkKGluZGV4KTsN CiAgICAgfQ0KIH0NCiANCkBAIC0xMTU3LDE2ICsxMTQ5LDE1IEBADQogDQogdm9pZCBQb3B1cE1l bnU6OnNob3coY29uc3QgSW50UmVjdCYgciwgRnJhbWVWaWV3KiB2LCBpbnQgaW5kZXgpIA0KIHsN Ci0gICAgcC5wb3B1cCA9IFBvcHVwQ29udGFpbmVyOjpjcmVhdGUoY2xpZW50KCksIHRydWUpOw0K KyAgICBpZiAoIXAucG9wdXApDQorICAgICAgICBwLnBvcHVwID0gUG9wdXBDb250YWluZXI6OmNy ZWF0ZShjbGllbnQoKSwgdHJ1ZSk7DQogICAgIHAucG9wdXAtPnNob3cociwgdiwgaW5kZXgpOw0K IH0NCiANCiB2b2lkIFBvcHVwTWVudTo6aGlkZSgpDQogew0KLSAgICBpZiAocC5wb3B1cCkgew0K KyAgICBpZiAocC5wb3B1cCkNCiAgICAgICAgIHAucG9wdXAtPmhpZGVQb3B1cCgpOw0KLSAgICAg ICAgcC5wb3B1cCA9IDA7DQotICAgIH0NCiB9DQogDQogdm9pZCBQb3B1cE1lbnU6OnVwZGF0ZUZy b21FbGVtZW50KCkNCg==