131121 2014-04-02 13:22:52 -0700 Remove code duplications when initializing InspectorServer (EFL and GTK) 2016-01-15 07:14:28 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified NEW P2 Normal --- 1 lvidacs.u-szeged lvidacs.u-szeged bunhere cdumez cgarcia commit-queue gustavo gyuyoung.kim lvidacs.u-szeged ossy sergio oldest_to_newest 996816 0 lvidacs.u-szeged 2014-04-02 13:22:52 -0700 WebContextEfl.cpp and WebContextGTK.cpp contains similar static functions to initialize InspectorServer (initializeInspectorServer() vs initInspectorServer()). Create a common method called from both places. 996827 1 228423 lvidacs.u-szeged 2014-04-02 13:34:18 -0700 Created attachment 228423 Patch 1153336 2 228423 mcatanzaro 2016-01-06 20:02:01 -0800 Comment on attachment 228423 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228423&action=review Sorry for the late review. Thanks for this nice cleanup. > Source/WebKit2/UIProcess/InspectorServer/WebInspectorServer.cpp:41 > +#if PLATFORM(GTK) || PLATFORM(EFL) This should be #if ENABLE(INSPECTOR_SERVER). INSPECTOR_SERVER is only used by GTK and EFL. > Source/WebKit2/UIProcess/InspectorServer/WebInspectorServer.h:45 > +#if PLATFORM(GTK) || PLATFORM(EFL) Ditto. > Source/WebKit2/UIProcess/InspectorServer/WebInspectorServer.h:69 > + static bool initialized; You'll want to split this out: #if PLATFORM(GTK) || PLATFORM(EFL) void buildPageList(Vector<char>& data, String& contentType); #endif #if ENABLE(INSPECTOR_SERVER) static bool initialized; #endif The extra #ifdef is messier here, but I think it's better to use the feature-specific rather than platform-specific conditionals where possible. 228423 2014-04-02 13:34:18 -0700 2016-01-06 20:02:01 -0800 Patch bug-131121-20140402223357.patch text/plain 8898 lvidacs.u-szeged U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2NjM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNThhZjM1MjBlMTRhNWE5 MTU4MTYzMjM1MWZkOGM4YmRlOTZkNGYwMy4uNjU4ODYwMDMwYmU1Nzc0NDYwYjU1NjAwZmI2YTBi ZWJjMTc4N2JiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE0LTA0LTAyICBMYXN6 bG8gVmlkYWNzICA8bHZpZGFjcy51LXN6ZWdlZEBwYXJ0bmVyLnNhbXN1bmcuY29tPgorCisgICAg ICAgIFJlbW92ZSBjb2RlIGR1cGxpY2F0aW9ucyB3aGVuIGluaXRpYWxpemluZyBJbnNwZWN0b3JT ZXJ2ZXIgKEVGTCBhbmQgR1RLKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTMxMTIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgRHVwbGljYXRlZCBmdW5jdGlvbiBpcyBtb3ZlZCB0byBzdGF0aWMgdm9pZCBX ZWJJbnNwZWN0b3JTZXJ2ZXI6OmluaXRJbnNwZWN0b3JTZXJ2ZXIoKS4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9JbnNwZWN0b3JTZXJ2ZXIvV2ViSW5zcGVjdG9yU2VydmVyLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViSW5zcGVjdG9yU2VydmVyOjppbml0SW5zcGVjdG9yU2VydmVyKToKKyAgICAg ICAgKiBVSVByb2Nlc3MvSW5zcGVjdG9yU2VydmVyL1dlYkluc3BlY3RvclNlcnZlci5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9lZmwvV2ViQ29udGV4dEVmbC5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYkNvbnRleHQ6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MpOgorICAgICAgICAoV2Vi S2l0Ojppbml0aWFsaXplSW5zcGVjdG9yU2VydmVyKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVBy b2Nlc3MvZ3RrL1dlYkNvbnRleHRHdGsuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0 OjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6aW5pdElu c3BlY3RvclNlcnZlcik6IERlbGV0ZWQuCisKIDIwMTQtMDQtMDEgIEJlbmphbWluIFBvdWxhaW4g IDxicG91bGFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2Mjk0NzA0 PiBSZW1vdmUgX3BhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvciBlbnRpcmVseQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0luc3BlY3RvclNlcnZlci9XZWJJbnNwZWN0b3JT ZXJ2ZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0luc3BlY3RvclNlcnZlci9XZWJJ bnNwZWN0b3JTZXJ2ZXIuY3BwCmluZGV4IDUxMzVmOTI3NWY2YWNjMjkzZDE4YmE1M2MyZGY2YjJm NjljMTEwZGIuLmM2MmY2Yzg4MzYyNGY1OWQwODMwMDUzYThkNDQwY2MwNjY2ZTI4ZjggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9JbnNwZWN0b3JTZXJ2ZXIvV2ViSW5zcGVj dG9yU2VydmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvSW5zcGVjdG9yU2Vy dmVyL1dlYkluc3BlY3RvclNlcnZlci5jcHAKQEAgLTM4LDYgKzM4LDQ2IEBAIHVzaW5nIG5hbWVz cGFjZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAorI2lmIFBMQVRGT1JNKEdUSykg fHwgUExBVEZPUk0oRUZMKQorYm9vbCBXZWJJbnNwZWN0b3JTZXJ2ZXI6OmluaXRpYWxpemVkID0g ZmFsc2U7CisKK3ZvaWQgV2ViSW5zcGVjdG9yU2VydmVyOjppbml0SW5zcGVjdG9yU2VydmVyKFN0 cmluZyBzZXJ2ZXJBZGRyZXNzKQoreworICAgIGlmIChpbml0aWFsaXplZCkKKyAgICAgICAgcmV0 dXJuOworCisgICAgLy8gSXQgc2hvdWxkIGJlIHNldCB0byB0cnVlIGFsd2F5cy4KKyAgICAvLyBC ZWNhdXNlIGl0IGlzIHRvIGVuc3VyZSBpbml0aWFsaXplSW5zcGVjdG9yU2VydmVyKCkgaXMgZXhl Y3V0ZWQgb25seSBvbmNlLAorICAgIC8vIGV2ZW4gaWYgdGhlIHNlcnZlciBmYWlscyB0byBydW4u CisgICAgaW5pdGlhbGl6ZWQgPSB0cnVlOworCisgICAgaWYgKCFzZXJ2ZXJBZGRyZXNzLmlzTnVs bCgpKSB7CisgICAgICAgIFN0cmluZyBiaW5kQWRkcmVzcyA9ICIxMjcuMC4wLjEiOworICAgICAg ICB1bnNpZ25lZCBzaG9ydCBwb3J0ID0gMjk5OTsKKworICAgICAgICBWZWN0b3I8U3RyaW5nPiBy ZXN1bHQ7CisgICAgICAgIHNlcnZlckFkZHJlc3Muc3BsaXQoJzonLCByZXN1bHQpOworICAgICAg ICBpZiAocmVzdWx0LnNpemUoKSA9PSAyKSB7CisgICAgICAgICAgICBiaW5kQWRkcmVzcyA9IHJl c3VsdFswXTsKKyAgICAgICAgICAgIGJvb2wgb2sgPSBmYWxzZTsKKyAgICAgICAgICAgIHBvcnQg PSByZXN1bHRbMV0udG9VSW50KCZvayk7CisgICAgICAgICAgICBpZiAoIW9rKSB7CisgICAgICAg ICAgICAgICAgcG9ydCA9IDI5OTk7CisgICAgICAgICAgICAgICAgTE9HX0VSUk9SKCJDb3VsZG4n dCBwYXJzZSB0aGUgcG9ydC4gVXNpbmcgMjk5OSBpbnN0ZWFkLiIpOworICAgICAgICAgICAgfQor ICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIExPR19FUlJPUigiQ291bGRuJ3QgcGFyc2UgJXMs IHdyb25nIGZvcm1hdD8gVXNpbmcgMTI3LjAuMC4xOjI5OTkgaW5zdGVhZC4iLCBzZXJ2ZXJBZGRy ZXNzLnV0ZjgoKS5kYXRhKCkpOworCisgICAgICAgIGlmICghV2ViSW5zcGVjdG9yU2VydmVyOjpz aGFyZWQoKS5saXN0ZW4oYmluZEFkZHJlc3MsIHBvcnQpKQorICAgICAgICAgICAgTE9HX0VSUk9S KCJDb3VsZG4ndCBzdGFydCBsaXN0ZW5pbmcgb246IElQIGFkZHJlc3M9JXMsIHBvcnQ9JWQuIiwg YmluZEFkZHJlc3MudXRmOCgpLmRhdGEoKSwgcG9ydCk7CisKKyAgICAgICAgcmV0dXJuOworICAg IH0KKworICAgIExPRyhJbnNwZWN0b3JTZXJ2ZXIsICJUbyBzdGFydCBpbnNwZWN0b3Igc2VydmVy IHNldCBXRUJLSVRfSU5TUEVDVE9SX1NFUlZFUiB0byAxMjcuMC4wLjE6Mjk5OSBmb3IgZXhhbXBs ZS4iKTsKK30KKyNlbmRpZgorCiBzdGF0aWMgdW5zaWduZWQgcGFnZUlkRnJvbVJlcXVlc3RQYXRo KGNvbnN0IFN0cmluZyYgcGF0aCkKIHsKICAgICBzaXplX3Qgc3RhcnQgPSBwYXRoLnJldmVyc2VG aW5kKCcvJyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvSW5zcGVjdG9y U2VydmVyL1dlYkluc3BlY3RvclNlcnZlci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0lu c3BlY3RvclNlcnZlci9XZWJJbnNwZWN0b3JTZXJ2ZXIuaAppbmRleCAxOTY3NWIyYjlkNDhiMGNk YjNjMTQ2YzlkOWQ5ZWY5NzdkNDMyY2I0Li5lMTc5ZjEyYzZmNWMwNDExOWQwYTVkNzE5Y2NhZjU1 ODUyNDU4NmQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvSW5zcGVjdG9y U2VydmVyL1dlYkluc3BlY3RvclNlcnZlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9JbnNwZWN0b3JTZXJ2ZXIvV2ViSW5zcGVjdG9yU2VydmVyLmgKQEAgLTQyLDYgKzQyLDkgQEAg Y2xhc3MgV2ViSW5zcGVjdG9yU2VydmVyIDogcHVibGljIFdlYlNvY2tldFNlcnZlciwgcHVibGlj IFdlYlNvY2tldFNlcnZlckNsaWVudAogcHVibGljOgogICAgIHR5cGVkZWYgSGFzaE1hcDx1bnNp Z25lZCwgV2ViSW5zcGVjdG9yUHJveHkqPiBDbGllbnRNYXA7CiAgICAgc3RhdGljIFdlYkluc3Bl Y3RvclNlcnZlciYgc2hhcmVkKCk7CisjaWYgUExBVEZPUk0oR1RLKSB8fCBQTEFURk9STShFRkwp CisgICAgc3RhdGljIHZvaWQgaW5pdEluc3BlY3RvclNlcnZlcihTdHJpbmcgc2VydmVyQWRkcmVz cyk7CisjZW5kaWYKIAogICAgIC8vIFBhZ2UgcmVnaXN0cnkgdG8gbWFuYWdlIGtub3duIHBhZ2Vz LgogICAgIGludCByZWdpc3RlclBhZ2UoV2ViSW5zcGVjdG9yUHJveHkqIGNsaWVudCk7CkBAIC02 Myw2ICs2Niw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBwbGF0Zm9ybVJlc291cmNlRm9yUGF0aChj b25zdCBTdHJpbmcmIHBhdGgsIFZlY3RvcjxjaGFyPiYgZGF0YSwgU3RyaW5nJiBjb250ZW50VHlw ZSk7CiAjaWYgUExBVEZPUk0oR1RLKSB8fCBQTEFURk9STShFRkwpCiAgICAgdm9pZCBidWlsZFBh Z2VMaXN0KFZlY3RvcjxjaGFyPiYgZGF0YSwgU3RyaW5nJiBjb250ZW50VHlwZSk7CisgICAgc3Rh dGljIGJvb2wgaW5pdGlhbGl6ZWQ7CiAjZW5kaWYKIAogICAgIHZvaWQgY2xvc2VDb25uZWN0aW9u KFdlYkluc3BlY3RvclByb3h5KiwgV2ViU29ja2V0U2VydmVyQ29ubmVjdGlvbiopOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJDb250ZXh0RWZsLmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViQ29udGV4dEVmbC5jcHAKaW5kZXggZDJkY2Ez ZGZjODRhNGE3MzcxYjIzMWQ5YzFhMWE3ZjFkZWU3ODY1Yy4uZjI1NTc0MmNiOTcxM2QzMzMzMTI1 ZTNiNDA2NWJjZTUwZTg4MmQ2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L2VmbC9XZWJDb250ZXh0RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZs L1dlYkNvbnRleHRFZmwuY3BwCkBAIC0zOSw0NyArMzksNiBAQAogCiBuYW1lc3BhY2UgV2ViS2l0 IHsKIAotc3RhdGljIHZvaWQgaW5pdGlhbGl6ZUluc3BlY3RvclNlcnZlcigpCi17Ci0jaWYgRU5B QkxFKElOU1BFQ1RPUl9TRVJWRVIpCi0gICAgc3RhdGljIGJvb2wgaW5pdGlhbGl6ZWQgPSBmYWxz ZTsKLSAgICBpZiAoaW5pdGlhbGl6ZWQpCi0gICAgICAgIHJldHVybjsKLQotICAgIC8vIEl0IHNo b3VsZCBiZSBzZXQgdG8gdHJ1ZSBhbHdheXMuCi0gICAgLy8gQmVjYXVzZSBpdCBpcyB0byBlbnN1 cmUgaW5pdGlhbGl6ZUluc3BlY3RvclNlcnZlcigpIGlzIGV4ZWN1dGVkIG9ubHkgb25jZSwKLSAg ICAvLyBldmVuIGlmIHRoZSBzZXJ2ZXIgZmFpbHMgdG8gcnVuLgotICAgIGluaXRpYWxpemVkID0g dHJ1ZTsKLQotICAgIFN0cmluZyBzZXJ2ZXJBZGRyZXNzKGdldGVudigiV0VCS0lUX0lOU1BFQ1RP Ul9TRVJWRVIiKSk7Ci0gICAgaWYgKCFzZXJ2ZXJBZGRyZXNzLmlzTnVsbCgpKSB7Ci0gICAgICAg IFN0cmluZyBiaW5kQWRkcmVzcyA9IEFTQ0lJTGl0ZXJhbCgiMTI3LjAuMC4xIik7Ci0gICAgICAg IHVuc2lnbmVkIHNob3J0IHBvcnQgPSAyOTk5OwotCi0gICAgICAgIFZlY3RvcjxTdHJpbmc+IHJl c3VsdDsKLSAgICAgICAgc2VydmVyQWRkcmVzcy5zcGxpdCgnOicsIHJlc3VsdCk7Ci0KLSAgICAg ICAgaWYgKHJlc3VsdC5zaXplKCkgPT0gMikgewotICAgICAgICAgICAgYmluZEFkZHJlc3MgPSBy ZXN1bHRbMF07Ci0gICAgICAgICAgICBib29sIG9rID0gZmFsc2U7Ci0gICAgICAgICAgICBwb3J0 ID0gcmVzdWx0WzFdLnRvVUludCgmb2spOwotICAgICAgICAgICAgaWYgKCFvaykgewotICAgICAg ICAgICAgICAgIHBvcnQgPSAyOTk5OwotICAgICAgICAgICAgICAgIExPR19FUlJPUigiQ291bGRu J3QgcGFyc2UgdGhlIHBvcnQuIFVzaW5nIDI5OTkgaW5zdGVhZC4iKTsKLSAgICAgICAgICAgIH0K LSAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICBMT0dfRVJST1IoIkNvdWxkbid0IHBhcnNlICVz LCB3cm9uZyBmb3JtYXQ/IFVzaW5nIDEyNy4wLjAuMToyOTk5IGluc3RlYWQuIiwgc2VydmVyQWRk cmVzcy51dGY4KCkuZGF0YSgpKTsKLQotICAgICAgICBpZiAoIVdlYkluc3BlY3RvclNlcnZlcjo6 c2hhcmVkKCkubGlzdGVuKGJpbmRBZGRyZXNzLCBwb3J0KSkKLSAgICAgICAgICAgIExPR19FUlJP UigiQ291bGRuJ3Qgc3RhcnQgbGlzdGVuaW5nIG9uOiBJUCBhZGRyZXNzPSVzLCBwb3J0PSVkLiIs IGJpbmRBZGRyZXNzLnV0ZjgoKS5kYXRhKCksIHBvcnQpOwotCi0gICAgICAgIHJldHVybjsKLSAg ICB9Ci0KLSAgICBMT0coSW5zcGVjdG9yU2VydmVyLCAiVG8gc3RhcnQgaW5zcGVjdG9yIHNlcnZl ciBzZXQgV0VCS0lUX0lOU1BFQ1RPUl9TRVJWRVIgdG8gMTI3LjAuMC4xOjI5OTkgZm9yIGV4YW1w bGUuIik7Ci0jZW5kaWYKLX0KLQogU3RyaW5nIFdlYkNvbnRleHQ6OnBsYXRmb3JtRGVmYXVsdEFw cGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKSBjb25zdAogewogICAgIHJldHVybiBTdHJpbmc6OmZy b21VVEY4KGVmcmVldF9jYWNoZV9ob21lX2dldCgpKSArICIvV2ViS2l0RWZsL0FwcGxpY2F0aW9u cyI7CkBAIC04Nyw3ICs0Niw3IEBAIFN0cmluZyBXZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1bHRB cHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkgY29uc3QKIAogdm9pZCBXZWJDb250ZXh0OjpwbGF0 Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmIHBh cmFtZXRlcnMpCiB7Ci0gICAgaW5pdGlhbGl6ZUluc3BlY3RvclNlcnZlcigpOworICAgIFdlYklu c3BlY3RvclNlcnZlcjo6aW5pdEluc3BlY3RvclNlcnZlcihnZXRlbnYoIldFQktJVF9JTlNQRUNU T1JfU0VSVkVSIikpOwogCiAgICAgcGFyYW1ldGVycy51cmxTY2hlbWVzUmVnaXN0ZXJlZCA9IHN1 cHBsZW1lbnQ8V2ViU291cFJlcXVlc3RNYW5hZ2VyUHJveHk+KCktPnJlZ2lzdGVyZWRVUklTY2hl bWVzKCk7CiAgICAgc3VwcGxlbWVudDxXZWJDb29raWVNYW5hZ2VyUHJveHk+KCktPmdldENvb2tp ZVBlcnNpc3RlbnRTdG9yYWdlKHBhcmFtZXRlcnMuY29va2llUGVyc2lzdGVudFN0b3JhZ2VQYXRo LCBwYXJhbWV0ZXJzLmNvb2tpZVBlcnNpc3RlbnRTdG9yYWdlVHlwZSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkNvbnRleHRHdGsuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL2d0ay9XZWJDb250ZXh0R3RrLmNwcAppbmRleCBmYmRkZjhmNjdiYzRj MDA5YmMzZDViMjI0MjJlMWMzYjIzNDlkNTUzLi40MzRiM2RhNjgyNDY4YzA5MzBiMzEwMzU0Y2Jk MjQxNmY2M2RlOTZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dl YkNvbnRleHRHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViQ29u dGV4dEd0ay5jcHAKQEAgLTQ2LDQzICs0Niw2IEBACiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1z dGF0aWMgdm9pZCBpbml0SW5zcGVjdG9yU2VydmVyKCkKLXsKLSNpZiBFTkFCTEUoSU5TUEVDVE9S X1NFUlZFUikKLSAgICBzdGF0aWMgYm9vbCBpbml0aWFsaXplZCA9IGZhbHNlOwotICAgIGlmIChp bml0aWFsaXplZCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgaW5pdGlhbGl6ZWQgPSB0cnVlOwot ICAgIFN0cmluZyBzZXJ2ZXJBZGRyZXNzKGdfZ2V0ZW52KCJXRUJLSVRfSU5TUEVDVE9SX1NFUlZF UiIpKTsKLQotICAgIGlmICghc2VydmVyQWRkcmVzcy5pc051bGwoKSkgewotICAgICAgICBTdHJp bmcgYmluZEFkZHJlc3MgPSAiMTI3LjAuMC4xIjsKLSAgICAgICAgdW5zaWduZWQgc2hvcnQgcG9y dCA9IDI5OTk7Ci0KLSAgICAgICAgVmVjdG9yPFN0cmluZz4gcmVzdWx0OwotICAgICAgICBzZXJ2 ZXJBZGRyZXNzLnNwbGl0KCI6IiwgcmVzdWx0KTsKLQotICAgICAgICBpZiAocmVzdWx0LnNpemUo KSA9PSAyKSB7Ci0gICAgICAgICAgICBiaW5kQWRkcmVzcyA9IHJlc3VsdFswXTsKLSAgICAgICAg ICAgIGJvb2wgb2sgPSBmYWxzZTsKLSAgICAgICAgICAgIHBvcnQgPSByZXN1bHRbMV0udG9JbnQo Jm9rKTsKLSAgICAgICAgICAgIGlmICghb2spIHsKLSAgICAgICAgICAgICAgICBwb3J0ID0gMjk5 OTsKLSAgICAgICAgICAgICAgICBMT0dfRVJST1IoIkNvdWxkbid0IHBhcnNlIHRoZSBwb3J0LiBV c2UgMjk5OSBpbnN0ZWFkLiIpOwotICAgICAgICAgICAgfQotICAgICAgICB9IGVsc2UKLSAgICAg ICAgICAgIExPR19FUlJPUigiQ291bGRuJ3QgcGFyc2UgJXMsIHdyb25nIGZvcm1hdD8gVXNlIDEy Ny4wLjAuMToyOTk5IGluc3RlYWQuIiwgc2VydmVyQWRkcmVzcy51dGY4KCkuZGF0YSgpKTsKLQot ICAgICAgICBpZiAoIVdlYkluc3BlY3RvclNlcnZlcjo6c2hhcmVkKCkubGlzdGVuKGJpbmRBZGRy ZXNzLCBwb3J0KSkKLSAgICAgICAgICAgIExPR19FUlJPUigiQ291bGRuJ3Qgc3RhcnQgbGlzdGVu aW5nIG9uOiBJUCBhZGRyZXNzPSVzLCBwb3J0PSVkLiIsIGJpbmRBZGRyZXNzLnV0ZjgoKS5kYXRh KCksIHBvcnQpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgTE9HKEluc3BlY3RvclNl cnZlciwgIlRvIHN0YXJ0IGluc3BlY3RvciBzZXJ2ZXIgc2V0IFdFQktJVF9JTlNQRUNUT1JfU0VS VkVSIHRvIDEyNy4wLjAuMToyOTk5IGZvciBleGFtcGxlLiIpOwotI2VuZGlmCi19Ci0KIFdURjo6 U3RyaW5nIFdlYkNvbnRleHQ6OnBsYXRmb3JtRGVmYXVsdEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3Rv cnkoKSBjb25zdAogewogICAgIEdVbmlxdWVQdHI8Z2NoYXI+IGNhY2hlRGlyZWN0b3J5KGdfYnVp bGRfZmlsZW5hbWUoZ19nZXRfdXNlcl9jYWNoZV9kaXIoKSwgIndlYmtpdGd0ayIsICJhcHBsaWNh dGlvbnMiLCBudWxscHRyKSk7CkBAIC05MSw3ICs1NCw3IEBAIFdURjo6U3RyaW5nIFdlYkNvbnRl eHQ6OnBsYXRmb3JtRGVmYXVsdEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKSBjb25zdAogCiB2 b2lkIFdlYkNvbnRleHQ6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MoV2ViUHJvY2Vzc0Ny ZWF0aW9uUGFyYW1ldGVycyYgcGFyYW1ldGVycykKIHsKLSAgICBpbml0SW5zcGVjdG9yU2VydmVy KCk7CisgICAgV2ViSW5zcGVjdG9yU2VydmVyOjppbml0SW5zcGVjdG9yU2VydmVyKGdfZ2V0ZW52 KCJXRUJLSVRfSU5TUEVDVE9SX1NFUlZFUiIpKTsKIAogICAgIGlmICghcGFyYW1ldGVycy51cmxT Y2hlbWVzUmVnaXN0ZXJlZEFzTG9jYWwuY29udGFpbnMoInJlc291cmNlIikpIHsKICAgICAgICAg V2ViQ29yZTo6U2NoZW1lUmVnaXN0cnk6OnJlZ2lzdGVyVVJMU2NoZW1lQXNMb2NhbCgicmVzb3Vy Y2UiKTsK