58179 2011-04-08 17:08:32 -0700 WebKit2: Show the substitutions panel on Mac and make sure the menu items titles are updated correctly 2011-04-08 18:40:46 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Mac (Intel) OS X 10.6 RESOLVED FIXED InRadar, PlatformOnly P2 Normal --- 1 jberlin jberlin andersca buildbot jberlin webkit-ews oldest_to_newest 382666 0 jberlin 2011-04-08 17:08:32 -0700 <rdar://problem/9254302> 382671 1 88905 jberlin 2011-04-08 17:21:08 -0700 Created attachment 88905 Patch 382680 2 webkit-ews 2011-04-08 17:38:02 -0700 Attachment 88905 did not build on qt: Build output: http://queues.webkit.org/results/8376192 382687 3 jberlin 2011-04-08 18:17:41 -0700 (In reply to comment #2) > Attachment 88905 [details] did not build on qt: > Build output: http://queues.webkit.org/results/8376192 I guess nested #if do not parse correctly in the messages.in file. I will fix that and commit. Thanks for the review Anders! 382694 4 buildbot 2011-04-08 18:34:03 -0700 Attachment 88905 did not build on win: Build output: http://queues.webkit.org/results/8379196 382702 5 88905 jberlin 2011-04-08 18:40:13 -0700 Comment on attachment 88905 Patch Committed in http://trac.webkit.org/changeset/83369. The build fix in that patch for Qt should also avoid breaking the Win build. 88905 2011-04-08 17:21:08 -0700 2011-04-08 18:40:13 -0700 Patch fixSubstitutionsPanelWK2Mac.patch text/plain 9199 jberlin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzMzYyKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTEtMDQtMDggIEplc3NpZSBC ZXJsaW4gIDxqYmVybGluQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWJLaXQyOiBTaG93IHRoZSBzdWJzdGl0dXRpb25zIHBhbmVs IG9uIE1hYyBhbmQgbWFrZSBzdXJlIHRoZSBtZW51IGl0ZW1zIHRpdGxlcyBhcmUKKyAgICAgICAg dXBkYXRlZCBjb3JyZWN0bHkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD01ODE3OQorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1t OgorICAgICAgICAoLVtXS1ZpZXcgdmFsaWRhdGVVc2VySW50ZXJmYWNlSXRlbTpdKToKKyAgICAg ICAgVGhlIHRpdGxlIG9mIHRoZSBjb250ZXh0IG1lbnUgaXRlbSBzaG91bGQgYmUgb3Bwb3NpdGUg b2Ygd2hldGhlciBvciBub3QgdGhlIHNwZWxsaW5nIHBhbmVsCisgICAgICAgIGlzIHZpc2libGUu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZVByb3h5Ojpjb250ZXh0TWVudUl0ZW1TZWxlY3RlZCk6CisgICAgICAgIElmIHRo ZSAiU2hvdy9IaWRlIiBTdWJzdGl0dXRpb25zIGl0ZW0gaXMgc2VsZWN0ZWQsIGNhbGwgdG9nZ2xl U3Vic3RpdHV0aW9uc1BhbmVsSXNTaG93aW5nLgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJv eHk6OnN1YnN0aXR1dGlvbnNQYW5lbElzU2hvd2luZyk6CisgICAgICAgIEFzayB0aGUgVGV4dENo ZWNrZXIuCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW46CisKKyAgICAgICAgKiBVSVByb2Nlc3Mv VGV4dENoZWNrZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1RleHRDaGVja2VyTWFjLm1t OgorICAgICAgICAoV2ViS2l0OjpUZXh0Q2hlY2tlcjo6c3Vic3RpdHV0aW9uc1BhbmVsSXNTaG93 aW5nKToKKyAgICAgICAgQXMgdGhlIHNoYXJlZCBOU1NwZWxsQ2hlY2tlciBpZiB0aGUgc3Vic3Rp dHV0aW9uc1BhbmVsIGlzIHZpc2libGUuCisgICAgICAgIChXZWJLaXQ6OlRleHRDaGVja2VyOjp0 b2dnbGVTdWJzdGl0dXRpb25zUGFuZWxJc1Nob3dpbmcpOgorICAgICAgICBPcmRlciB0aGUgc3Vi c3RpdHV0aW9uc1BhbmVsIG91dCBvciBmcm9udCAoY29waWVkIGZyb20gV0tWaWV3Lm1tKS4KKwor ICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFjL1dlYkVkaXRvckNsaWVudE1h Yy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViRWRpdG9yQ2xpZW50OjpzdWJzdGl0dXRpb25zUGFu ZWxJc1Nob3dpbmcpOgorICAgICAgICBTZW5kIGEgc3luYyBtZXNzYWdlIHRvIHRoZSBVSSBwcm9j ZXNzIHRvIGZpbmQgb3V0LgorICAgICAgICBJdCBuZWVkcyB0byBiZSBzeW5jIGJlY2F1c2UgdGhl IGVkaXRvciBjb2RlIHJlbGllcyBvbiB0aGUgdmFsdWUgcmV0dXJuZWQuCisKIDIwMTEtMDQtMDgg IEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBEYW4gQmVybnN0ZWluLgpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1RleHRD aGVja2VyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1RleHRDaGVj a2VyLmgJKHJldmlzaW9uIDgzMjkzKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1RleHRD aGVja2VyLmgJKHdvcmtpbmcgY29weSkKQEAgLTUwLDYgKzUwLDkgQEAgcHVibGljOgogCiAgICAg c3RhdGljIGJvb2wgaXNTbWFydEluc2VydERlbGV0ZUVuYWJsZWQoKTsKICAgICBzdGF0aWMgdm9p ZCBzZXRTbWFydEluc2VydERlbGV0ZUVuYWJsZWQoYm9vbCk7CisKKyAgICBzdGF0aWMgYm9vbCBz dWJzdGl0dXRpb25zUGFuZWxJc1Nob3dpbmcoKTsKKyAgICBzdGF0aWMgdm9pZCB0b2dnbGVTdWJz dGl0dXRpb25zUGFuZWxJc1Nob3dpbmcoKTsKICNlbGlmIFBMQVRGT1JNKFdJTikKICAgICBzdGF0 aWMgdm9pZCBjb250aW51b3VzU3BlbGxDaGVja2luZ0VuYWJsZWRTdGF0ZUNoYW5nZWQoYm9vbCk7 CiAgICAgc3RhdGljIHZvaWQgZ3JhbW1hckNoZWNraW5nRW5hYmxlZFN0YXRlQ2hhbmdlZChib29s KTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShyZXZp c2lvbiA4MzI5MykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0yMjYwLDYgKzIyNjAsMTAgQEAgdm9pZCBXZWJQYWdlUHJveHk6 OmNvbnRleHRNZW51SXRlbVNlbGVjdAogICAgICAgICBwcm9jZXNzKCktPnVwZGF0ZVRleHRDaGVj a2VyU3RhdGUoKTsKICAgICAgICAgcmV0dXJuOyAgICAgICAgCiAgICAgfQorICAgIGlmIChpdGVt LmFjdGlvbigpID09IENvbnRleHRNZW51SXRlbVRhZ1Nob3dTdWJzdGl0dXRpb25zKSB7CisgICAg ICAgIFRleHRDaGVja2VyOjp0b2dnbGVTdWJzdGl0dXRpb25zUGFuZWxJc1Nob3dpbmcoKTsKKyAg ICAgICAgcmV0dXJuOworICAgIH0KICNlbmRpZgogICAgIGlmIChpdGVtLmFjdGlvbigpID09IENv bnRleHRNZW51SXRlbVRhZ0Rvd25sb2FkSW1hZ2VUb0Rpc2spIHsKICAgICAgICAgbV9jb250ZXh0 LT5kb3dubG9hZCh0aGlzLCBLVVJMKEtVUkwoKSwgbV9hY3RpdmVDb250ZXh0TWVudVN0YXRlLmFi c29sdXRlSW1hZ2VVUkxTdHJpbmcpKTsKQEAgLTI5MjYsNyArMjkzMCwxNCBAQCB2b2lkIFdlYlBh Z2VQcm94eTo6bGlua0NsaWNrZWQoY29uc3QgU3RyCiAgICAgcHJvY2VzcygpLT5zZW5kKE1lc3Nh Z2VzOjpXZWJQYWdlOjpMaW5rQ2xpY2tlZCh1cmwsIGV2ZW50KSwgbV9wYWdlSUQsIDApOwogfQog Ci0jaWYgUExBVEZPUk0oTUFDKSAmJiAhZGVmaW5lZChCVUlMRElOR19PTl9TTk9XX0xFT1BBUkQp CisjaWYgUExBVEZPUk0oTUFDKQorCit2b2lkIFdlYlBhZ2VQcm94eTo6c3Vic3RpdHV0aW9uc1Bh bmVsSXNTaG93aW5nKGJvb2wmIGlzU2hvd2luZykKK3sKKyAgICBpc1Nob3dpbmcgPSBUZXh0Q2hl Y2tlcjo6c3Vic3RpdHV0aW9uc1BhbmVsSXNTaG93aW5nKCk7Cit9CisKKyNpZiAhZGVmaW5lZChC VUlMRElOR19PTl9TTk9XX0xFT1BBUkQpCiB2b2lkIFdlYlBhZ2VQcm94eTo6c2hvd0NvcnJlY3Rp b25QYW5lbChpbnQzMl90IHBhbmVsVHlwZSwgY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiBib3Vu ZGluZ0JveE9mUmVwbGFjZWRTdHJpbmcsIGNvbnN0IFN0cmluZyYgcmVwbGFjZWRTdHJpbmcsIGNv bnN0IFN0cmluZyYgcmVwbGFjZW1lbnRTdHJpbmcsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBhbHRl cm5hdGl2ZVJlcGxhY2VtZW50U3RyaW5ncykKIHsKICAgICBtX3BhZ2VDbGllbnQtPnNob3dDb3Jy ZWN0aW9uUGFuZWwoKFdlYkNvcmU6OkNvcnJlY3Rpb25QYW5lbEluZm86OlBhbmVsVHlwZSlwYW5l bFR5cGUsIGJvdW5kaW5nQm94T2ZSZXBsYWNlZFN0cmluZywgcmVwbGFjZWRTdHJpbmcsIHJlcGxh Y2VtZW50U3RyaW5nLCBhbHRlcm5hdGl2ZVJlcGxhY2VtZW50U3RyaW5ncyk7CkBAIC0yOTQ2LDkg KzI5NTcsOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVjb3JkQXV0b2NvcnJlY3Rpb25SCiB7CiAg ICAgbV9wYWdlQ2xpZW50LT5yZWNvcmRBdXRvY29ycmVjdGlvblJlc3BvbnNlKChXZWJDb3JlOjpF ZGl0b3JDbGllbnQ6OkF1dG9jb3JyZWN0aW9uUmVzcG9uc2VUeXBlKXJlc3BvbnNlVHlwZSwgcmVw bGFjZWRTdHJpbmcsIHJlcGxhY2VtZW50U3RyaW5nKTsKIH0KLSNlbmRpZgorI2VuZGlmIC8vICFk ZWZpbmVkKEJVSUxESU5HX09OX1NOT1dfTEVPUEFSRCkKIAotI2lmIFBMQVRGT1JNKE1BQykKIHZv aWQgV2ViUGFnZVByb3h5OjpoYW5kbGVDb3JyZWN0aW9uUGFuZWxSZXN1bHQoY29uc3QgU3RyaW5n JiByZXN1bHQpCiB7CiAjaWYgIWRlZmluZWQoQlVJTERJTkdfT05fU05PV19MRU9QQVJEKQpAQCAt Mjk1Niw2ICsyOTY2LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmhhbmRsZUNvcnJlY3Rpb25QYW5l bAogICAgICAgICBwcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkhhbmRsZUNvcnJl Y3Rpb25QYW5lbFJlc3VsdChyZXN1bHQpLCBtX3BhZ2VJRCwgMCk7CiAjZW5kaWYKIH0KLSNlbmRp ZgorI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiA4MzI5MykK KysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5 KQpAQCAtNjgzLDEyICs2ODMsMTUgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgaW5pdGlhbGl6ZVNh bmRib3hFeHRlbnNpb25IYW5kbGUoY29uc3QgV2ViQ29yZTo6S1VSTCYsIFNhbmRib3hFeHRlbnNp b246OkhhbmRsZSYpOwogCi0jaWYgUExBVEZPUk0oTUFDKSAmJiAhZGVmaW5lZChCVUlMRElOR19P Tl9TTk9XX0xFT1BBUkQpCisjaWYgUExBVEZPUk0oTUFDKQorICAgIHZvaWQgc3Vic3RpdHV0aW9u c1BhbmVsSXNTaG93aW5nKGJvb2wmKTsKKyNpZiAhZGVmaW5lZChCVUlMRElOR19PTl9TTk9XX0xF T1BBUkQpCiAgICAgdm9pZCBzaG93Q29ycmVjdGlvblBhbmVsKGludDMyX3QgcGFuZWxUeXBlLCBj b25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIGJvdW5kaW5nQm94T2ZSZXBsYWNlZFN0cmluZywgY29u c3QgU3RyaW5nJiByZXBsYWNlZFN0cmluZywgY29uc3QgU3RyaW5nJiByZXBsYWNlbWVudFN0cmlu ZywgY29uc3QgVmVjdG9yPFN0cmluZz4mIGFsdGVybmF0aXZlUmVwbGFjZW1lbnRTdHJpbmdzKTsK ICAgICB2b2lkIGRpc21pc3NDb3JyZWN0aW9uUGFuZWwoaW50MzJfdCByZWFzb24pOwogICAgIHZv aWQgZGlzbWlzc0NvcnJlY3Rpb25QYW5lbFNvb24oaW50MzJfdCByZWFzb24sIFN0cmluZyYgcmVz dWx0KTsKICAgICB2b2lkIHJlY29yZEF1dG9jb3JyZWN0aW9uUmVzcG9uc2UoaW50MzJfdCByZXNw b25zZVR5cGUsIGNvbnN0IFN0cmluZyYgcmVwbGFjZWRTdHJpbmcsIGNvbnN0IFN0cmluZyYgcmVw bGFjZW1lbnRTdHJpbmcpOwotI2VuZGlmCisjZW5kaWYgLy8gIWRlZmluZWQoQlVJTERJTkdfT05f U05PV19MRU9QQVJEKQorI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykKIAogICAgIHZvaWQgY2xlYXJM b2FkRGVwZW5kZW50Q2FsbGJhY2tzKCk7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgkocmV2aXNpb24gODMyOTMpCisrKyBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCSh3b3JraW5n IGNvcHkpCkBAIC0yMjIsMTEgKzIyMiwxNCBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlUHJveHkgewog ICAgIFNlYXJjaFdpdGhTcG90bGlnaHQoV1RGOjpTdHJpbmcgc3RyaW5nKQogI2VuZGlmCiAKLSNp ZiBQTEFURk9STShNQUMpICYmICFkZWZpbmVkKEJVSUxESU5HX09OX1NOT1dfTEVPUEFSRCkKKyNp ZiBQTEFURk9STShNQUMpCisgICAgU3Vic3RpdHV0aW9uc1BhbmVsSXNTaG93aW5nKCkgLT4gKGJv b2wgaXNTaG93aW5nKQorI2lmICFkZWZpbmVkKEJVSUxESU5HX09OX1NOT1dfTEVPUEFSRCkKICAg ICAjIEF1dG9jb3JyZWN0aW9uIG1lc3NhZ2VzCiAgICAgU2hvd0NvcnJlY3Rpb25QYW5lbChpbnQz Ml90IHBhbmVsVHlwZSwgV2ViQ29yZTo6RmxvYXRSZWN0IGJvdW5kaW5nQm94T2ZSZXBsYWNlZFN0 cmluZywgU3RyaW5nIHJlcGxhY2VkU3RyaW5nLCBTdHJpbmcgcmVwbGFjZW1lbnRTdHJpbmcsIFZl Y3RvcjxTdHJpbmc+IGFsdGVybmF0aXZlUmVwbGFjZW1lbnRTdHJpbmdzKQogICAgIERpc21pc3ND b3JyZWN0aW9uUGFuZWwoaW50MzJfdCByZWFzb24pCiAgICAgRGlzbWlzc0NvcnJlY3Rpb25QYW5l bFNvb24oaW50MzJfdCByZWFzb24pIC0+IChTdHJpbmcgcmVzdWx0KQogICAgIFJlY29yZEF1dG9j b3JyZWN0aW9uUmVzcG9uc2UoaW50MzJfdCByZXNwb25zZVR5cGUsIFN0cmluZyByZXBsYWNlZFN0 cmluZywgU3RyaW5nIHJlcGxhY2VtZW50U3RyaW5nKTsKLSNlbmRpZgorI2VuZGlmIC8vICFkZWZp bmVkKEJVSUxESU5HX09OX1NOT1dfTEVPUEFSRCkKKyNlbmRpZiAvLyBQTEFURk9STShNQUMpCiB9 CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCShyZXZp c2lvbiA4MzI5MykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5t bQkod29ya2luZyBjb3B5KQpAQCAtNjQzLDcgKzY0Myw3IEBAIC0gKEJPT0wpdmFsaWRhdGVVc2Vy SW50ZXJmYWNlSXRlbTooaWQgPE4KIAogICAgIGlmIChhY3Rpb24gPT0gQHNlbGVjdG9yKG9yZGVy RnJvbnRTdWJzdGl0dXRpb25zUGFuZWw6KSkgewogICAgICAgICBpZiAoTlNNZW51SXRlbSAqbWVu dUl0ZW0gPSA6Om1lbnVJdGVtKGl0ZW0pKQotICAgICAgICAgICAgW21lbnVJdGVtIHNldFRpdGxl OmNvbnRleHRNZW51SXRlbVRhZ1Nob3dTdWJzdGl0dXRpb25zKFtbW05TU3BlbGxDaGVja2VyIHNo YXJlZFNwZWxsQ2hlY2tlcl0gc3Vic3RpdHV0aW9uc1BhbmVsXSBpc1Zpc2libGVdKV07CisgICAg ICAgICAgICBbbWVudUl0ZW0gc2V0VGl0bGU6Y29udGV4dE1lbnVJdGVtVGFnU2hvd1N1YnN0aXR1 dGlvbnMoIVtbW05TU3BlbGxDaGVja2VyIHNoYXJlZFNwZWxsQ2hlY2tlcl0gc3Vic3RpdHV0aW9u c1BhbmVsXSBpc1Zpc2libGVdKV07CiAgICAgICAgIHJldHVybiBfZGF0YS0+X3BhZ2UtPnNlbGVj dGlvblN0YXRlKCkuaXNDb250ZW50RWRpdGFibGU7CiAgICAgfQogCkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvbWFjL1RleHRDaGVja2VyTWFjLm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVGV4dENoZWNrZXJNYWMubW0JKHJldmlzaW9uIDgzMjkz KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9UZXh0Q2hlY2tlck1hYy5tbQkod29y a2luZyBjb3B5KQpAQCAtMTk2LDYgKzE5NiwyMSBAQCB2b2lkIFRleHRDaGVja2VyOjpzZXRTbWFy dEluc2VydERlbGV0ZUVuCiAgICAgW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0 c10gc2V0Qm9vbDpmbGFnIGZvcktleTpXZWJTbWFydEluc2VydERlbGV0ZUVuYWJsZWRdOwogfQog Citib29sIFRleHRDaGVja2VyOjpzdWJzdGl0dXRpb25zUGFuZWxJc1Nob3dpbmcoKQoreworICAg IHJldHVybiBbW1tOU1NwZWxsQ2hlY2tlciBzaGFyZWRTcGVsbENoZWNrZXJdIHN1YnN0aXR1dGlv bnNQYW5lbF0gaXNWaXNpYmxlXTsKK30KKwordm9pZCBUZXh0Q2hlY2tlcjo6dG9nZ2xlU3Vic3Rp dHV0aW9uc1BhbmVsSXNTaG93aW5nKCkKK3sKKyAgICBOU1BhbmVsICpzdWJzdGl0dXRpb25zUGFu ZWwgPSBbW05TU3BlbGxDaGVja2VyIHNoYXJlZFNwZWxsQ2hlY2tlcl0gc3Vic3RpdHV0aW9uc1Bh bmVsXTsKKyAgICBpZiAoW3N1YnN0aXR1dGlvbnNQYW5lbCBpc1Zpc2libGVdKSB7CisgICAgICAg IFtzdWJzdGl0dXRpb25zUGFuZWwgb3JkZXJPdXQ6bmlsXTsKKyAgICAgICAgcmV0dXJuOworICAg IH0KKyAgICBbc3Vic3RpdHV0aW9uc1BhbmVsIG9yZGVyRnJvbnQ6bmlsXTsKK30KKwogaW50NjRf dCBUZXh0Q2hlY2tlcjo6dW5pcXVlU3BlbGxEb2N1bWVudFRhZygpCiB7CiAgICAgcmV0dXJuIFtO U1NwZWxsQ2hlY2tlciB1bmlxdWVTcGVsbERvY3VtZW50VGFnXTsKSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFjL1dlYkVkaXRvckNsaWVudE1hYy5tbQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L21h Yy9XZWJFZGl0b3JDbGllbnRNYWMubW0JKHJldmlzaW9uIDgzMjkzKQorKysgU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMvV2ViRWRpdG9yQ2xpZW50TWFjLm1tCSh3 b3JraW5nIGNvcHkpCkBAIC0xNzYsOCArMTc2LDkgQEAgdm9pZCBXZWJFZGl0b3JDbGllbnQ6OnNo b3dTdWJzdGl0dXRpb25zUAogCiBib29sIFdlYkVkaXRvckNsaWVudDo6c3Vic3RpdHV0aW9uc1Bh bmVsSXNTaG93aW5nKCkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBmYWxz ZTsKKyAgICBib29sIGlzU2hvd2luZzsKKyAgICBtX3BhZ2UtPnNlbmRTeW5jKE1lc3NhZ2VzOjpX ZWJQYWdlUHJveHk6OlN1YnN0aXR1dGlvbnNQYW5lbElzU2hvd2luZygpLCBNZXNzYWdlczo6V2Vi UGFnZVByb3h5OjpTdWJzdGl0dXRpb25zUGFuZWxJc1Nob3dpbmc6OlJlcGx5KGlzU2hvd2luZykp OworICAgIHJldHVybiBpc1Nob3dpbmc7CiB9CiAKIHZvaWQgV2ViRWRpdG9yQ2xpZW50Ojp0b2dn bGVTbWFydEluc2VydERlbGV0ZSgpCg==