23653 2009-01-30 11:47:34 -0800 PopupMenuChromium.h could be cleaned-up 2009-02-02 15:08:20 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All OS X 10.5 RESOLVED FIXED P3 Minor --- 0 jcampan webkit-unassigned oldest_to_newest 107736 0 jcampan 2009-01-30 11:47:34 -0800 In WebCore/platform/chromium/PopupMenuChromium.h many states are passed around with setters (setTextOnIndexChange, setAcceptOnAbandon, setLoopSelectionNavigation...). As these settings are only required when initializing and as new ones may be added, it would be better to have a settings struct instead of setters. 107737 1 27190 jcampan 2009-01-30 11:49:26 -0800 Created attachment 27190 Patch for PopuMenuChromium.[h,cpp] 108039 2 27190 eric 2009-02-02 14:36:28 -0800 Comment on attachment 27190 Patch for PopuMenuChromium.[h,cpp] This looks fine. 1 2009-01-29 Jay Campan <set EMAIL_ADDRESS environment variable> Your EMAIL_ADDRESS is missing. Wrong spacing: +static const PopupContainerSettings dropDownSettings = { + true, // focusOnShow + true, // setTextOnIndexChange + true, // acceptOnAbandon + false // loopSelectionNavigation +}; This looks fine. Can be fixed on commit. 108044 3 eric 2009-02-02 15:08:08 -0800 Grats on your first patch to the webkit.org tree Jay. :) 108045 4 eric 2009-02-02 15:08:20 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/platform/chromium/PopupMenuChromium.cpp M WebCore/platform/chromium/PopupMenuChromium.h Committed r40494 27190 2009-01-30 11:49:26 -0800 2009-02-02 14:36:28 -0800 Patch for PopuMenuChromium.[h,cpp] popup_patch.txt text/plain 13044 jcampan SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MDM5MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMDktMDEtMjkgIEpheSBDYW1wYW4gIDxzZXQgRU1BSUxfQUREUkVT UyBlbnZpcm9ubWVudCB2YXJpYWJsZT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBXQVJOSU5HOiBOTyBURVNUIENBU0VTIEFEREVEIE9SIENIQU5HRUQK KworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Oik6CisgICAgICAgIChXZWJDb3JlOjpQb3B1cExpc3RCb3g6OlBvcHVw TGlzdEJveCk6CisgICAgICAgIChXZWJDb3JlOjpQb3B1cENvbnRhaW5lcjo6Y3JlYXRlKToKKyAg ICAgICAgKFdlYkNvcmU6OlBvcHVwQ29udGFpbmVyOjpQb3B1cENvbnRhaW5lcik6CisgICAgICAg IChXZWJDb3JlOjpQb3B1cENvbnRhaW5lcjo6c2hvd1BvcHVwKToKKyAgICAgICAgKFdlYkNvcmU6 OlBvcHVwTGlzdEJveDo6aGFuZGxlS2V5RXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6UG9wdXBM aXN0Qm94Ojppc1NlbGVjdGFibGVJdGVtKToKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTGlzdEJv eDo6c2VsZWN0TmV4dFJvdyk6CisgICAgICAgIChXZWJDb3JlOjpQb3B1cExpc3RCb3g6OnNlbGVj dFByZXZpb3VzUm93KToKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTWVudTo6c2hvdyk6CisgICAg ICAgICogcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uaDoKKwogMjAwOS0wMS0y OSAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgQmVnaW5uaW5nIG9m IHdvcmsgdG8gZWxpbWluYXRlIFJlbmRlckNvbnRhaW5lciBhbmQgbWFrZSBjb250YWluZXJzaGlw ICJwbHVnZ2FibGUiIGludG8gYW55IHNwb3QgaW4gdGhlIHJlbmRlciB0cmVlLiAgVGhlIGZpcnN0 IHN0ZXAgaXMgdG8gY3JlYXRlCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVw TWVudUNocm9taXVtLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVt L1BvcHVwTWVudUNocm9taXVtLmNwcAkocmV2aXNpb24gNDAzNzgpCisrKyBXZWJDb3JlL3BsYXRm b3JtL2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjks NiArNjksMTUgQEAgc3RhdGljIGNvbnN0IGludCBrTWF4SGVpZ2h0ID0gNTAwOwogc3RhdGljIGNv bnN0IGludCBrQm9yZGVyU2l6ZSA9IDE7CiBzdGF0aWMgY29uc3QgVGltZVN0YW1wIGtUeXBlQWhl YWRUaW1lb3V0TXMgPSAxMDAwOwogCisvLyBUaGUgc2V0dGluZ3MgdXNlZCBmb3IgdGhlIGRyb3Ag ZG93biBtZW51LgorLy8gVGhpcyBpcyB0aGUgZGVsZWdhdGUgdXNlZCBpZiBub25lIGlzIHByb3Zp ZGVkLgorc3RhdGljIGNvbnN0IFBvcHVwQ29udGFpbmVyU2V0dGluZ3MgZHJvcERvd25TZXR0aW5n cyA9IHsKKyAgdHJ1ZSwgLy8gZm9jdXNPblNob3cKKyAgdHJ1ZSwgLy8gc2V0VGV4dE9uSW5kZXhD aGFuZ2UKKyAgdHJ1ZSwgLy8gYWNjZXB0T25BYmFuZG9uCisgIGZhbHNlIC8vIGxvb3BTZWxlY3Rp b25OYXZpZ2F0aW9uCit9OworCiAvLyBUaGlzIGNsYXNzIHVzZXMgV2ViQ29yZSBjb2RlIHRvIHBh aW50IGFuZCBoYW5kbGUgZXZlbnRzIGZvciBhIGRyb3AtZG93biBsaXN0CiAvLyBib3ggKCJjb21i b2JveCIgb24gV2luZG93cykuCiBjbGFzcyBQb3B1cExpc3RCb3ggOiBwdWJsaWMgRnJhbWVsZXNz U2Nyb2xsVmlldywgcHVibGljIFJlZkNvdW50ZWQ8UG9wdXBMaXN0Qm94PiB7CkBAIC0xMjUsMjAg KzEzNCw2IEBAIHB1YmxpYzoKICAgICAvLyBSZXR1cm5zIHdoZXRoZXIgdGhlIHBvcHVwIHdhbnRz IHRvIHByb2Nlc3MgZXZlbnRzIGZvciB0aGUgcGFzc2VkIGtleS4KICAgICBib29sIGlzSW50ZXJl c3RlZEluRXZlbnRGb3JLZXkoaW50IGtleUNvZGUpOwogCi0gICAgLy8gU2V0cyB3aGV0aGVyIHRo ZSBQb3B1cE1lbnVDbGllbnQgc2hvdWxkIGJlIHRvbGQgdG8gY2hhbmdlIGl0cyB0ZXh0IHdoZW4g YQotICAgIC8vIG5ldyBpdGVtIGlzIHNlbGVjdGVkIChieSB1c2luZyB0aGUgYXJyb3cga2V5cyku ICBEZWZhdWx0IGlzIHRydWUuCi0gICAgdm9pZCBzZXRUZXh0T25JbmRleENoYW5nZShib29sIHZh bHVlKSB7IG1fc2V0VGV4dE9uSW5kZXhDaGFuZ2UgPSB2YWx1ZTsgfQotCi0gICAgLy8gU2V0cyB3 aGV0aGVyIHdlIHNob3VsZCBhY2NlcHQgdGhlIHNlbGVjdGVkIGluZGV4IHdoZW4gdGhlIHBvcHVw IGlzCi0gICAgLy8gYWJhbmRvbm5lZC4KLSAgICB2b2lkIHNldEFjY2VwdE9uQWJhbmRvbihib29s IHZhbHVlKSB7IG1fc2hvdWxkQWNjZXB0T25BYmFuZG9uID0gdmFsdWU7IH0KLQotICAgIC8vIFNl dHMgd2hldGhlciBwcmVzc2luZyB0aGUgZG93bi91cCBhcnJvdyB3aGVuIHRoZSBsYXN0L2ZpcnN0 IHJvdyBpcwotICAgIC8vIHNlbGVjdGVkIGNsZWFycyB0aGUgc2VsZWN0aW9uIG9uIHRoZSBmaXJz dCBrZXkgcHJlc3MgYW5kIHRoZW4gc2VsZWN0cyB0aGUKLSAgICAvLyBmaXJzdC9sYXN0IHJvdyBv biB0aGUgbmV4dCBrZXkgcHJlc3MuICBJZiBmYWxzZSwgdGhlIHNlbGVjdGVkIHJvdyBzdGF5cwot ICAgIC8vIHRoZSBsYXN0L2ZpcnN0IHJvdy4KLSAgICB2b2lkIHNldExvb3BTZWxlY3Rpb25OYXZp Z2F0aW9uKGJvb2wgdmFsdWUpIHsgbV9sb29wU2VsZWN0aW9uTmF2aWdhdGlvbiA9IHZhbHVlOyB9 Ci0KIHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNzIFBvcHVwQ29udGFpbmVyOwogICAgIGZyaWVu ZCBjbGFzcyBSZWZDb3VudGVkPFBvcHVwTGlzdEJveD47CkBAIC0xNTksMTcgKzE1NCwxNSBAQCBw cml2YXRlOgogICAgICAgICBpbnQgeTsgIC8vIHkgb2Zmc2V0IG9mIHRoaXMgaXRlbSwgcmVsYXRp dmUgdG8gdGhlIHRvcCBvZiB0aGUgcG9wdXAuCiAgICAgfTsKIAotICAgIFBvcHVwTGlzdEJveChQ b3B1cE1lbnVDbGllbnQqIGNsaWVudCkKLSAgICAgICAgOiBtX29yaWdpbmFsSW5kZXgoMCkKKyAg ICBQb3B1cExpc3RCb3goUG9wdXBNZW51Q2xpZW50KiBjbGllbnQsIGNvbnN0IFBvcHVwQ29udGFp bmVyU2V0dGluZ3MmIHNldHRpbmdzKQorICAgICAgICA6IG1fc2V0dGluZ3Moc2V0dGluZ3MpCisg ICAgICAgICwgbV9vcmlnaW5hbEluZGV4KDApCiAgICAgICAgICwgbV9zZWxlY3RlZEluZGV4KDAp Ci0gICAgICAgICwgbV9zaG91bGRBY2NlcHRPbkFiYW5kb24odHJ1ZSkKICAgICAgICAgLCBtX3dp bGxBY2NlcHRPbkFiYW5kb24oZmFsc2UpCiAgICAgICAgICwgbV92aXNpYmxlUm93cygwKQogICAg ICAgICAsIG1fcG9wdXBDbGllbnQoY2xpZW50KQogICAgICAgICAsIG1fcmVwZWF0aW5nQ2hhcigw KQogICAgICAgICAsIG1fbGFzdENoYXJUaW1lKDApCi0gICAgICAgICwgbV9zZXRUZXh0T25JbmRl eENoYW5nZSh0cnVlKQotICAgICAgICAsIG1fbG9vcFNlbGVjdGlvbk5hdmlnYXRpb24oZmFsc2Up CiAgICAgewogICAgICAgICBzZXRTY3JvbGxiYXJNb2RlcyhTY3JvbGxiYXJBbHdheXNPZmYsIFNj cm9sbGJhckFsd2F5c09mZik7CiAgICAgfQpAQCAtMjI4LDYgKzIyMSw5IEBAIHByaXZhdGU6CiAg ICAgdm9pZCBzZWxlY3RQcmV2aW91c1JvdygpOwogICAgIHZvaWQgc2VsZWN0TmV4dFJvdygpOwog CisgICAgLy8gVGhlIHNldHRpbmdzIHRoYXQgc3BlY2lmeSB0aGUgYmVoYXZpb3IgZm9yIHRoaXMg UG9wdXAgd2luZG93LgorICAgIFBvcHVwQ29udGFpbmVyU2V0dGluZ3MgbV9zZXR0aW5nczsKKwog ICAgIC8vIFRoaXMgaXMgdGhlIGluZGV4IG9mIHRoZSBpdGVtIG1hcmtlZCBhcyAic2VsZWN0ZWQi IC0gaS5lLiBkaXNwbGF5ZWQgaW4gdGhlIHdpZGdldCBvbiB0aGUKICAgICAvLyBwYWdlLiAKICAg ICBpbnQgbV9vcmlnaW5hbEluZGV4OwpAQCAtMjM3LDE1ICsyMzMsMTAgQEAgcHJpdmF0ZToKICAg ICAvLyBlbnRlciB5ZXQgaG93ZXZlci4KICAgICBpbnQgbV9zZWxlY3RlZEluZGV4OwogCi0gICAg Ly8gV2hldGhlciB3ZSBzaG91bGQgYWNjZXB0IHRoZSBzZWxlY3RlZEluZGV4IGFzIGNob3NlbiB3 aGVuIHRoZSBwb3B1cCBpcwotICAgIC8vICJhYmFuZG9uZWQiLiAgVGhpcyB2YWx1ZSBpcyBzZXQg dGhyb3VnaCBpdHMgc2V0dGVyIGFuZCBpcyB1c2VmdWwgYXMKLSAgICAvLyBzZWxlY3QgcG9wdXAg bWVudSBhbmQgZm9ybSBhdXRvZmlsbCBwb3B1cCBtZW51IGhhdmUgZGlmZmVyZW50IGJlaGF2aW9y cy4KLSAgICBib29sIG1fc2hvdWxkQWNjZXB0T25BYmFuZG9uOwotCiAgICAgLy8gVHJ1ZSBpZiB3 ZSBzaG91bGQgYWNjZXB0IHRoZSBzZWxlY3RlZEluZGV4IGFzIGNob3NlbiwgZXZlbiBpZiB0aGUg cG9wdXAKICAgICAvLyBpcyAiYWJhbmRvbmVkIi4gIFRoaXMgaXMgdXNlZCBmb3Iga2V5Ym9hcmQg bmF2aWdhdGlvbiwgd2hlcmUgd2Ugd2FudCB0aGUKLSAgICAvLyBzZWxlY3Rpb24gdG8gY2hhbmdl IGltbWVkaWF0ZWx5LCBhbmQgaXMgb25seSB1c2VkIGlmCi0gICAgLy8gbV9zaG91bGRBY2NlcHRP bkFiYW5kb24gaXMgdHJ1ZS4KKyAgICAvLyBzZWxlY3Rpb24gdG8gY2hhbmdlIGltbWVkaWF0ZWx5 LCBhbmQgaXMgb25seSB1c2VkIGlmIHRoZSBzZXR0aW5ncworICAgIC8vIGFjY2VwdE9uQWJhbmRv biBmaWVsZCBpcyB0cnVlLgogICAgIGJvb2wgbV93aWxsQWNjZXB0T25BYmFuZG9uOwogCiAgICAg Ly8gVGhpcyBpcyB0aGUgbnVtYmVyIG9mIHJvd3MgdmlzaWJsZSBpbiB0aGUgcG9wdXAuIFRoZSBt YXhpbXVtIG51bWJlciB2aXNpYmxlIGF0IGEgdGltZSBpcwpAQCAtMjc3LDEwICsyNjgsNiBAQCBw cml2YXRlOgogCiAgICAgLy8gVGhlIGxhc3QgdGltZSB0aGUgdXNlciBoaXQgYSBrZXkuICBVc2Vk IGZvciB0eXBlQWhlYWRGaW5kLgogICAgIFRpbWVTdGFtcCBtX2xhc3RDaGFyVGltZTsKLQotICAg IGJvb2wgbV9zZXRUZXh0T25JbmRleENoYW5nZTsKLQotICAgIGJvb2wgbV9sb29wU2VsZWN0aW9u TmF2aWdhdGlvbjsKIH07CiAKIHN0YXRpYyBQbGF0Zm9ybU1vdXNlRXZlbnQgY29uc3RydWN0UmVs YXRpdmVNb3VzZUV2ZW50KGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYgZSwKQEAgLTMxNiwxNCAr MzAzLDE0IEBAIHN0YXRpYyBQbGF0Zm9ybVdoZWVsRXZlbnQgY29uc3RydWN0UmVsYXQKIAogLy8g c3RhdGljCiBQYXNzUmVmUHRyPFBvcHVwQ29udGFpbmVyPiBQb3B1cENvbnRhaW5lcjo6Y3JlYXRl KFBvcHVwTWVudUNsaWVudCogY2xpZW50LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBib29sIGZvY3VzT25TaG93KQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBQb3B1cENvbnRhaW5lclNldHRp bmdzJiBzZXR0aW5ncykKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYobmV3IFBvcHVwQ29udGFpbmVy KGNsaWVudCwgZm9jdXNPblNob3cpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYobmV3IFBvcHVwQ29u dGFpbmVyKGNsaWVudCwgc2V0dGluZ3MpKTsKIH0KIAotUG9wdXBDb250YWluZXI6OlBvcHVwQ29u dGFpbmVyKFBvcHVwTWVudUNsaWVudCogY2xpZW50LCBib29sIGZvY3VzT25TaG93KQotICAgIDog bV9saXN0Qm94KG5ldyBQb3B1cExpc3RCb3goY2xpZW50KSksCi0gICAgICBtX2ZvY3VzT25TaG93 KGZvY3VzT25TaG93KQorUG9wdXBDb250YWluZXI6OlBvcHVwQ29udGFpbmVyKFBvcHVwTWVudUNs aWVudCogY2xpZW50LCBjb25zdCBQb3B1cENvbnRhaW5lclNldHRpbmdzJiBzZXR0aW5ncykKKyAg ICA6IG1fbGlzdEJveChuZXcgUG9wdXBMaXN0Qm94KGNsaWVudCwgc2V0dGluZ3MpKQorICAgICwg bV9zZXR0aW5ncyhzZXR0aW5ncykKIHsKICAgICAvLyBGcmFtZVZpZXdzIGFyZSBjcmVhdGVkIHdp dGggYSByZWZjb3VudCBvZiAxIHNvIGl0IG5lZWRzIHJlbGVhc2luZyBhZnRlciB3ZQogICAgIC8v IGFzc2lnbiBpdCB0byBhIFJlZlB0ci4KQEAgLTM1Nyw3ICszNDQsNyBAQCB2b2lkIFBvcHVwQ29u dGFpbmVyOjpzaG93UG9wdXAoRnJhbWVWaWV3CiAgICAgICAgIGlmICh3aWRnZXRSZWN0LmJvdHRv bSgpID4gc3RhdGljX2Nhc3Q8aW50PihzY3JlZW4uYm90dG9tKCkpKQogICAgICAgICAgICAgd2lk Z2V0UmVjdC5tb3ZlKDAsIC0od2lkZ2V0UmVjdC5oZWlnaHQoKSArIHNlbGVjdEhlaWdodCkpOwog Ci0gICAgICAgIGNocm9tZUNsaWVudC0+cG9wdXBPcGVuZWQodGhpcywgd2lkZ2V0UmVjdCwgbV9m b2N1c09uU2hvdyk7CisgICAgICAgIGNocm9tZUNsaWVudC0+cG9wdXBPcGVuZWQodGhpcywgd2lk Z2V0UmVjdCwgbV9zZXR0aW5ncy5mb2N1c09uU2hvdyk7CiAgICAgfQogCiAgICAgLy8gTXVzdCBn ZXQgY2FsbGVkIGFmdGVyIHdlIGhhdmUgYSBjbGllbnQgYW5kIGNvbnRhaW5pbmdXaW5kb3cuCkBA IC00OTUsMjEgKzQ4Miw2IEBAIHZvaWQgUG9wdXBDb250YWluZXI6OnNob3coY29uc3QgSW50UmVj dCYKICAgICBzaG93UG9wdXAodik7CiB9CiAKLXZvaWQgUG9wdXBDb250YWluZXI6OnNldFRleHRP bkluZGV4Q2hhbmdlKGJvb2wgdmFsdWUpCi17Ci0gICAgbGlzdEJveCgpLT5zZXRUZXh0T25JbmRl eENoYW5nZSh2YWx1ZSk7Ci19Ci0KLXZvaWQgUG9wdXBDb250YWluZXI6OnNldEFjY2VwdE9uQWJh bmRvbihib29sIHZhbHVlKQotewotICAgIGxpc3RCb3goKS0+c2V0QWNjZXB0T25BYmFuZG9uKHZh bHVlKTsKLX0KLQotdm9pZCBQb3B1cENvbnRhaW5lcjo6c2V0TG9vcFNlbGVjdGlvbk5hdmlnYXRp b24oYm9vbCB2YWx1ZSkKLXsKLSAgICBsaXN0Qm94KCktPnNldExvb3BTZWxlY3Rpb25OYXZpZ2F0 aW9uKHZhbHVlKTsKLX0KLQogdm9pZCBQb3B1cENvbnRhaW5lcjo6cmVmcmVzaCgpCiB7CiAgICAg bGlzdEJveCgpLT51cGRhdGVGcm9tRWxlbWVudCgpOwpAQCAtNjU4LDEzICs2MzAsMTQgQEAgYm9v bCBQb3B1cExpc3RCb3g6OmhhbmRsZUtleUV2ZW50KGNvbnN0IAogICAgICAgICAvLyB3YW50IHRv IGZpcmUgdGhlIG9uY2hhbmdlIGV2ZW50IHVudGlsIHRoZSBwb3B1cCBpcyBjbG9zZWQsIHRvIG1h dGNoCiAgICAgICAgIC8vIElFKS4gIFdlIGNoYW5nZSB0aGUgb3JpZ2luYWwgaW5kZXggc28gd2Ug cmV2ZXJ0IHRvIHRoYXQgd2hlbiB0aGUKICAgICAgICAgLy8gcG9wdXAgaXMgY2xvc2VkLgotICAg ICAgICBpZiAobV9zaG91bGRBY2NlcHRPbkFiYW5kb24pCisgICAgICAgIGlmIChtX3NldHRpbmdz LmFjY2VwdE9uQWJhbmRvbikKICAgICAgICAgICAgIG1fd2lsbEFjY2VwdE9uQWJhbmRvbiA9IHRy dWU7CiAKICAgICAgICAgc2V0T3JpZ2luYWxJbmRleChtX3NlbGVjdGVkSW5kZXgpOwotICAgICAg ICBpZiAobV9zZXRUZXh0T25JbmRleENoYW5nZSkKKyAgICAgICAgaWYgKG1fc2V0dGluZ3Muc2V0 VGV4dE9uSW5kZXhDaGFuZ2UpCiAgICAgICAgICAgICBtX3BvcHVwQ2xpZW50LT5zZXRUZXh0RnJv bUl0ZW0obV9zZWxlY3RlZEluZGV4KTsKLSAgICB9IGVsc2UgaWYgKCFtX3NldFRleHRPbkluZGV4 Q2hhbmdlICYmIGV2ZW50LndpbmRvd3NWaXJ0dWFsS2V5Q29kZSgpID09IFZLRVlfVEFCKSB7Cisg ICAgfSBlbHNlIGlmICghbV9zZXR0aW5ncy5zZXRUZXh0T25JbmRleENoYW5nZSAmJgorICAgICAg ICAgICAgICAgZXZlbnQud2luZG93c1ZpcnR1YWxLZXlDb2RlKCkgPT0gVktFWV9UQUIpIHsKICAg ICAgICAgLy8gVEFCIGlzIGEgc3BlY2lhbCBjYXNlIGFzIGl0IHNob3VsZCBzZWxlY3QgdGhlIGN1 cnJlbnQgaXRlbSBpZiBhbnkgYW5kCiAgICAgICAgIC8vIGFkdmFuY2UgZm9jdXMuCiAgICAgICAg IGlmIChtX3NlbGVjdGVkSW5kZXggPj0gMCkKQEAgLTk1OSw3ICs5MzIsOCBAQCB2b2lkIFBvcHVw TGlzdEJveDo6c2Nyb2xsVG9SZXZlYWxSb3coaW50CiAgICAgfQogfQogCi1ib29sIFBvcHVwTGlz dEJveDo6aXNTZWxlY3RhYmxlSXRlbShpbnQgaW5kZXgpIHsKK2Jvb2wgUG9wdXBMaXN0Qm94Ojpp c1NlbGVjdGFibGVJdGVtKGludCBpbmRleCkKK3sKICAgICByZXR1cm4gbV9pdGVtc1tpbmRleF0t PnR5cGUgPT0gVHlwZU9wdGlvbiAmJiBtX3BvcHVwQ2xpZW50LT5pdGVtSXNFbmFibGVkKGluZGV4 KTsKIH0KIApAQCAtOTczLDcgKzk0Nyw3IEBAIHZvaWQgUG9wdXBMaXN0Qm94OjpjbGVhclNlbGVj dGlvbigpCiAKIHZvaWQgUG9wdXBMaXN0Qm94OjpzZWxlY3ROZXh0Um93KCkKIHsKLSAgICBpZiAo IW1fbG9vcFNlbGVjdGlvbk5hdmlnYXRpb24gfHwgbV9zZWxlY3RlZEluZGV4ICE9IG51bUl0ZW1z KCkgLSAxKSB7CisgICAgaWYgKCFtX3NldHRpbmdzLmxvb3BTZWxlY3Rpb25OYXZpZ2F0aW9uIHx8 IG1fc2VsZWN0ZWRJbmRleCAhPSBudW1JdGVtcygpIC0gMSkgewogICAgICAgICBhZGp1c3RTZWxl Y3RlZEluZGV4KDEpOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtOTg0LDcgKzk1OCw3IEBA IHZvaWQgUG9wdXBMaXN0Qm94OjpzZWxlY3ROZXh0Um93KCkKIAogdm9pZCBQb3B1cExpc3RCb3g6 OnNlbGVjdFByZXZpb3VzUm93KCkKIHsKLSAgICBpZiAoIW1fbG9vcFNlbGVjdGlvbk5hdmlnYXRp b24gfHwgbV9zZWxlY3RlZEluZGV4ID4gMCkgeworICAgIGlmICghbV9zZXR0aW5ncy5sb29wU2Vs ZWN0aW9uTmF2aWdhdGlvbiB8fCBtX3NlbGVjdGVkSW5kZXggPiAwKSB7CiAgICAgICAgIGFkanVz dFNlbGVjdGVkSW5kZXgoLTEpOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMTE1Niw3ICsx MTMwLDcgQEAgUG9wdXBNZW51Ojp+UG9wdXBNZW51KCkKIAogdm9pZCBQb3B1cE1lbnU6OnNob3co Y29uc3QgSW50UmVjdCYgciwgRnJhbWVWaWV3KiB2LCBpbnQgaW5kZXgpIAogewotICAgIHAucG9w dXAgPSBQb3B1cENvbnRhaW5lcjo6Y3JlYXRlKGNsaWVudCgpLCB0cnVlKTsKKyAgICBwLnBvcHVw ID0gUG9wdXBDb250YWluZXI6OmNyZWF0ZShjbGllbnQoKSwgZHJvcERvd25TZXR0aW5ncyk7CiAg ICAgcC5wb3B1cC0+c2hvdyhyLCB2LCBpbmRleCk7CiB9CiAKSW5kZXg6IFdlYkNvcmUvcGxhdGZv cm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3Bs YXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmgJKHJldmlzaW9uIDQwMzc4KQorKysg V2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5oCSh3b3JraW5nIGNv cHkpCkBAIC00NCw3ICs0NCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgIC8vIEZJWE1F OiBPdXIgRnJhbWVsZXNzU2Nyb2xsVmlldyBjbGFzc2VzIHNob3VsZCBwcm9iYWJseSBpbXBsZW1l bnQgSG9zdFdpbmRvdyEKIAotICAgIC8vIFRoaXMgY2xhc3MgaG9sZHMgYSBQb3B1cExpc3RCb3gg KHNlZSBjcHAgZmlsZSkuICBJdHMgc29sZSBwdXJwb3NlIGlzIHRvIGJlCisgICAgLy8gVGhlIFBv cHVwQ29udGFpbmVyIGNsYXNzIGhvbGRzIGEgUG9wdXBMaXN0Qm94IChzZWUgY3BwIGZpbGUpLiAg SXRzIHNvbGUgcHVycG9zZSBpcyB0byBiZQogICAgIC8vIGFibGUgdG8gZHJhdyBhIGJvcmRlciBh cm91bmQgaXRzIGNoaWxkLiAgQWxsIGl0cyBwYWludC9ldmVudCBoYW5kbGluZyBpcwogICAgIC8v IGp1c3QgZm9yd2FyZGVkIHRvIHRoZSBjaGlsZCBsaXN0Qm94ICh3aXRoIHRoZSBhcHByb3ByaWF0 ZSB0cmFuc2Zvcm1zKS4KICAgICAvLyBOT1RFOiB0aGlzIGNsYXNzIGlzIGV4cG9zZWQgc28gaXQg Y2FuIGJlIGluc3RhbnRpYXRlZCBkaXJlY2x5IGZvciB0aGUKQEAgLTUyLDkgKzUyLDMwIEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKICAgICAvLyBhdXRvZmlsbCBwb3B1cCBzaG91bGQgbm90IGJlIGZv Y3VzZWQgd2hlbiBzaG93biBhbmQgd2Ugd2FudCB0byBmb3J3YXJkIHRoZQogICAgIC8vIGtleSBl dmVudHMgdG8gaXQgKHRocm91Z2ggaGFuZGxlS2V5RXZlbnQpLgogCisgICAgc3RydWN0IFBvcHVw Q29udGFpbmVyU2V0dGluZ3MgeworICAgICAgICAvLyBXaGV0aGVyIHRoZSBwb3B1cCBzaG91bGQg Z2V0IHRoZSBmb2N1cyB3aGVuIGRpc3BsYXllZC4KKyAgICAgICAgYm9vbCBmb2N1c09uU2hvdzsK KworICAgICAgICAvLyBXaGV0aGVyIHRoZSBQb3B1cE1lbnVDbGllbnQgc2hvdWxkIGJlIHRvbGQg dG8gY2hhbmdlIGl0cyB0ZXh0IHdoZW4gYQorICAgICAgICAvLyBuZXcgaXRlbSBpcyBzZWxlY3Rl ZCBieSB1c2luZyB0aGUgYXJyb3cga2V5cy4KKyAgICAgICAgYm9vbCBzZXRUZXh0T25JbmRleENo YW5nZTsKKworICAgICAgICAvLyBXaGV0aGVyIHRoZSBzZWxlY3Rpb24gc2hvdWxkIGJlIGFjY2Vw dGVkIHdoZW4gdGhlIHBvcHVwIG1lbnUgaXMKKyAgICAgICAgLy8gY2xvc2VkICh0aHJvdWdoIEVT QyBiZWluZyBwcmVzc2VkIG9yIHRoZSBmb2N1cyBnb2luZyBhd2F5KS4KKyAgICAgICAgLy8gTm90 ZSB0aGF0IHdoZW4gVEFCIGlzIHByZXNzZWQsIHRoZSBzZWxlY3Rpb24gaXMgYWx3YXlzIGFjY2Vw dGVkCisgICAgICAgIC8vIHJlZ2FyZGxlc3Mgb2YgdGhpcyBzZXR0aW5nLgorICAgICAgICBib29s IGFjY2VwdE9uQWJhbmRvbjsKKworICAgICAgICAvLyBXaGV0aGVyIHRoZSB3ZSBzaG91bGQgbW92 ZSB0aGUgc2VsZWN0aW9uIHRvIHRoZSBmaXJzdC9sYXN0IGl0ZW0gd2hlbgorICAgICAgICAvLyB0 aGUgdXNlciBwcmVzc2VzIGRvd24vdXAgYXJyb3cga2V5cyBhbmQgdGhlIGxhc3QvZmlyc3QgaXRl bSBpcworICAgICAgICAvLyBzZWxlY3RlZC4KKyAgICAgICAgYm9vbCBsb29wU2VsZWN0aW9uTmF2 aWdhdGlvbjsKKyAgICB9OworCiAgICAgY2xhc3MgUG9wdXBDb250YWluZXIgOiBwdWJsaWMgRnJh bWVsZXNzU2Nyb2xsVmlldywgcHVibGljIFJlZkNvdW50ZWQ8UG9wdXBDb250YWluZXI+ICB7CiAg ICAgcHVibGljOgotICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxQb3B1cENvbnRhaW5lcj4gY3Jl YXRlKFBvcHVwTWVudUNsaWVudCosIGJvb2wgZm9jdXNPblNob3cpOworICAgICAgICBzdGF0aWMg UGFzc1JlZlB0cjxQb3B1cENvbnRhaW5lcj4gY3JlYXRlKFBvcHVwTWVudUNsaWVudCosCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgUG9wdXBD b250YWluZXJTZXR0aW5ncyYpOwogCiAgICAgICAgIC8vIFdoZXRoZXIgYSBrZXkgZXZlbnQgc2hv dWxkIGJlIHNlbnQgdG8gdGhpcyBwb3B1cC4KICAgICAgICAgdmlydHVhbCBib29sIGlzSW50ZXJl c3RlZEluRXZlbnRGb3JLZXkoaW50IGtleUNvZGUpOwpAQCAtODQsMjIgKzEwNSw2IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKICAgICAgICAgLy8gQ29tcHV0ZSBzaXplIG9mIHdpZGdldCBhbmQgY2hp bGRyZW4uCiAgICAgICAgIHZvaWQgbGF5b3V0KCk7CiAKLSAgICAgICAgLy8gU2V0cyB3aGV0aGVy IHRoZSBQb3B1cE1lbnVDbGllbnQgc2hvdWxkIGJlIHRvbGQgdG8gY2hhbmdlIGl0cyB0ZXh0IHdo ZW4gYQotICAgICAgICAvLyBuZXcgaXRlbSBpcyBzZWxlY3RlZCAoYnkgdXNpbmcgdGhlIGFycm93 IGtleXMpLiAgRGVmYXVsdCBpcyB0cnVlLgotICAgICAgICB2b2lkIHNldFRleHRPbkluZGV4Q2hh bmdlKGJvb2wpOwotCi0gICAgICAgIC8vIFNldHMgd2hldGhlciB0aGUgc2VsZWN0aW9uIHNob3Vs ZCBiZSBhY2NlcHRlZCB3aGVuIHRoZSBwb3B1cCBtZW51IGlzCi0gICAgICAgIC8vIGNsb3NlZCAo dGhyb3VnaCBFU0MgYmVpbmcgcHJlc3NlZCBvciB0aGUgZm9jdXMgZ29pbmcgYXdheSkuICBEZWZh dWx0Ci0gICAgICAgIC8vIGlzIHRydWUuICBOb3RlIHRoYXQgd2hlbiBUQUIgaXMgcHJlc3NlZCwg dGhlIHNlbGVjdGlvbiBpcyBhbHdheXMKLSAgICAgICAgLy8gYWNjZXB0ZWQgcmVnYXJkbGVzcyBv ZiB0aGlzIHNldHRpbmcuCi0gICAgICAgIHZvaWQgc2V0QWNjZXB0T25BYmFuZG9uKGJvb2wpOwot Ci0gICAgICAgIC8vIFNldHMgd2hldGhlciB3ZSBzaG91bGQgbW92ZSB0aGUgc2VsZWN0aW9uIHRv IHRoZSBmaXJzdC9sYXN0IGl0ZW0KLSAgICAgICAgLy8gd2hlbiB0aGUgdXNlciBwcmVzc2VzIGRv d24vdXAgYXJyb3cga2V5cyBhbmQgdGhlIGxhc3QvZmlyc3QgaXRlbSBpcwotICAgICAgICAvLyBz ZWxlY3RlZC4gIERlZmF1bHQgaXMgZmFsc2UsIGNhdXNpbmcgdGhlIGZpcnN0L2xhc3QgaXRlbSB0 byBzdGF5Ci0gICAgICAgIC8vIHNlbGVjdGVkLgotICAgICAgICB2b2lkIHNldExvb3BTZWxlY3Rp b25OYXZpZ2F0aW9uKGJvb2wpOwotCiAgICAgICAgIFBvcHVwTGlzdEJveCogbGlzdEJveCgpIGNv bnN0IHsgcmV0dXJuIG1fbGlzdEJveC5nZXQoKTsgfQogCiAgICAgICAgIC8vIFJlZnJlc2ggdGhl IHBvcHVwIHZhbHVlcyBmcm9tIHRoZSBQb3B1cE1lbnVDbGllbnQuCkBAIC0xMDgsNyArMTEzLDcg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIHByaXZhdGU6CiAgICAgICAgIGZyaWVuZCBjbGFz cyBXVEY6OlJlZkNvdW50ZWQ8UG9wdXBDb250YWluZXI+OwogCi0gICAgICAgIFBvcHVwQ29udGFp bmVyKFBvcHVwTWVudUNsaWVudCosIGJvb2wgZm9jdXNPblNob3cpOworICAgICAgICBQb3B1cENv bnRhaW5lcihQb3B1cE1lbnVDbGllbnQqLCBjb25zdCBQb3B1cENvbnRhaW5lclNldHRpbmdzJik7 CiAgICAgICAgIH5Qb3B1cENvbnRhaW5lcigpOwogCiAgICAgICAgIC8vIFBhaW50IHRoZSBib3Jk ZXIuCkBAIC0xMTYsOCArMTIxLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAgIFJl ZlB0cjxQb3B1cExpc3RCb3g+IG1fbGlzdEJveDsKIAotICAgICAgICAvLyBXaGV0aGVyIHRoZSB3 aW5kb3cgc2hvd2luZyB0aGlzIHBvcHVwIHNob3VsZCBiZSBmb2N1c2VkIHdoZW4gc2hvd24uCi0g ICAgICAgIGJvb2wgbV9mb2N1c09uU2hvdzsKKyAgICAgICAgUG9wdXBDb250YWluZXJTZXR0aW5n cyBtX3NldHRpbmdzOwogICAgIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK