92961 2012-08-02 02:11:25 -0700 [EFL] Add support for localization to the Web Inspector 2012-08-28 22:54:32 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Other Linux RESOLVED FIXED P2 Normal --- 0 seokju.kwon webkit-unassigned eric gyuyoung.kim lucas.de.marchi pfeldman rakuco webkit.review.bot oldest_to_newest 685124 0 seokju.kwon 2012-08-02 02:11:25 -0700 Implement InspectorFrontendClientEfl::localizedStringsURL() to return the URL of the localizedStrings.js 685175 1 156025 seokju.kwon 2012-08-02 03:31:06 -0700 Created attachment 156025 Patch 705988 2 156025 gyuyoung.kim 2012-08-27 18:59:57 -0700 Comment on attachment 156025 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=156025&action=review > Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp:96 > + String inspectorUri = inspectorFilesPath() + String("/inspector.html"); It is enough to use "/inspector.html" > Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp:143 > + String inspectorFilesPath = String("file://") + WEB_INSPECTOR_INSTALL_DIR; ditto. > Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp:145 > + inspectorFilesPath = String("file://") + WEB_INSPECTOR_DIR; ditto. > Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp:171 > + return m_inspectorClient->inspectorFilesPath() + String("/localizedStrings.js"); ditto. 706055 3 seokju.kwon 2012-08-27 21:49:22 -0700 (In reply to comment #2) > (From update of attachment 156025 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=156025&action=review > > > Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp:96 > > + String inspectorUri = inspectorFilesPath() + String("/inspector.html"); > > It is enough to use "/inspector.html" > > > Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp:143 > > + String inspectorFilesPath = String("file://") + WEB_INSPECTOR_INSTALL_DIR; > > ditto. > > > Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp:145 > > + inspectorFilesPath = String("file://") + WEB_INSPECTOR_DIR; > > ditto. > > > Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp:171 > > + return m_inspectorClient->inspectorFilesPath() + String("/localizedStrings.js"); > > ditto. Ok. I will remove String(). 706056 4 160896 seokju.kwon 2012-08-27 21:51:07 -0700 Created attachment 160896 Patch 706062 5 160896 gyuyoung.kim 2012-08-27 22:16:46 -0700 Comment on attachment 160896 Patch Attachment 160896 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/13652080 706075 6 160896 gyuyoung.kim 2012-08-27 22:41:25 -0700 Comment on attachment 160896 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=160896&action=review > Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp:143 > + String inspectorFilesPath = "file://" + WEB_INSPECTOR_INSTALL_DIR; In this case, we can't use above implicit casting. Please use String(WEB_XXX) instead of makeString(). makeString() was deprecated. > Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp:145 > + inspectorFilesPath = "file://" + WEB_INSPECTOR_DIR; ditto. 706124 7 160916 seokju.kwon 2012-08-27 23:55:46 -0700 Created attachment 160916 Patch 707105 8 160916 gyuyoung.kim 2012-08-28 22:50:13 -0700 Comment on attachment 160916 Patch LGTM 707108 9 160916 webkit.review.bot 2012-08-28 22:54:28 -0700 Comment on attachment 160916 Patch Clearing flags on attachment: 160916 Committed r126960: <http://trac.webkit.org/changeset/126960> 707109 10 webkit.review.bot 2012-08-28 22:54:32 -0700 All reviewed patches have been landed. Closing bug. 156025 2012-08-02 03:31:06 -0700 2012-08-27 21:51:02 -0700 Patch bug-92961-20120802193048.patch text/plain 2792 seokju.kwon U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NDMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Vm bC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKaW5kZXggZGE5YWVjMDcz NWUwMWZlYmQyYjJiNzY3YmVmMzZhNzE1YzMwMDkxMS4uNzI4NzlkOGExMDFhODQwM2FhNTg3Y2E3 ZmVkOGQzYTU1M2MwZDA4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEy LTA4LTAyICBTZW9ranUgS3dvbiAgPHNlb2tqdS5rd29uQHNhbXN1bmcuY29tPgorCisgICAgICAg IFtFRkxdIEFkZCBzdXBwb3J0IGZvciBsb2NhbGl6YXRpb24gdG8gdGhlIFdlYiBJbnNwZWN0b3IK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyOTYxCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50 IEluc3BlY3RvckZyb250ZW5kQ2xpZW50RWZsOjpsb2NhbGl6ZWRTdHJpbmdzVVJMKCkKKyAgICAg ICAgdG8gcmV0dXJuIHRoZSBVUkwgb2YgdGhlIGxvY2FsaXplZFN0cmluZ3MuanMuCisKKyAgICAg ICAgKiBXZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRFZmwuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yQ2xpZW50RWZsOjpvcGVuSW5zcGVjdG9yRnJvbnRlbmQpOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yQ2xpZW50RWZsOjppbnNwZWN0b3JGaWxlc1BhdGgpOgorICAg ICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRnJvbnRlbmRDbGllbnRFZmw6OmxvY2FsaXplZFN0cmlu Z3NVUkwpOgorCiAyMDEyLTA4LTAxICBSeXVhbiBDaG9pICA8cnl1YW4uY2hvaUBzYW1zdW5nLmNv bT4KIAogICAgICAgICBbRUZMXVtSZWdyZXNzaW9uXSBCdWlsZCBicmVhayB3aXRoIE5FVFNDQVBF X1BMVUdJTl9BUEkgYWZ0ZXIgcjEyMzYwNApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwv V2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50RWZsLmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZs L1dlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVudEVmbC5jcHAKaW5kZXggYjgyMDM5NzU2NjRk M2NkYTRlMWViNGI1OWMwOGU5NjQ0YjFhNzVjNS4uZGNiNDVjOGYxMGExOGU4ZTk3M2NiMzZiOTYz NDc4ZmVjOGRhYTFkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBv cnQvSW5zcGVjdG9yQ2xpZW50RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3Jl U3VwcG9ydC9JbnNwZWN0b3JDbGllbnRFZmwuY3BwCkBAIC05Myw3ICs5Myw3IEBAIEluc3BlY3Rv ckZyb250ZW5kQ2hhbm5lbCogSW5zcGVjdG9yQ2xpZW50RWZsOjpvcGVuSW5zcGVjdG9yRnJvbnRl bmQoSW5zcGVjdG9yQ29uCiAKICAgICBtX2luc3BlY3RvclZpZXcgPSBpbnNwZWN0b3JWaWV3Owog Ci0gICAgU3RyaW5nIGluc3BlY3RvclVyaSA9IGluc3BlY3RvckZpbGVzUGF0aCgpOworICAgIFN0 cmluZyBpbnNwZWN0b3JVcmkgPSBpbnNwZWN0b3JGaWxlc1BhdGgoKSArIFN0cmluZygiL2luc3Bl Y3Rvci5odG1sIik7CiAgICAgZXdrX3ZpZXdfdXJpX3NldChtX2luc3BlY3RvclZpZXcsIGluc3Bl Y3RvclVyaS51dGY4KCkuZGF0YSgpKTsKIAogICAgIE93blB0cjxJbnNwZWN0b3JGcm9udGVuZENs aWVudEVmbD4gZnJvbnRlbmRDbGllbnQgPSBhZG9wdFB0cihuZXcgSW5zcGVjdG9yRnJvbnRlbmRD bGllbnRFZmwobV9pbnNwZWN0ZWRWaWV3LCBtX2luc3BlY3RvclZpZXcsIHRoaXMpKTsKQEAgLTE0 MCw5ICsxNDAsOSBAQCB2b2lkIEluc3BlY3RvckNsaWVudEVmbDo6cmVsZWFzZUZyb250ZW5kUGFn ZSgpCiAKIFN0cmluZyBJbnNwZWN0b3JDbGllbnRFZmw6Omluc3BlY3RvckZpbGVzUGF0aCgpCiB7 Ci0gICAgU3RyaW5nIGluc3BlY3RvckZpbGVzUGF0aCA9IG1ha2VTdHJpbmcoImZpbGU6Ly8iLCBX RUJfSU5TUEVDVE9SX0lOU1RBTExfRElSLCAiL2luc3BlY3Rvci5odG1sIik7Ci0gICAgaWYgKGFj Y2VzcyhpbnNwZWN0b3JGaWxlc1BhdGgudXRmOCgpLmRhdGEoKSwgUl9PSykpIC8vIE9uIHN1Y2Nl c3MsIHplcm8gaXMgcmV0dXJuZWQKLSAgICAgICAgaW5zcGVjdG9yRmlsZXNQYXRoID0gbWFrZVN0 cmluZygiZmlsZTovLyIsIFdFQl9JTlNQRUNUT1JfRElSLCAiL2luc3BlY3Rvci5odG1sIik7Cisg ICAgU3RyaW5nIGluc3BlY3RvckZpbGVzUGF0aCA9IFN0cmluZygiZmlsZTovLyIpICsgV0VCX0lO U1BFQ1RPUl9JTlNUQUxMX0RJUjsKKyAgICBpZiAoYWNjZXNzKGluc3BlY3RvckZpbGVzUGF0aC51 dGY4KCkuZGF0YSgpLCBSX09LKSkKKyAgICAgICAgaW5zcGVjdG9yRmlsZXNQYXRoID0gU3RyaW5n KCJmaWxlOi8vIikgKyBXRUJfSU5TUEVDVE9SX0RJUjsKIAogICAgIHJldHVybiBpbnNwZWN0b3JG aWxlc1BhdGg7CiB9CkBAIC0xNjgsOCArMTY4LDcgQEAgSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRF Zmw6On5JbnNwZWN0b3JGcm9udGVuZENsaWVudEVmbCgpCiAKIFN0cmluZyBJbnNwZWN0b3JGcm9u dGVuZENsaWVudEVmbDo6bG9jYWxpemVkU3RyaW5nc1VSTCgpCiB7Ci0gICAgbm90SW1wbGVtZW50 ZWQoKTsKLSAgICByZXR1cm4gU3RyaW5nKCk7CisgICAgcmV0dXJuIG1faW5zcGVjdG9yQ2xpZW50 LT5pbnNwZWN0b3JGaWxlc1BhdGgoKSArIFN0cmluZygiL2xvY2FsaXplZFN0cmluZ3MuanMiKTsK IH0KIAogU3RyaW5nIEluc3BlY3RvckZyb250ZW5kQ2xpZW50RWZsOjpoaWRkZW5QYW5lbHMoKQo= 160896 2012-08-27 21:51:07 -0700 2012-08-27 23:55:40 -0700 Patch bug-92961-20120828135110.patch text/plain 2765 seokju.kwon U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2ODMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Vm bC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKaW5kZXggNGE4YmJiODBk MGI2M2U4MTMyODBmZjQzOTM0ZDUzNWNmNjU1NTFjMC4uOTMxMjY1NzQyNmU0MDNhOTVlODQ4OTM5 NTllNjA0ZjM1NGNiODg3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEy LTA4LTI3ICBTZW9ranUgS3dvbiAgPHNlb2tqdS5rd29uQHNhbXN1bmcuY29tPgorCisgICAgICAg IFtFRkxdIEFkZCBzdXBwb3J0IGZvciBsb2NhbGl6YXRpb24gdG8gdGhlIFdlYiBJbnNwZWN0b3IK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyOTYxCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50 IEluc3BlY3RvckZyb250ZW5kQ2xpZW50RWZsOjpsb2NhbGl6ZWRTdHJpbmdzVVJMKCkKKyAgICAg ICAgdG8gcmV0dXJuIHRoZSBVUkwgb2YgdGhlIGxvY2FsaXplZFN0cmluZ3MuanMuCisKKyAgICAg ICAgKiBXZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRFZmwuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yQ2xpZW50RWZsOjpvcGVuSW5zcGVjdG9yRnJvbnRlbmQpOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yQ2xpZW50RWZsOjppbnNwZWN0b3JGaWxlc1BhdGgpOgorICAg ICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRnJvbnRlbmRDbGllbnRFZmw6OmxvY2FsaXplZFN0cmlu Z3NVUkwpOgorCiAyMDEyLTA4LTI3ICBNaWtoYWlsIFBvemRueWFrb3YgIDxtaWtoYWlsLnBvemRu eWFrb3ZAaW50ZWwuY29tPgogCiAgICAgICAgIFJlbmFtZSBSZWdpc3RlclByb3RvY29sSGFuZGxl ciBBUEkgdG8gTmF2aWdhdG9yQ29udGVudFV0aWxzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2VmbC9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRFZmwuY3BwIGIvU291cmNlL1dlYktp dC9lZmwvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50RWZsLmNwcAppbmRleCBiODIwMzk3 NTY2NGQzY2RhNGUxZWI0YjU5YzA4ZTk2NDRiMWE3NWM1Li42OTFlM2QyNjA5NjNhNDJkNzRhOGE4 MjIyYmJhZWU0NzQwNzQwZDIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3Jl U3VwcG9ydC9JbnNwZWN0b3JDbGllbnRFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL1dl YkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVudEVmbC5jcHAKQEAgLTkzLDcgKzkzLDcgQEAgSW5z cGVjdG9yRnJvbnRlbmRDaGFubmVsKiBJbnNwZWN0b3JDbGllbnRFZmw6Om9wZW5JbnNwZWN0b3JG cm9udGVuZChJbnNwZWN0b3JDb24KIAogICAgIG1faW5zcGVjdG9yVmlldyA9IGluc3BlY3RvclZp ZXc7CiAKLSAgICBTdHJpbmcgaW5zcGVjdG9yVXJpID0gaW5zcGVjdG9yRmlsZXNQYXRoKCk7Cisg ICAgU3RyaW5nIGluc3BlY3RvclVyaSA9IGluc3BlY3RvckZpbGVzUGF0aCgpICsgIi9pbnNwZWN0 b3IuaHRtbCI7CiAgICAgZXdrX3ZpZXdfdXJpX3NldChtX2luc3BlY3RvclZpZXcsIGluc3BlY3Rv clVyaS51dGY4KCkuZGF0YSgpKTsKIAogICAgIE93blB0cjxJbnNwZWN0b3JGcm9udGVuZENsaWVu dEVmbD4gZnJvbnRlbmRDbGllbnQgPSBhZG9wdFB0cihuZXcgSW5zcGVjdG9yRnJvbnRlbmRDbGll bnRFZmwobV9pbnNwZWN0ZWRWaWV3LCBtX2luc3BlY3RvclZpZXcsIHRoaXMpKTsKQEAgLTE0MCw5 ICsxNDAsOSBAQCB2b2lkIEluc3BlY3RvckNsaWVudEVmbDo6cmVsZWFzZUZyb250ZW5kUGFnZSgp CiAKIFN0cmluZyBJbnNwZWN0b3JDbGllbnRFZmw6Omluc3BlY3RvckZpbGVzUGF0aCgpCiB7Ci0g ICAgU3RyaW5nIGluc3BlY3RvckZpbGVzUGF0aCA9IG1ha2VTdHJpbmcoImZpbGU6Ly8iLCBXRUJf SU5TUEVDVE9SX0lOU1RBTExfRElSLCAiL2luc3BlY3Rvci5odG1sIik7Ci0gICAgaWYgKGFjY2Vz cyhpbnNwZWN0b3JGaWxlc1BhdGgudXRmOCgpLmRhdGEoKSwgUl9PSykpIC8vIE9uIHN1Y2Nlc3Ms IHplcm8gaXMgcmV0dXJuZWQKLSAgICAgICAgaW5zcGVjdG9yRmlsZXNQYXRoID0gbWFrZVN0cmlu ZygiZmlsZTovLyIsIFdFQl9JTlNQRUNUT1JfRElSLCAiL2luc3BlY3Rvci5odG1sIik7CisgICAg U3RyaW5nIGluc3BlY3RvckZpbGVzUGF0aCA9ICJmaWxlOi8vIiArIFdFQl9JTlNQRUNUT1JfSU5T VEFMTF9ESVI7CisgICAgaWYgKGFjY2VzcyhpbnNwZWN0b3JGaWxlc1BhdGgudXRmOCgpLmRhdGEo KSwgUl9PSykpCisgICAgICAgIGluc3BlY3RvckZpbGVzUGF0aCA9ICJmaWxlOi8vIiArIFdFQl9J TlNQRUNUT1JfRElSOwogCiAgICAgcmV0dXJuIGluc3BlY3RvckZpbGVzUGF0aDsKIH0KQEAgLTE2 OCw4ICsxNjgsNyBAQCBJbnNwZWN0b3JGcm9udGVuZENsaWVudEVmbDo6fkluc3BlY3RvckZyb250 ZW5kQ2xpZW50RWZsKCkKIAogU3RyaW5nIEluc3BlY3RvckZyb250ZW5kQ2xpZW50RWZsOjpsb2Nh bGl6ZWRTdHJpbmdzVVJMKCkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBT dHJpbmcoKTsKKyAgICByZXR1cm4gbV9pbnNwZWN0b3JDbGllbnQtPmluc3BlY3RvckZpbGVzUGF0 aCgpICsgIi9sb2NhbGl6ZWRTdHJpbmdzLmpzIjsKIH0KIAogU3RyaW5nIEluc3BlY3RvckZyb250 ZW5kQ2xpZW50RWZsOjpoaWRkZW5QYW5lbHMoKQo= 160916 2012-08-27 23:55:46 -0700 2012-08-28 22:54:28 -0700 Patch bug-92961-20120828155549.patch text/plain 2781 seokju.kwon U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2ODMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Vm bC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKaW5kZXggNGE4YmJiODBk MGI2M2U4MTMyODBmZjQzOTM0ZDUzNWNmNjU1NTFjMC4uOTMxMjY1NzQyNmU0MDNhOTVlODQ4OTM5 NTllNjA0ZjM1NGNiODg3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEy LTA4LTI3ICBTZW9ranUgS3dvbiAgPHNlb2tqdS5rd29uQHNhbXN1bmcuY29tPgorCisgICAgICAg IFtFRkxdIEFkZCBzdXBwb3J0IGZvciBsb2NhbGl6YXRpb24gdG8gdGhlIFdlYiBJbnNwZWN0b3IK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyOTYxCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50 IEluc3BlY3RvckZyb250ZW5kQ2xpZW50RWZsOjpsb2NhbGl6ZWRTdHJpbmdzVVJMKCkKKyAgICAg ICAgdG8gcmV0dXJuIHRoZSBVUkwgb2YgdGhlIGxvY2FsaXplZFN0cmluZ3MuanMuCisKKyAgICAg ICAgKiBXZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRFZmwuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yQ2xpZW50RWZsOjpvcGVuSW5zcGVjdG9yRnJvbnRlbmQpOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yQ2xpZW50RWZsOjppbnNwZWN0b3JGaWxlc1BhdGgpOgorICAg ICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRnJvbnRlbmRDbGllbnRFZmw6OmxvY2FsaXplZFN0cmlu Z3NVUkwpOgorCiAyMDEyLTA4LTI3ICBNaWtoYWlsIFBvemRueWFrb3YgIDxtaWtoYWlsLnBvemRu eWFrb3ZAaW50ZWwuY29tPgogCiAgICAgICAgIFJlbmFtZSBSZWdpc3RlclByb3RvY29sSGFuZGxl ciBBUEkgdG8gTmF2aWdhdG9yQ29udGVudFV0aWxzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2VmbC9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRFZmwuY3BwIGIvU291cmNlL1dlYktp dC9lZmwvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50RWZsLmNwcAppbmRleCBiODIwMzk3 NTY2NGQzY2RhNGUxZWI0YjU5YzA4ZTk2NDRiMWE3NWM1Li41NGIzODczNzU2MDlmNzgzMTU3NjJi NzFjZjI1N2IzOGUxYjhlNDY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3Jl U3VwcG9ydC9JbnNwZWN0b3JDbGllbnRFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL1dl YkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVudEVmbC5jcHAKQEAgLTkzLDcgKzkzLDcgQEAgSW5z cGVjdG9yRnJvbnRlbmRDaGFubmVsKiBJbnNwZWN0b3JDbGllbnRFZmw6Om9wZW5JbnNwZWN0b3JG cm9udGVuZChJbnNwZWN0b3JDb24KIAogICAgIG1faW5zcGVjdG9yVmlldyA9IGluc3BlY3RvclZp ZXc7CiAKLSAgICBTdHJpbmcgaW5zcGVjdG9yVXJpID0gaW5zcGVjdG9yRmlsZXNQYXRoKCk7Cisg ICAgU3RyaW5nIGluc3BlY3RvclVyaSA9IGluc3BlY3RvckZpbGVzUGF0aCgpICsgIi9pbnNwZWN0 b3IuaHRtbCI7CiAgICAgZXdrX3ZpZXdfdXJpX3NldChtX2luc3BlY3RvclZpZXcsIGluc3BlY3Rv clVyaS51dGY4KCkuZGF0YSgpKTsKIAogICAgIE93blB0cjxJbnNwZWN0b3JGcm9udGVuZENsaWVu dEVmbD4gZnJvbnRlbmRDbGllbnQgPSBhZG9wdFB0cihuZXcgSW5zcGVjdG9yRnJvbnRlbmRDbGll bnRFZmwobV9pbnNwZWN0ZWRWaWV3LCBtX2luc3BlY3RvclZpZXcsIHRoaXMpKTsKQEAgLTE0MCw5 ICsxNDAsOSBAQCB2b2lkIEluc3BlY3RvckNsaWVudEVmbDo6cmVsZWFzZUZyb250ZW5kUGFnZSgp CiAKIFN0cmluZyBJbnNwZWN0b3JDbGllbnRFZmw6Omluc3BlY3RvckZpbGVzUGF0aCgpCiB7Ci0g ICAgU3RyaW5nIGluc3BlY3RvckZpbGVzUGF0aCA9IG1ha2VTdHJpbmcoImZpbGU6Ly8iLCBXRUJf SU5TUEVDVE9SX0lOU1RBTExfRElSLCAiL2luc3BlY3Rvci5odG1sIik7Ci0gICAgaWYgKGFjY2Vz cyhpbnNwZWN0b3JGaWxlc1BhdGgudXRmOCgpLmRhdGEoKSwgUl9PSykpIC8vIE9uIHN1Y2Nlc3Ms IHplcm8gaXMgcmV0dXJuZWQKLSAgICAgICAgaW5zcGVjdG9yRmlsZXNQYXRoID0gbWFrZVN0cmlu ZygiZmlsZTovLyIsIFdFQl9JTlNQRUNUT1JfRElSLCAiL2luc3BlY3Rvci5odG1sIik7CisgICAg U3RyaW5nIGluc3BlY3RvckZpbGVzUGF0aCA9ICJmaWxlOi8vIiArIFN0cmluZyhXRUJfSU5TUEVD VE9SX0lOU1RBTExfRElSKTsKKyAgICBpZiAoYWNjZXNzKGluc3BlY3RvckZpbGVzUGF0aC51dGY4 KCkuZGF0YSgpLCBSX09LKSkKKyAgICAgICAgaW5zcGVjdG9yRmlsZXNQYXRoID0gImZpbGU6Ly8i ICsgU3RyaW5nKFdFQl9JTlNQRUNUT1JfRElSKTsKIAogICAgIHJldHVybiBpbnNwZWN0b3JGaWxl c1BhdGg7CiB9CkBAIC0xNjgsOCArMTY4LDcgQEAgSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRFZmw6 On5JbnNwZWN0b3JGcm9udGVuZENsaWVudEVmbCgpCiAKIFN0cmluZyBJbnNwZWN0b3JGcm9udGVu ZENsaWVudEVmbDo6bG9jYWxpemVkU3RyaW5nc1VSTCgpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQo KTsKLSAgICByZXR1cm4gU3RyaW5nKCk7CisgICAgcmV0dXJuIG1faW5zcGVjdG9yQ2xpZW50LT5p bnNwZWN0b3JGaWxlc1BhdGgoKSArICIvbG9jYWxpemVkU3RyaW5ncy5qcyI7CiB9CiAKIFN0cmlu ZyBJbnNwZWN0b3JGcm9udGVuZENsaWVudEVmbDo6aGlkZGVuUGFuZWxzKCkK