41477 2010-07-01 11:57:56 -0700 Direct calls to cast operator in WebFrameImpl.cpp 2010-07-08 01:49:20 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 41499 1 dhollowa dhollowa abarth commit-queue dhollowa eric fishd levin webkit.review.bot oldest_to_newest 245459 0 dhollowa 2010-07-01 11:57:56 -0700 Overview: Poor C++ style with direct calls to cast operator in WebFrameImpl.cpp. Steps to Reproduce: 1) Open WebFrameImpl.cpp 2) Inspect WebKit::WebFrameImpl::registerPasswordListener and WebKit::WebFrameImpl::notifiyPasswordListenerOfAutocomplete Actual Results: Notice the calls to: RefPtr<HTMLInputElement> element = inputElement.operator PassRefPtr<HTMLInputElement>(); This is using an explicit call to a PassRefPtr cast operator to bridge from a WebInputElement back to an HTMLInputElement. Expected Results: Better style is to "unwrap" the WebInputElement explicitly, eg.: RefPtr<HTMLInputElement> element(inputElement.unwrap<HTMLInputElement>()); 245483 1 dhollowa 2010-07-01 12:31:43 -0700 Follow up for bug 41236. 245485 2 60272 dhollowa 2010-07-01 12:34:15 -0700 Created attachment 60272 Proposed patch. 245509 3 60277 dhollowa 2010-07-01 13:09:17 -0700 Created attachment 60277 Proposed patch. 245512 4 60277 fishd 2010-07-01 13:18:13 -0700 Comment on attachment 60277 Proposed patch. Thanks! R=me 245711 5 60277 commit-queue 2010-07-01 19:50:48 -0700 Comment on attachment 60277 Proposed patch. Clearing flags on attachment: 60277 Committed r62349: <http://trac.webkit.org/changeset/62349> 245712 6 commit-queue 2010-07-01 19:50:52 -0700 All reviewed patches have been landed. Closing bug. 245716 7 webkit.review.bot 2010-07-01 20:00:37 -0700 http://trac.webkit.org/changeset/62349 might have broken Chromium Linux Release 245727 8 levin 2010-07-01 20:15:11 -0700 Rolled out due to breakage on Linux. http://trac.webkit.org/changeset/62351 245730 9 levin 2010-07-01 20:17:45 -0700 And OSX bustage. Here's the compile error: /Users/cltbld/Desktop/BuildSlaveData/WebKit-BuildSlave/chromium-mac-release/build/WebKit/chromium/src/WebFrameImpl.cpp: In member function ‘virtual void WebKit::WebFrameImpl::notifiyPasswordListenerOfAutocomplete(const WebKit::WebInputElement&)’: /Users/cltbld/Desktop/BuildSlaveData/WebKit-BuildSlave/chromium-mac-release/build/WebKit/chromium/src/WebFrameImpl.cpp:1974: error: passing ‘const WebKit::WebInputElement’ as ‘this’ argument of ‘T* WebKit::WebNode::unwrap() [with T = WebCore::HTMLInputElement]’ discards qualifiers 247812 10 60792 dhollowa 2010-07-07 15:46:47 -0700 Created attachment 60792 Proposed patch. Fixes const-ness issues. Grrrr. False positive my end. New patch addresses const-ness issues and pushes the const-ness of the |inputElement| parameter down a level to WebFrameImpl::getPasswordListener(). We need a const_cast at this level due to the use of non-const RefPtr<HTMLInputElement> used as the key to the |m_passwordListeners| map. 248088 11 60792 commit-queue 2010-07-08 01:49:15 -0700 Comment on attachment 60792 Proposed patch. Fixes const-ness issues. Clearing flags on attachment: 60792 Committed r62770: <http://trac.webkit.org/changeset/62770> 248089 12 commit-queue 2010-07-08 01:49:20 -0700 All reviewed patches have been landed. Closing bug. 60272 2010-07-01 12:34:15 -0700 2010-07-01 13:09:17 -0700 Proposed patch. proposed_patch.diff text/plain 2658 dhollowa SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjIyNzYpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMDctMDEgIERhdmlk IEhvbGxvd2F5ICA8ZGhvbGxvd2FAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gRXhwb3NlcyBXZWJOb2RlOjp1 bndyYXAoKSBhbmQgV2ViTm9kZTo6Y29uc3RVbndyYXAoKSBmb3IgdXNlIGJ5IG90aGVyIGNvZGUg aW4gV2ViS2l0L2Nocm9taXVtL3NyYy4KKworICAgICAgICBTcGVjaWZpYyB1c2Ugb2YgdGhlc2Ug bWV0aG9kcyBpcyBtYWRlIGluIFdlYkZyYW1lSW1wbC5jcHAuICBUaGlzIGlzIHByZWZlcnJlZCB0 byB0aGUgY2FzdCBvcGVyYXRvciBjYWxsIHRoYXQKKyAgICAgICAgd2FzIGhhcHBlbmluZyBwcmlv ciB0byB0aGlzIGNoYW5nZS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NDE0NzcKKworICAgICAgICAqIHB1YmxpYy9XZWJOb2RlLmg6CisgICAgICAg ICogc3JjL1dlYkZyYW1lSW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lSW1wbDo6 cmVnaXN0ZXJQYXNzd29yZExpc3RlbmVyKToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVJbXBs Ojpub3RpZml5UGFzc3dvcmRMaXN0ZW5lck9mQXV0b2NvbXBsZXRlKToKKwogMjAxMC0wNy0wMSAg U2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5y ZXZpZXdlZCwgcm9sbGluZyBvdXQgcjYyMjQ2LgpJbmRleDogV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJOb2RlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJOb2Rl LmgJKHJldmlzaW9uIDYyMjc1KQorKysgV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJOb2RlLmgJ KHdvcmtpbmcgY29weSkKQEAgLTEyNCw3ICsxMjQsNiBAQCBwdWJsaWM6CiAgICAgb3BlcmF0b3Ig V1RGOjpQYXNzUmVmUHRyPFdlYkNvcmU6Ok5vZGU+KCkgY29uc3Q7CiAjZW5kaWYKIAotcHJvdGVj dGVkOgogI2lmIFdFQktJVF9JTVBMRU1FTlRBVElPTgogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+ IFQqIHVud3JhcCgpCiAgICAgewpAQCAtMTM3LDYgKzEzNiw3IEBAIHByb3RlY3RlZDoKICAgICB9 CiAjZW5kaWYKIAorcHJvdGVjdGVkOgogICAgIFdlYlByaXZhdGVQdHI8V2ViQ29yZTo6Tm9kZT4g bV9wcml2YXRlOwogfTsKIApJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAko cmV2aXNpb24gNjIyNzUpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTE5NjAsNyArMTk2MCw3IEBAIGJvb2wgV2ViRnJhbWVJbXBsOjpy ZWdpc3RlclBhc3N3b3JkTGlzdGUKICAgICBXZWJJbnB1dEVsZW1lbnQgaW5wdXRFbGVtZW50LAog ICAgIFdlYlBhc3N3b3JkQXV0b2NvbXBsZXRlTGlzdGVuZXIqIGxpc3RlbmVyKQogewotICAgIFJl ZlB0cjxIVE1MSW5wdXRFbGVtZW50PiBlbGVtZW50ID0gaW5wdXRFbGVtZW50Lm9wZXJhdG9yIFBh c3NSZWZQdHI8SFRNTElucHV0RWxlbWVudD4oKTsKKyAgICBSZWZQdHI8SFRNTElucHV0RWxlbWVu dD4gZWxlbWVudChpbnB1dEVsZW1lbnQudW53cmFwPEhUTUxJbnB1dEVsZW1lbnQ+KCkpOwogICAg IGlmICghbV9wYXNzd29yZExpc3RlbmVycy5hZGQoZWxlbWVudCwgbGlzdGVuZXIpLnNlY29uZCkg ewogICAgICAgICBkZWxldGUgbGlzdGVuZXI7CiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTE5 NzEsNyArMTk3MSw3IEBAIGJvb2wgV2ViRnJhbWVJbXBsOjpyZWdpc3RlclBhc3N3b3JkTGlzdGUK IHZvaWQgV2ViRnJhbWVJbXBsOjpub3RpZml5UGFzc3dvcmRMaXN0ZW5lck9mQXV0b2NvbXBsZXRl KAogICAgIGNvbnN0IFdlYklucHV0RWxlbWVudCYgaW5wdXRFbGVtZW50KQogewotICAgIFJlZlB0 cjxIVE1MSW5wdXRFbGVtZW50PiBlbGVtZW50ID0gaW5wdXRFbGVtZW50Lm9wZXJhdG9yIFBhc3NS ZWZQdHI8SFRNTElucHV0RWxlbWVudD4oKTsKKyAgICBSZWZQdHI8SFRNTElucHV0RWxlbWVudD4g ZWxlbWVudChpbnB1dEVsZW1lbnQudW53cmFwPEhUTUxJbnB1dEVsZW1lbnQ+KCkpOwogICAgIFdl YlBhc3N3b3JkQXV0b2NvbXBsZXRlTGlzdGVuZXIqIGxpc3RlbmVyID0gZ2V0UGFzc3dvcmRMaXN0 ZW5lcihlbGVtZW50LmdldCgpKTsKICAgICAvLyBQYXNzd29yZCBsaXN0ZW5lcnMgbmVlZCB0byBh dXRvY29tcGxldGUgb3RoZXIgZmllbGRzIHRoYXQgZGVwZW5kIG9uIHRoZQogICAgIC8vIGlucHV0 IGVsZW1lbnQgd2l0aCBhdXRvZmlsbCBzdWdnZXN0aW9ucy4K 60277 2010-07-01 13:09:17 -0700 2010-07-07 15:46:47 -0700 Proposed patch. proposed_patch.diff text/plain 2677 dhollowa SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjIyNzYpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTAtMDctMDEgIERhdmlk IEhvbGxvd2F5ICA8ZGhvbGxvd2FAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gRXhwb3NlcyBXZWJOb2RlOjp1 bndyYXAoKSBhbmQgV2ViTm9kZTo6Y29uc3RVbndyYXAoKSBmb3IgCisgICAgICAgIHVzZSBieSBv dGhlciBjb2RlIGluIFdlYktpdC9jaHJvbWl1bS9zcmMuCisKKyAgICAgICAgU3BlY2lmaWMgdXNl IG9mIHRoZXNlIG1ldGhvZHMgaXMgbWFkZSBpbiBXZWJGcmFtZUltcGwuY3BwLiAgVGhpcyBpcwor ICAgICAgICBwcmVmZXJyZWQgdG8gdGhlIGNhc3Qgb3BlcmF0b3IgY2FsbCB0aGF0IHdhcyBoYXBw ZW5pbmcgcHJpb3IgdG8gdGhpcworICAgICAgICBjaGFuZ2UuCisKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxNDc3CisKKyAgICAgICAgKiBwdWJsaWMv V2ViTm9kZS5oOgorICAgICAgICAqIHNyYy9XZWJGcmFtZUltcGwuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJGcmFtZUltcGw6OnJlZ2lzdGVyUGFzc3dvcmRMaXN0ZW5lcik6CisgICAgICAgIChX ZWJLaXQ6OldlYkZyYW1lSW1wbDo6bm90aWZpeVBhc3N3b3JkTGlzdGVuZXJPZkF1dG9jb21wbGV0 ZSk6CisKIDIwMTAtMDctMDEgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwu Y29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI2MjI0Ni4KSW5kZXg6IFdl YktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTm9kZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViTm9kZS5oCShyZXZpc2lvbiA2MjI3NSkKKysrIFdlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViTm9kZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjQsNyArMTI0LDYgQEAgcHVi bGljOgogICAgIG9wZXJhdG9yIFdURjo6UGFzc1JlZlB0cjxXZWJDb3JlOjpOb2RlPigpIGNvbnN0 OwogI2VuZGlmCiAKLXByb3RlY3RlZDoKICNpZiBXRUJLSVRfSU1QTEVNRU5UQVRJT04KICAgICB0 ZW1wbGF0ZTx0eXBlbmFtZSBUPiBUKiB1bndyYXAoKQogICAgIHsKQEAgLTEzNyw2ICsxMzYsNyBA QCBwcm90ZWN0ZWQ6CiAgICAgfQogI2VuZGlmCiAKK3Byb3RlY3RlZDoKICAgICBXZWJQcml2YXRl UHRyPFdlYkNvcmU6Ok5vZGU+IG1fcHJpdmF0ZTsKIH07CiAKSW5kZXg6IFdlYktpdC9jaHJvbWl1 bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3Jj L1dlYkZyYW1lSW1wbC5jcHAJKHJldmlzaW9uIDYyMjc1KQorKysgV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJGcmFtZUltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTYwLDcgKzE5NjAsNyBAQCBi b29sIFdlYkZyYW1lSW1wbDo6cmVnaXN0ZXJQYXNzd29yZExpc3RlCiAgICAgV2ViSW5wdXRFbGVt ZW50IGlucHV0RWxlbWVudCwKICAgICBXZWJQYXNzd29yZEF1dG9jb21wbGV0ZUxpc3RlbmVyKiBs aXN0ZW5lcikKIHsKLSAgICBSZWZQdHI8SFRNTElucHV0RWxlbWVudD4gZWxlbWVudCA9IGlucHV0 RWxlbWVudC5vcGVyYXRvciBQYXNzUmVmUHRyPEhUTUxJbnB1dEVsZW1lbnQ+KCk7CisgICAgUmVm UHRyPEhUTUxJbnB1dEVsZW1lbnQ+IGVsZW1lbnQoaW5wdXRFbGVtZW50LnVud3JhcDxIVE1MSW5w dXRFbGVtZW50PigpKTsKICAgICBpZiAoIW1fcGFzc3dvcmRMaXN0ZW5lcnMuYWRkKGVsZW1lbnQs IGxpc3RlbmVyKS5zZWNvbmQpIHsKICAgICAgICAgZGVsZXRlIGxpc3RlbmVyOwogICAgICAgICBy ZXR1cm4gZmFsc2U7CkBAIC0xOTcxLDcgKzE5NzEsNyBAQCBib29sIFdlYkZyYW1lSW1wbDo6cmVn aXN0ZXJQYXNzd29yZExpc3RlCiB2b2lkIFdlYkZyYW1lSW1wbDo6bm90aWZpeVBhc3N3b3JkTGlz dGVuZXJPZkF1dG9jb21wbGV0ZSgKICAgICBjb25zdCBXZWJJbnB1dEVsZW1lbnQmIGlucHV0RWxl bWVudCkKIHsKLSAgICBSZWZQdHI8SFRNTElucHV0RWxlbWVudD4gZWxlbWVudCA9IGlucHV0RWxl bWVudC5vcGVyYXRvciBQYXNzUmVmUHRyPEhUTUxJbnB1dEVsZW1lbnQ+KCk7CisgICAgUmVmUHRy PEhUTUxJbnB1dEVsZW1lbnQ+IGVsZW1lbnQoaW5wdXRFbGVtZW50LnVud3JhcDxIVE1MSW5wdXRF bGVtZW50PigpKTsKICAgICBXZWJQYXNzd29yZEF1dG9jb21wbGV0ZUxpc3RlbmVyKiBsaXN0ZW5l ciA9IGdldFBhc3N3b3JkTGlzdGVuZXIoZWxlbWVudC5nZXQoKSk7CiAgICAgLy8gUGFzc3dvcmQg bGlzdGVuZXJzIG5lZWQgdG8gYXV0b2NvbXBsZXRlIG90aGVyIGZpZWxkcyB0aGF0IGRlcGVuZCBv biB0aGUKICAgICAvLyBpbnB1dCBlbGVtZW50IHdpdGggYXV0b2ZpbGwgc3VnZ2VzdGlvbnMuCg== 60792 2010-07-07 15:46:47 -0700 2010-07-08 01:49:15 -0700 Proposed patch. Fixes const-ness issues. proposed_patch.diff text/plain 4110 dhollowa SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjI3MTEpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTAtMDctMDcgIERhdmlk IEhvbGxvd2F5ICA8ZGhvbGxvd2FAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gRXhwb3NlcyBXZWJOb2RlOjp1 bndyYXAoKSBhbmQgV2ViTm9kZTo6Y29uc3RVbndyYXAoKSBmb3IgCisgICAgICAgIHVzZSBieSBv dGhlciBjb2RlIGluIFdlYktpdC9jaHJvbWl1bS9zcmMuCisKKyAgICAgICAgU3BlY2lmaWMgdXNl IG9mIHRoZXNlIG1ldGhvZHMgaXMgbWFkZSBpbiBXZWJGcmFtZUltcGwuY3BwLiAgVGhpcyBpcwor ICAgICAgICBwcmVmZXJyZWQgdG8gdGhlIGNhc3Qgb3BlcmF0b3IgY2FsbCB0aGF0IHdhcyBoYXBw ZW5pbmcgcHJpb3IgdG8gdGhpcworICAgICAgICBjaGFuZ2UuCisKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxNDc3CisKKyAgICAgICAgKiBwdWJsaWMv V2ViTm9kZS5oOgorICAgICAgICAqIHNyYy9XZWJGcmFtZUltcGwuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJGcmFtZUltcGw6OnJlZ2lzdGVyUGFzc3dvcmRMaXN0ZW5lcik6CisgICAgICAgIChX ZWJLaXQ6OldlYkZyYW1lSW1wbDo6bm90aWZpeVBhc3N3b3JkTGlzdGVuZXJPZkF1dG9jb21wbGV0 ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lSW1wbDo6Z2V0UGFzc3dvcmRMaXN0ZW5lcik6 CisgICAgICAgICogc3JjL1dlYkZyYW1lSW1wbC5oOgorCiAyMDEwLTA3LTA3ICBKYW1lcyBIYXdr aW5zICA8amhhd2tpbnNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERpbWl0 cmkgR2xhemtvdi4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTm9kZS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTm9kZS5oCShyZXZpc2lvbiA2Mjcw NSkKKysrIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTm9kZS5oCSh3b3JraW5nIGNvcHkpCkBA IC0xMjQsNyArMTI0LDYgQEAgcHVibGljOgogICAgIG9wZXJhdG9yIFdURjo6UGFzc1JlZlB0cjxX ZWJDb3JlOjpOb2RlPigpIGNvbnN0OwogI2VuZGlmCiAKLXByb3RlY3RlZDoKICNpZiBXRUJLSVRf SU1QTEVNRU5UQVRJT04KICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBUKiB1bndyYXAoKQogICAg IHsKQEAgLTEzNyw2ICsxMzYsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgfQogI2VuZGlmCiAKK3Byb3Rl Y3RlZDoKICAgICBXZWJQcml2YXRlUHRyPFdlYkNvcmU6Ok5vZGU+IG1fcHJpdmF0ZTsKIH07CiAK SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAJKHJldmlzaW9uIDYyNzA1KQor KysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xOTYwLDcgKzE5NjAsNyBAQCBib29sIFdlYkZyYW1lSW1wbDo6cmVnaXN0ZXJQYXNzd29yZExp c3RlCiAgICAgV2ViSW5wdXRFbGVtZW50IGlucHV0RWxlbWVudCwKICAgICBXZWJQYXNzd29yZEF1 dG9jb21wbGV0ZUxpc3RlbmVyKiBsaXN0ZW5lcikKIHsKLSAgICBSZWZQdHI8SFRNTElucHV0RWxl bWVudD4gZWxlbWVudCA9IGlucHV0RWxlbWVudC5vcGVyYXRvciBQYXNzUmVmUHRyPEhUTUxJbnB1 dEVsZW1lbnQ+KCk7CisgICAgUmVmUHRyPEhUTUxJbnB1dEVsZW1lbnQ+IGVsZW1lbnQoaW5wdXRF bGVtZW50LnVud3JhcDxIVE1MSW5wdXRFbGVtZW50PigpKTsKICAgICBpZiAoIW1fcGFzc3dvcmRM aXN0ZW5lcnMuYWRkKGVsZW1lbnQsIGxpc3RlbmVyKS5zZWNvbmQpIHsKICAgICAgICAgZGVsZXRl IGxpc3RlbmVyOwogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC0xOTcxLDggKzE5NzEsOCBAQCBi b29sIFdlYkZyYW1lSW1wbDo6cmVnaXN0ZXJQYXNzd29yZExpc3RlCiB2b2lkIFdlYkZyYW1lSW1w bDo6bm90aWZpeVBhc3N3b3JkTGlzdGVuZXJPZkF1dG9jb21wbGV0ZSgKICAgICBjb25zdCBXZWJJ bnB1dEVsZW1lbnQmIGlucHV0RWxlbWVudCkKIHsKLSAgICBSZWZQdHI8SFRNTElucHV0RWxlbWVu dD4gZWxlbWVudCA9IGlucHV0RWxlbWVudC5vcGVyYXRvciBQYXNzUmVmUHRyPEhUTUxJbnB1dEVs ZW1lbnQ+KCk7Ci0gICAgV2ViUGFzc3dvcmRBdXRvY29tcGxldGVMaXN0ZW5lciogbGlzdGVuZXIg PSBnZXRQYXNzd29yZExpc3RlbmVyKGVsZW1lbnQuZ2V0KCkpOworICAgIGNvbnN0IEhUTUxJbnB1 dEVsZW1lbnQqIGVsZW1lbnQgPSBpbnB1dEVsZW1lbnQuY29uc3RVbndyYXA8SFRNTElucHV0RWxl bWVudD4oKTsKKyAgICBXZWJQYXNzd29yZEF1dG9jb21wbGV0ZUxpc3RlbmVyKiBsaXN0ZW5lciA9 IGdldFBhc3N3b3JkTGlzdGVuZXIoZWxlbWVudCk7CiAgICAgLy8gUGFzc3dvcmQgbGlzdGVuZXJz IG5lZWQgdG8gYXV0b2NvbXBsZXRlIG90aGVyIGZpZWxkcyB0aGF0IGRlcGVuZCBvbiB0aGUKICAg ICAvLyBpbnB1dCBlbGVtZW50IHdpdGggYXV0b2ZpbGwgc3VnZ2VzdGlvbnMuCiAgICAgaWYgKGxp c3RlbmVyKQpAQCAtMTk4MCw5ICsxOTgwLDkgQEAgdm9pZCBXZWJGcmFtZUltcGw6Om5vdGlmaXlQ YXNzd29yZExpc3RlbgogfQogCiBXZWJQYXNzd29yZEF1dG9jb21wbGV0ZUxpc3RlbmVyKiBXZWJG cmFtZUltcGw6OmdldFBhc3N3b3JkTGlzdGVuZXIoCi0gICAgSFRNTElucHV0RWxlbWVudCogaW5w dXRFbGVtZW50KQorICAgIGNvbnN0IEhUTUxJbnB1dEVsZW1lbnQqIGlucHV0RWxlbWVudCkKIHsK LSAgICByZXR1cm4gbV9wYXNzd29yZExpc3RlbmVycy5nZXQoUmVmUHRyPEhUTUxJbnB1dEVsZW1l bnQ+KGlucHV0RWxlbWVudCkpOworICAgIHJldHVybiBtX3Bhc3N3b3JkTGlzdGVuZXJzLmdldChS ZWZQdHI8SFRNTElucHV0RWxlbWVudD4oY29uc3RfY2FzdDxIVE1MSW5wdXRFbGVtZW50Kj4oaW5w dXRFbGVtZW50KSkpOwogfQogCiAvLyBXZWJGcmFtZUltcGwgcHJpdmF0ZSAtLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQpJbmRleDogV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21p dW0vc3JjL1dlYkZyYW1lSW1wbC5oCShyZXZpc2lvbiA2MjcwNSkKKysrIFdlYktpdC9jaHJvbWl1 bS9zcmMvV2ViRnJhbWVJbXBsLmgJKHdvcmtpbmcgY29weSkKQEAgLTIzMSw3ICsyMzEsNyBAQCBw dWJsaWM6CiAgICAgLy8gdXNlciBuYW1lIGlucHV0IGVsZW1lbnQsIG9yIDAgaWYgbm9uZSBhdmFp bGFibGUuCiAgICAgLy8gTm90ZSB0aGF0IHRoZSByZXR1cm5lZCBsaXN0ZW5lciBpcyBvd25lciBi eSB0aGUgV2ViRnJhbWVJbXBsIGFuZCBzaG91bGQgbm90CiAgICAgLy8gYmUga2VwdCBhcm91bmQg YXMgaXQgaXMgZGVsZXRlZCB3aGVuIHRoZSBwYWdlIGdvZXMgYXdheS4KLSAgICBXZWJQYXNzd29y ZEF1dG9jb21wbGV0ZUxpc3RlbmVyKiBnZXRQYXNzd29yZExpc3RlbmVyKFdlYkNvcmU6OkhUTUxJ bnB1dEVsZW1lbnQqKTsKKyAgICBXZWJQYXNzd29yZEF1dG9jb21wbGV0ZUxpc3RlbmVyKiBnZXRQ YXNzd29yZExpc3RlbmVyKGNvbnN0IFdlYkNvcmU6OkhUTUxJbnB1dEVsZW1lbnQqKTsKIAogICAg IFdlYkZyYW1lQ2xpZW50KiBjbGllbnQoKSBjb25zdCB7IHJldHVybiBtX2NsaWVudDsgfQogICAg IHZvaWQgc2V0Q2xpZW50KFdlYkZyYW1lQ2xpZW50KiBjbGllbnQpIHsgbV9jbGllbnQgPSBjbGll bnQ7IH0K