41231 2010-06-25 15:31:10 -0700 [Chromium] Export more webkit api for chromium multi dll build 2010-06-29 10:40:46 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 1 victorw victorw commit-queue fishd oldest_to_newest 243227 0 victorw 2010-06-25 15:31:10 -0700 For chromium multi dll build, need to export more webkit apis that are referenced by other chromium components. 243937 1 59950 victorw 2010-06-28 15:09:12 -0700 Created attachment 59950 Proposed Patch 244370 2 59950 commit-queue 2010-06-29 10:40:41 -0700 Comment on attachment 59950 Proposed Patch Clearing flags on attachment: 59950 Committed r62133: <http://trac.webkit.org/changeset/62133> 244371 3 commit-queue 2010-06-29 10:40:46 -0700 All reviewed patches have been landed. Closing bug. 59950 2010-06-28 15:09:12 -0700 2010-06-29 10:40:40 -0700 Proposed Patch webkit_api.patch text/plain 16917 victorw SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjIwMzcpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTAtMDYtMjggIFZpY3Rv ciBXYW5nICA8dmljdG9yd0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVtXTogVXBkYXRlIHdlYmtpdCBmb3IgY2hy b21pdW0gbXVsdGkgZGxsIGJ1aWxkLgorCisgICAgICAgIDEuIEV4cG9ydCBtb3JlIHdlYmtpdCBB UElzIGZvciBjaHJvbWl1bSBtdWx0aSBkbGwgYnVpbGQuCisgICAgICAgIDIuIFVwZGF0ZSBEdW1w UmVuZGVyVHJlZSBzb3VyY2VzIHNvIGl0IGNhbiBidWlsZCB3aXRoIHdlYmtpdC5kbGwKKyAgICAg ICAgMy4gVGVtcCBkaXNhYmxlIHdlYmtpdCB1bml0IHRlc3RzIGZvciBjaHJvbWl1bSBtdWx0aSBk bGwgYnVpbGQuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQxMjMxCisKKyAgICAgICAgKiBXZWJLaXQuZ3lwOgorICAgICAgICAqIHB1YmxpYy9XZWJB Y2Nlc3NpYmlsaXR5Q2FjaGUuaDoKKyAgICAgICAgKiBwdWJsaWMvV2ViQWNjZXNzaWJpbGl0eU9i amVjdC5oOgorICAgICAgICAqIHB1YmxpYy9XZWJFdmVudExpc3RlbmVyLmg6CisgICAgICAgICog cHVibGljL1dlYkdlb2xvY2F0aW9uU2VydmljZU1vY2suaDoKKyAgICAgICAgKiBwdWJsaWMvV2Vi R3JhcGhpY3NDb250ZXh0M0QuaDoKKyAgICAgICAgKiBwdWJsaWMvV2ViSURCRGF0YWJhc2VFcnJv ci5oOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJEYXRhYmFzZUVycm9yOjpXZWJJREJEYXRhYmFz ZUVycm9yKToKKyAgICAgICAgKFdlYktpdDo6V2ViSURCRGF0YWJhc2VFcnJvcjo6b3BlcmF0b3I9 KToKKyAgICAgICAgKiBwdWJsaWMvV2ViTm90aWZpY2F0aW9uLmg6CisgICAgICAgICogcHVibGlj L1dlYlBhc3N3b3JkRm9ybURhdGEuaDoKKyAgICAgICAgKiBwdWJsaWMvV2ViU2VhcmNoYWJsZUZv cm1EYXRhLmg6CisgICAgICAgICogcHVibGljL1dlYlN0b3JhZ2VFdmVudERpc3BhdGNoZXIuaDoK KyAgICAgICAgKiBwdWJsaWMvV2ViU3RyaW5nLmg6CisgICAgICAgIChXZWJLaXQ6OldlYlN0cmlu Zzo6V2ViU3RyaW5nKToKKyAgICAgICAgKFdlYktpdDo6V2ViU3RyaW5nOjpvcGVyYXRvcj0pOgor CiAyMDEwLTA2LTI3ICBKb2huIEFiZC1FbC1NYWxlayAgPGphbUBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gRmlzaGVyLgpJbmRleDogV2ViS2l0L2Nocm9taXVtL1dl YktpdC5neXAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAJKHJldmlz aW9uIDYyMDM2KQorKysgV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAJKHdvcmtpbmcgY29weSkK QEAgLTU1MSwzOSArNTUxLDQ2IEBACiAgICAgICAgIH0sCiAgICAgICAgIHsKICAgICAgICAgICAg ICd0YXJnZXRfbmFtZSc6ICd3ZWJraXRfdW5pdF90ZXN0cycsCi0gICAgICAgICAgICAndHlwZSc6 ICdleGVjdXRhYmxlJywKLSAgICAgICAgICAgICdtc3ZzX2d1aWQnOiAnN0NFRkU4MDAtODQwMy00 MThBLUFENkEtMkQ1MkM2RkMzRUFEJywKLSAgICAgICAgICAgICdkZXBlbmRlbmNpZXMnOiBbCi0g ICAgICAgICAgICAgICAgJ3dlYmtpdCcsCi0gICAgICAgICAgICAgICAgJy4uLy4uL1dlYkNvcmUv V2ViQ29yZS5neXAvV2ViQ29yZS5neXA6d2ViY29yZScsCi0gICAgICAgICAgICAgICAgJzwoY2hy b21pdW1fc3JjX2RpcikvdGVzdGluZy9ndGVzdC5neXA6Z3Rlc3QnLAotICAgICAgICAgICAgICAg ICc8KGNocm9taXVtX3NyY19kaXIpL2Jhc2UvYmFzZS5neXA6YmFzZScsCi0gICAgICAgICAgICAg ICAgJzwoY2hyb21pdW1fc3JjX2RpcikvYmFzZS9iYXNlLmd5cDpiYXNlX2kxOG4nLAotICAgICAg ICAgICAgICAgICc8KGNocm9taXVtX3NyY19kaXIpL2dwdS9ncHUuZ3lwOmdsZXMyX2NfbGliJywK LSAgICAgICAgICAgIF0sCi0gICAgICAgICAgICAnaW5jbHVkZV9kaXJzJzogWwotICAgICAgICAg ICAgICAgICdwdWJsaWMnLAotICAgICAgICAgICAgICAgICdzcmMnLAotICAgICAgICAgICAgXSwK LSAgICAgICAgICAgICdzb3VyY2VzJzogWwotICAgICAgICAgICAgICAgICd0ZXN0cy9EcmFnSW1h Z2VUZXN0LmNwcCcsCi0gICAgICAgICAgICAgICAgJ3Rlc3RzL0tleWJvYXJkVGVzdC5jcHAnLAot ICAgICAgICAgICAgICAgICd0ZXN0cy9LVVJMVGVzdC5jcHAnLAotICAgICAgICAgICAgICAgICd0 ZXN0cy9SdW5BbGxUZXN0cy5jcHAnLAotICAgICAgICAgICAgXSwKICAgICAgICAgICAgICdjb25k aXRpb25zJzogWwotICAgICAgICAgICAgICAgIFsnT1M9PSJ3aW4iJywgewotICAgICAgICAgICAg ICAgICAgICAnc291cmNlcyc6IFsKLSAgICAgICAgICAgICAgICAgICAgICAgICMgRklYTUU6IFBv cnQgUG9wdXBNZW51VGVzdCB0byBMaW51eCBhbmQgTWFjLgotICAgICAgICAgICAgICAgICAgICAg ICAgJ3Rlc3RzL1BvcHVwTWVudVRlc3QuY3BwJywKLSAgICAgICAgICAgICAgICAgICAgICAgICd0 ZXN0cy9UcmFuc3BhcmVuY3lXaW5UZXN0LmNwcCcsCi0gICAgICAgICAgICAgICAgICAgICAgICAn dGVzdHMvVW5pc2NyaWJlSGVscGVyVGVzdC5jcHAnLAorICAgICAgICAgICAgICAgICMgRklYTUU6 IG1ha2Ugd2Via2l0IHVuaXQgdGVzdHMgd29ya2luZyBmb3IgbXVsdGkgZGxsIGJ1aWxkLgorICAg ICAgICAgICAgICAgIFsnaW5zaWRlX2Nocm9taXVtX2J1aWxkPT0xIGFuZCBPUz09IndpbiIgYW5k IGNvbXBvbmVudD09InNoYXJlZF9saWJyYXJ5IicsIHsKKyAgICAgICAgICAgICAgICAgICAgJ3R5 cGUnOiAnbm9uZScsCisgICAgICAgICAgICAgICAgfSwgeworICAgICAgICAgICAgICAgICAgICAn dHlwZSc6ICdleGVjdXRhYmxlJywKKyAgICAgICAgICAgICAgICAgICAgJ21zdnNfZ3VpZCc6ICc3 Q0VGRTgwMC04NDAzLTQxOEEtQUQ2QS0yRDUyQzZGQzNFQUQnLAorICAgICAgICAgICAgICAgICAg ICAnZGVwZW5kZW5jaWVzJzogWworICAgICAgICAgICAgICAgICAgICAgICAgJ3dlYmtpdCcsCisg ICAgICAgICAgICAgICAgICAgICAgICAnLi4vLi4vV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3Jl Lmd5cDp3ZWJjb3JlJywKKyAgICAgICAgICAgICAgICAgICAgICAgICc8KGNocm9taXVtX3NyY19k aXIpL3Rlc3RpbmcvZ3Rlc3QuZ3lwOmd0ZXN0JywKKyAgICAgICAgICAgICAgICAgICAgICAgICc8 KGNocm9taXVtX3NyY19kaXIpL2Jhc2UvYmFzZS5neXA6YmFzZScsCisgICAgICAgICAgICAgICAg ICAgICAgICAnPChjaHJvbWl1bV9zcmNfZGlyKS9iYXNlL2Jhc2UuZ3lwOmJhc2VfaTE4bicsCisg ICAgICAgICAgICAgICAgICAgICAgICAnPChjaHJvbWl1bV9zcmNfZGlyKS9ncHUvZ3B1Lmd5cDpn bGVzMl9jX2xpYicsCiAgICAgICAgICAgICAgICAgICAgIF0sCi0gICAgICAgICAgICAgICAgfV0s Ci0gICAgICAgICAgICAgICAgWydPUz09Im1hYyInLCB7Ci0gICAgICAgICAgICAgICAgICAgICdz b3VyY2VzISc6IFsKLSAgICAgICAgICAgICAgICAgICAgICAgICMgRklYTUU6IFBvcnQgRHJhZ0lt YWdlVGVzdCB0byBNYWMuCisgICAgICAgICAgICAgICAgICAgICdpbmNsdWRlX2RpcnMnOiBbCisg ICAgICAgICAgICAgICAgICAgICAgICAncHVibGljJywKKyAgICAgICAgICAgICAgICAgICAgICAg ICdzcmMnLAorICAgICAgICAgICAgICAgICAgICBdLAorICAgICAgICAgICAgICAgICAgICAnc291 cmNlcyc6IFsKICAgICAgICAgICAgICAgICAgICAgICAgICd0ZXN0cy9EcmFnSW1hZ2VUZXN0LmNw cCcsCisgICAgICAgICAgICAgICAgICAgICAgICAndGVzdHMvS2V5Ym9hcmRUZXN0LmNwcCcsCisg ICAgICAgICAgICAgICAgICAgICAgICAndGVzdHMvS1VSTFRlc3QuY3BwJywKKyAgICAgICAgICAg ICAgICAgICAgICAgICd0ZXN0cy9SdW5BbGxUZXN0cy5jcHAnLAorICAgICAgICAgICAgICAgICAg ICBdLAorICAgICAgICAgICAgICAgICAgICAnY29uZGl0aW9ucyc6IFsKKyAgICAgICAgICAgICAg ICAgICAgICAgIFsnT1M9PSJ3aW4iJywgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgICdz b3VyY2VzJzogWworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAjIEZJWE1FOiBQb3J0 IFBvcHVwTWVudVRlc3QgdG8gTGludXggYW5kIE1hYy4KKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgJ3Rlc3RzL1BvcHVwTWVudVRlc3QuY3BwJywKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgJ3Rlc3RzL1RyYW5zcGFyZW5jeVdpblRlc3QuY3BwJywKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgJ3Rlc3RzL1VuaXNjcmliZUhlbHBlclRlc3QuY3BwJywKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICBdLAorICAgICAgICAgICAgICAgICAgICAgICAgfV0s CisgICAgICAgICAgICAgICAgICAgICAgICBbJ09TPT0ibWFjIicsIHsKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAnc291cmNlcyEnOiBbCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICMgRklYTUU6IFBvcnQgRHJhZ0ltYWdlVGVzdCB0byBNYWMuCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICd0ZXN0cy9EcmFnSW1hZ2VUZXN0LmNwcCcsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICAgICAgICAgICAgIH1dLAogICAgICAgICAg ICAgICAgICAgICBdLAogICAgICAgICAgICAgICAgIH1dLAogICAgICAgICAgICAgXSwKQEAgLTY0 MSw2ICs2NDgsMjAgQEAKICAgICAgICAgICAgICAgICAgICAgICAgICc8KFNIQVJFRF9JTlRFUk1F RElBVEVfRElSKS93ZWJraXQvd2Via2l0X3Jlc291cmNlcy5yYycsCiAgICAgICAgICAgICAgICAg ICAgICAgICAnPChTSEFSRURfSU5URVJNRURJQVRFX0RJUikvd2Via2l0L3dlYmtpdF9zdHJpbmdz X2VuLVVTLnJjJywKICAgICAgICAgICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICAgICAgICAg J2NvbmRpdGlvbnMnOiBbCisgICAgICAgICAgICAgICAgICAgICAgICBbJ2luc2lkZV9jaHJvbWl1 bV9idWlsZD09MSBhbmQgY29tcG9uZW50PT0ic2hhcmVkX2xpYnJhcnkiJywgeworICAgICAgICAg ICAgICAgICAgICAgICAgICAgICdzb3VyY2VzJzogWworICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAnc3JjL0Nocm9taXVtQ3VycmVudFRpbWUuY3BwJywKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgJ3NyYy9DaHJvbWl1bVRocmVhZGluZy5jcHAnLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgIF0sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2luY2x1ZGVf ZGlycyc6IFsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ3B1YmxpYycsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAn ZGVwZW5kZW5jaWVzJzogWworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnLi4vLi4v SmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZ3lwL0phdmFTY3JpcHRDb3JlLmd5cDp3dGYn LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIF0sCisgICAgICAgICAgICAgICAgICAgICAg ICB9XSwKKyAgICAgICAgICAgICAgICAgICAgXSwKICAgICAgICAgICAgICAgICAgICAgJ2NvcGll cyc6IFt7CiAgICAgICAgICAgICAgICAgICAgICAgICAnZGVzdGluYXRpb24nOiAnPChQUk9EVUNU X0RJUiknLAogICAgICAgICAgICAgICAgICAgICAgICAgJ2ZpbGVzJzogWyc8KGFoZW1fcGF0aCkn XSwKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQWNjZXNzaWJpbGl0eUNhY2hlLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJBY2Nlc3NpYmlsaXR5Q2Fj aGUuaAkocmV2aXNpb24gNjIwMzYpCisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkFjY2Vz c2liaWxpdHlDYWNoZS5oCSh3b3JraW5nIGNvcHkpCkBAIC00Myw4ICs0Myw4IEBAIHB1YmxpYzoK ICAgICBXZWJBY2Nlc3NpYmlsaXR5Q2FjaGUoKSB7fQogICAgIHZpcnR1YWwgfldlYkFjY2Vzc2li aWxpdHlDYWNoZSgpIHt9CiAKLSAgICBzdGF0aWMgV2ViQWNjZXNzaWJpbGl0eUNhY2hlKiBjcmVh dGUoKTsKLSAgICBzdGF0aWMgdm9pZCBlbmFibGVBY2Nlc3NpYmlsaXR5KCk7CisgICAgV0VCS0lU X0FQSSBzdGF0aWMgV2ViQWNjZXNzaWJpbGl0eUNhY2hlKiBjcmVhdGUoKTsKKyAgICBXRUJLSVRf QVBJIHN0YXRpYyB2b2lkIGVuYWJsZUFjY2Vzc2liaWxpdHkoKTsKIAogICAgIHZpcnR1YWwgdm9p ZCBpbml0aWFsaXplKFdlYlZpZXcqIHZpZXcpID0gMDsKICAgICB2aXJ0dWFsIGJvb2wgaXNJbml0 aWFsaXplZCgpIGNvbnN0ID0gMDsKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQWNj ZXNzaWJpbGl0eU9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViQWNjZXNzaWJpbGl0eU9iamVjdC5oCShyZXZpc2lvbiA2MjAzNikKKysrIFdlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC02 NCw0NCArNjQsNDQgQEAgcHVibGljOgogCiAgICAgYm9vbCBpc051bGwoKSBjb25zdCB7IHJldHVy biAhbV9wcml2YXRlOyB9CiAKLSAgICBXZWJTdHJpbmcgYWNjZXNzaWJpbGl0eURlc2NyaXB0aW9u KCkgY29uc3Q7Ci0gICAgV2ViU3RyaW5nIGFjdGlvblZlcmIoKSBjb25zdDsKLSAgICBib29sIGNh blNldEZvY3VzQXR0cmlidXRlKCkgY29uc3Q7Ci0gICAgYm9vbCBjYW5TZXRWYWx1ZUF0dHJpYnV0 ZSgpIGNvbnN0OwotCi0gICAgdW5zaWduZWQgY2hpbGRDb3VudCgpIGNvbnN0OwotCi0gICAgV2Vi QWNjZXNzaWJpbGl0eU9iamVjdCBjaGlsZEF0KHVuc2lnbmVkKSBjb25zdDsKLSAgICBXZWJBY2Nl c3NpYmlsaXR5T2JqZWN0IGZpcnN0Q2hpbGQoKSBjb25zdDsKLSAgICBXZWJBY2Nlc3NpYmlsaXR5 T2JqZWN0IGZvY3VzZWRDaGlsZCgpIGNvbnN0OwotICAgIFdlYkFjY2Vzc2liaWxpdHlPYmplY3Qg bGFzdENoaWxkKCkgY29uc3Q7Ci0gICAgV2ViQWNjZXNzaWJpbGl0eU9iamVjdCBuZXh0U2libGlu ZygpIGNvbnN0OwotICAgIFdlYkFjY2Vzc2liaWxpdHlPYmplY3QgcGFyZW50T2JqZWN0KCkgY29u c3Q7Ci0gICAgV2ViQWNjZXNzaWJpbGl0eU9iamVjdCBwcmV2aW91c1NpYmxpbmcoKSBjb25zdDsK LQotICAgIGJvb2wgaXNBbmNob3IoKSBjb25zdDsKLSAgICBib29sIGlzQ2hlY2tlZCgpIGNvbnN0 OwotICAgIGJvb2wgaXNGb2N1c2VkKCkgY29uc3Q7Ci0gICAgYm9vbCBpc0VuYWJsZWQoKSBjb25z dDsKLSAgICBib29sIGlzSG92ZXJlZCgpIGNvbnN0OwotICAgIGJvb2wgaXNJbmRldGVybWluYXRl KCkgY29uc3Q7Ci0gICAgYm9vbCBpc011bHRpU2VsZWN0YWJsZSgpIGNvbnN0OwotICAgIGJvb2wg aXNPZmZTY3JlZW4oKSBjb25zdDsKLSAgICBib29sIGlzUGFzc3dvcmRGaWVsZCgpIGNvbnN0Owot ICAgIGJvb2wgaXNQcmVzc2VkKCkgY29uc3Q7Ci0gICAgYm9vbCBpc1JlYWRPbmx5KCkgY29uc3Q7 Ci0gICAgYm9vbCBpc1Zpc2l0ZWQoKSBjb25zdDsKLQotICAgIFdlYlJlY3QgYm91bmRpbmdCb3hS ZWN0KCkgY29uc3Q7Ci0gICAgV2ViU3RyaW5nIGhlbHBUZXh0KCkgY29uc3Q7Ci0gICAgaW50IGhl YWRpbmdMZXZlbCgpIGNvbnN0OwotICAgIFdlYkFjY2Vzc2liaWxpdHlPYmplY3QgaGl0VGVzdChj b25zdCBXZWJQb2ludCYpIGNvbnN0OwotICAgIFdlYlN0cmluZyBrZXlib2FyZFNob3J0Y3V0KCkg Y29uc3Q7Ci0gICAgYm9vbCBwZXJmb3JtRGVmYXVsdEFjdGlvbigpIGNvbnN0OwotICAgIFdlYkFj Y2Vzc2liaWxpdHlSb2xlIHJvbGVWYWx1ZSgpIGNvbnN0OwotICAgIHZvaWQgc2V0Rm9jdXNlZChi b29sKSBjb25zdDsKLSAgICBXZWJTdHJpbmcgc3RyaW5nVmFsdWUoKSBjb25zdDsKLSAgICBXZWJT dHJpbmcgdGl0bGUoKSBjb25zdDsKKyAgICBXRUJLSVRfQVBJIFdlYlN0cmluZyBhY2Nlc3NpYmls aXR5RGVzY3JpcHRpb24oKSBjb25zdDsKKyAgICBXRUJLSVRfQVBJIFdlYlN0cmluZyBhY3Rpb25W ZXJiKCkgY29uc3Q7CisgICAgV0VCS0lUX0FQSSBib29sIGNhblNldEZvY3VzQXR0cmlidXRlKCkg Y29uc3Q7CisgICAgV0VCS0lUX0FQSSBib29sIGNhblNldFZhbHVlQXR0cmlidXRlKCkgY29uc3Q7 CisKKyAgICBXRUJLSVRfQVBJIHVuc2lnbmVkIGNoaWxkQ291bnQoKSBjb25zdDsKKworICAgIFdF QktJVF9BUEkgV2ViQWNjZXNzaWJpbGl0eU9iamVjdCBjaGlsZEF0KHVuc2lnbmVkKSBjb25zdDsK KyAgICBXRUJLSVRfQVBJIFdlYkFjY2Vzc2liaWxpdHlPYmplY3QgZmlyc3RDaGlsZCgpIGNvbnN0 OworICAgIFdFQktJVF9BUEkgV2ViQWNjZXNzaWJpbGl0eU9iamVjdCBmb2N1c2VkQ2hpbGQoKSBj b25zdDsKKyAgICBXRUJLSVRfQVBJIFdlYkFjY2Vzc2liaWxpdHlPYmplY3QgbGFzdENoaWxkKCkg Y29uc3Q7CisgICAgV0VCS0lUX0FQSSBXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0IG5leHRTaWJsaW5n KCkgY29uc3Q7CisgICAgV0VCS0lUX0FQSSBXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0IHBhcmVudE9i amVjdCgpIGNvbnN0OworICAgIFdFQktJVF9BUEkgV2ViQWNjZXNzaWJpbGl0eU9iamVjdCBwcmV2 aW91c1NpYmxpbmcoKSBjb25zdDsKKworICAgIFdFQktJVF9BUEkgYm9vbCBpc0FuY2hvcigpIGNv bnN0OworICAgIFdFQktJVF9BUEkgYm9vbCBpc0NoZWNrZWQoKSBjb25zdDsKKyAgICBXRUJLSVRf QVBJIGJvb2wgaXNGb2N1c2VkKCkgY29uc3Q7CisgICAgV0VCS0lUX0FQSSBib29sIGlzRW5hYmxl ZCgpIGNvbnN0OworICAgIFdFQktJVF9BUEkgYm9vbCBpc0hvdmVyZWQoKSBjb25zdDsKKyAgICBX RUJLSVRfQVBJIGJvb2wgaXNJbmRldGVybWluYXRlKCkgY29uc3Q7CisgICAgV0VCS0lUX0FQSSBi b29sIGlzTXVsdGlTZWxlY3RhYmxlKCkgY29uc3Q7CisgICAgV0VCS0lUX0FQSSBib29sIGlzT2Zm U2NyZWVuKCkgY29uc3Q7CisgICAgV0VCS0lUX0FQSSBib29sIGlzUGFzc3dvcmRGaWVsZCgpIGNv bnN0OworICAgIFdFQktJVF9BUEkgYm9vbCBpc1ByZXNzZWQoKSBjb25zdDsKKyAgICBXRUJLSVRf QVBJIGJvb2wgaXNSZWFkT25seSgpIGNvbnN0OworICAgIFdFQktJVF9BUEkgYm9vbCBpc1Zpc2l0 ZWQoKSBjb25zdDsKKworICAgIFdFQktJVF9BUEkgV2ViUmVjdCBib3VuZGluZ0JveFJlY3QoKSBj b25zdDsKKyAgICBXRUJLSVRfQVBJIFdlYlN0cmluZyBoZWxwVGV4dCgpIGNvbnN0OworICAgIFdF QktJVF9BUEkgaW50IGhlYWRpbmdMZXZlbCgpIGNvbnN0OworICAgIFdFQktJVF9BUEkgV2ViQWNj ZXNzaWJpbGl0eU9iamVjdCBoaXRUZXN0KGNvbnN0IFdlYlBvaW50JikgY29uc3Q7CisgICAgV0VC S0lUX0FQSSBXZWJTdHJpbmcga2V5Ym9hcmRTaG9ydGN1dCgpIGNvbnN0OworICAgIFdFQktJVF9B UEkgYm9vbCBwZXJmb3JtRGVmYXVsdEFjdGlvbigpIGNvbnN0OworICAgIFdFQktJVF9BUEkgV2Vi QWNjZXNzaWJpbGl0eVJvbGUgcm9sZVZhbHVlKCkgY29uc3Q7CisgICAgV0VCS0lUX0FQSSB2b2lk IHNldEZvY3VzZWQoYm9vbCkgY29uc3Q7CisgICAgV0VCS0lUX0FQSSBXZWJTdHJpbmcgc3RyaW5n VmFsdWUoKSBjb25zdDsKKyAgICBXRUJLSVRfQVBJIFdlYlN0cmluZyB0aXRsZSgpIGNvbnN0Owog CiAjaWYgV0VCS0lUX0lNUExFTUVOVEFUSU9OCiAgICAgV2ViQWNjZXNzaWJpbGl0eU9iamVjdChj b25zdCBXVEY6OlBhc3NSZWZQdHI8V2ViQ29yZTo6QWNjZXNzaWJpbGl0eU9iamVjdD4mKTsKSW5k ZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRXZlbnRMaXN0ZW5lci5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRXZlbnRMaXN0ZW5lci5oCShyZXZpc2lvbiA2 MjAzNikKKysrIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRXZlbnRMaXN0ZW5lci5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0zMSw2ICszMSw4IEBACiAjaWZuZGVmIFdlYkV2ZW50TGlzdGVuZXJfaAog I2RlZmluZSBXZWJFdmVudExpc3RlbmVyX2gKIAorI2luY2x1ZGUgIldlYkNvbW1vbi5oIgorCiAj aWYgV0VCS0lUX0lNUExFTUVOVEFUSU9OCiBuYW1lc3BhY2UgV2ViQ29yZSB7IGNsYXNzIE5vZGU7 IH0KICNlbmRpZgpAQCAtNDUsOCArNDcsOCBAQCBjbGFzcyBXZWJTdHJpbmc7CiAKIGNsYXNzIFdl YkV2ZW50TGlzdGVuZXIgewogcHVibGljOgotICAgIFdlYkV2ZW50TGlzdGVuZXIoKTsKLSAgICB2 aXJ0dWFsIH5XZWJFdmVudExpc3RlbmVyKCk7CisgICAgV0VCS0lUX0FQSSBXZWJFdmVudExpc3Rl bmVyKCk7CisgICAgV0VCS0lUX0FQSSB2aXJ0dWFsIH5XZWJFdmVudExpc3RlbmVyKCk7CiAKICAg ICAvLyBDYWxsZWQgd2hlbiBhbiBldmVudCBpcyByZWNlaXZlZC4KICAgICB2aXJ0dWFsIHZvaWQg aGFuZGxlRXZlbnQoY29uc3QgV2ViRXZlbnQmKSA9IDA7CkluZGV4OiBXZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYkdlb2xvY2F0aW9uU2VydmljZU1vY2suaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQv Y2hyb21pdW0vcHVibGljL1dlYkdlb2xvY2F0aW9uU2VydmljZU1vY2suaAkocmV2aXNpb24gNjIw MzYpCisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkdlb2xvY2F0aW9uU2VydmljZU1vY2su aAkod29ya2luZyBjb3B5KQpAQCAtMzEsNiArMzEsNyBAQAogI2lmbmRlZiBXZWJHZW9sb2NhdGlv blNlcnZpY2VNb2NrX2gKICNkZWZpbmUgV2ViR2VvbG9jYXRpb25TZXJ2aWNlTW9ja19oCiAKKyNp bmNsdWRlICJXZWJDb21tb24uaCIKICNpbmNsdWRlICJXZWJHZW9sb2NhdGlvblNlcnZpY2UuaCIK IAogbmFtZXNwYWNlIFdlYktpdCB7CkBAIC0zOSwxMCArNDAsMTAgQEAgY2xhc3MgV2ViU3RyaW5n OwogCiBjbGFzcyBXZWJHZW9sb2NhdGlvblNlcnZpY2VNb2NrIDogcHVibGljIFdlYkdlb2xvY2F0 aW9uU2VydmljZSB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFdlYkdlb2xvY2F0aW9uU2VydmljZU1v Y2sqIGNyZWF0ZVdlYkdlb2xvY2F0aW9uU2VydmljZU1vY2soKTsKLSAgICBzdGF0aWMgdm9pZCBz ZXRNb2NrR2VvbG9jYXRpb25QZXJtaXNzaW9uKGJvb2wgYWxsb3dlZCk7Ci0gICAgc3RhdGljIHZv aWQgc2V0TW9ja0dlb2xvY2F0aW9uUG9zaXRpb24oZG91YmxlIGxhdGl0dWRlLCBkb3VibGUgbG9u Z2l0dWRlLCBkb3VibGUgYWNjdXJhY3kpOwotICAgIHN0YXRpYyB2b2lkIHNldE1vY2tHZW9sb2Nh dGlvbkVycm9yKGludCBlcnJvckNvZGUsIGNvbnN0IFdlYlN0cmluZyYgbWVzc2FnZSk7CisgICAg V0VCS0lUX0FQSSBzdGF0aWMgV2ViR2VvbG9jYXRpb25TZXJ2aWNlTW9jayogY3JlYXRlV2ViR2Vv bG9jYXRpb25TZXJ2aWNlTW9jaygpOworICAgIFdFQktJVF9BUEkgc3RhdGljIHZvaWQgc2V0TW9j a0dlb2xvY2F0aW9uUGVybWlzc2lvbihib29sIGFsbG93ZWQpOworICAgIFdFQktJVF9BUEkgc3Rh dGljIHZvaWQgc2V0TW9ja0dlb2xvY2F0aW9uUG9zaXRpb24oZG91YmxlIGxhdGl0dWRlLCBkb3Vi bGUgbG9uZ2l0dWRlLCBkb3VibGUgYWNjdXJhY3kpOworICAgIFdFQktJVF9BUEkgc3RhdGljIHZv aWQgc2V0TW9ja0dlb2xvY2F0aW9uRXJyb3IoaW50IGVycm9yQ29kZSwgY29uc3QgV2ViU3RyaW5n JiBtZXNzYWdlKTsKIAogcHJvdGVjdGVkOgogICAgIHN0YXRpYyBib29sIHNfbW9ja0dlb2xvY2F0 aW9uUGVybWlzc2lvbjsKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViR3JhcGhpY3ND b250ZXh0M0QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkdyYXBo aWNzQ29udGV4dDNELmgJKHJldmlzaW9uIDYyMDM2KQorKysgV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJHcmFwaGljc0NvbnRleHQzRC5oCSh3b3JraW5nIGNvcHkpCkBAIC03Nyw3ICs3Nyw3IEBA IHB1YmxpYzoKIAogICAgIC8vIENyZWF0ZXMgYSAiZGVmYXVsdCIgaW1wbGVtZW50YXRpb24gb2Yg V2ViR3JhcGhpY3NDb250ZXh0M0Qgd2hpY2ggY2FsbHMKICAgICAvLyBPcGVuR0wgZGlyZWN0bHku Ci0gICAgc3RhdGljIFdlYkdyYXBoaWNzQ29udGV4dDNEKiBjcmVhdGVEZWZhdWx0KCk7CisgICAg V0VCS0lUX0FQSSBzdGF0aWMgV2ViR3JhcGhpY3NDb250ZXh0M0QqIGNyZWF0ZURlZmF1bHQoKTsK IAogICAgIC8vIEluaXRpYWxpemVzIHRoZSBncmFwaGljcyBjb250ZXh0OyBzaG91bGQgYmUgdGhl IGZpcnN0IG9wZXJhdGlvbiBwZXJmb3JtZWQKICAgICAvLyBvbiBuZXdseS1jb25zdHJ1Y3RlZCBp bnN0YW5jZXMuIFJldHVybnMgdHJ1ZSBvbiBzdWNjZXNzLgpJbmRleDogV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJJREJEYXRhYmFzZUVycm9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJJREJEYXRhYmFzZUVycm9yLmgJKHJldmlzaW9uIDYyMDM2KQorKysgV2Vi S2l0L2Nocm9taXVtL3B1YmxpYy9XZWJJREJEYXRhYmFzZUVycm9yLmgJKHdvcmtpbmcgY29weSkK QEAgLTQwLDExICs0MCwxMSBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIC8vIFNlZSBjb21tZW50IGlu IFdlYkluZGV4ZWREYXRhYmFzZSBmb3IgYSBoaWdoIGxldmVsIG92ZXJ2aWV3IHRoZXNlIGNsYXNz ZXMuCiBjbGFzcyBXZWJJREJEYXRhYmFzZUVycm9yIHsKIHB1YmxpYzoKLSAgICB+V2ViSURCRGF0 YWJhc2VFcnJvcigpOworICAgIFdFQktJVF9BUEkgfldlYklEQkRhdGFiYXNlRXJyb3IoKTsKIAot ICAgIFdlYklEQkRhdGFiYXNlRXJyb3IodW5zaWduZWQgc2hvcnQgY29kZSwgY29uc3QgV2ViU3Ry aW5nJiBtZXNzYWdlKSB7IGFzc2lnbihjb2RlLCBtZXNzYWdlKTsgfQotICAgIFdlYklEQkRhdGFi YXNlRXJyb3IoY29uc3QgV2ViSURCRGF0YWJhc2VFcnJvciYgZSkgeyBhc3NpZ24oZSk7IH0KLSAg ICBXZWJJREJEYXRhYmFzZUVycm9yJiBvcGVyYXRvcj0oY29uc3QgV2ViSURCRGF0YWJhc2VFcnJv ciYgZSkKKyAgICBXRUJLSVRfQVBJIFdlYklEQkRhdGFiYXNlRXJyb3IodW5zaWduZWQgc2hvcnQg Y29kZSwgY29uc3QgV2ViU3RyaW5nJiBtZXNzYWdlKSB7IGFzc2lnbihjb2RlLCBtZXNzYWdlKTsg fQorICAgIFdFQktJVF9BUEkgV2ViSURCRGF0YWJhc2VFcnJvcihjb25zdCBXZWJJREJEYXRhYmFz ZUVycm9yJiBlKSB7IGFzc2lnbihlKTsgfQorICAgIFdFQktJVF9BUEkgV2ViSURCRGF0YWJhc2VF cnJvciYgb3BlcmF0b3I9KGNvbnN0IFdlYklEQkRhdGFiYXNlRXJyb3ImIGUpCiAgICAgewogICAg ICAgICBhc3NpZ24oZSk7CiAgICAgICAgIHJldHVybiAqdGhpczsKSW5kZXg6IFdlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViTm90aWZpY2F0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJOb3RpZmljYXRpb24uaAkocmV2aXNpb24gNjIwMzYpCisrKyBXZWJLaXQv Y2hyb21pdW0vcHVibGljL1dlYk5vdGlmaWNhdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC02NCw3 ICs2NCw3IEBAIHB1YmxpYzoKIAogICAgIC8vIE9wZXJhdG9ycyByZXF1aXJlZCB0byBwdXQgV2Vi Tm90aWZpY2F0aW9uIGluIGFuIG9yZGVyZWQgbWFwLgogICAgIGJvb2wgZXF1YWxzKGNvbnN0IFdl Yk5vdGlmaWNhdGlvbiYgb3RoZXIpIGNvbnN0IHsgcmV0dXJuIG1fcHJpdmF0ZSA9PSBvdGhlci5t X3ByaXZhdGU7IH0KLSAgICBib29sIGxlc3NUaGFuKGNvbnN0IFdlYk5vdGlmaWNhdGlvbiYgb3Ro ZXIpIGNvbnN0OworICAgIFdFQktJVF9BUEkgYm9vbCBsZXNzVGhhbihjb25zdCBXZWJOb3RpZmlj YXRpb24mIG90aGVyKSBjb25zdDsKIAogICAgIC8vIElzIHRoZSBub3RpZmljYXRpb24gSFRNTCB2 cy4gaWNvbi10aXRsZS10ZXh0PwogICAgIFdFQktJVF9BUEkgYm9vbCBpc0hUTUwoKSBjb25zdDsK SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGFzc3dvcmRGb3JtRGF0YS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGFzc3dvcmRGb3JtRGF0YS5oCShy ZXZpc2lvbiA2MjAzNikKKysrIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGFzc3dvcmRGb3Jt RGF0YS5oCSh3b3JraW5nIGNvcHkpCkBAIC00MCw3ICs0MCw3IEBAIG5hbWVzcGFjZSBXZWJLaXQg ewogc3RydWN0IFdlYlBhc3N3b3JkRm9ybURhdGEgewogICAgIC8vIElmIHRoZSBwcm92aWRlZCBm b3JtIGlzIHN1aXRhYmxlIGZvciBwYXNzd29yZCBjb21wbGV0aW9uLCBpc1ZhbGlkKCkgd2lsbAog ICAgIC8vIHJldHVybiB0cnVlOwotICAgIFdlYlBhc3N3b3JkRm9ybURhdGEoY29uc3QgV2ViRm9y bUVsZW1lbnQmKTsKKyAgICBXRUJLSVRfQVBJIFdlYlBhc3N3b3JkRm9ybURhdGEoY29uc3QgV2Vi Rm9ybUVsZW1lbnQmKTsKIAogICAgIC8vIElmIGNyZWF0aW9uIGZhaWxlZCwgcmV0dXJuIGZhbHNl LgogICAgIGJvb2wgaXNWYWxpZCgpIGNvbnN0IHsgcmV0dXJuIGFjdGlvbi5pc1ZhbGlkKCk7IH0K SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViU2VhcmNoYWJsZUZvcm1EYXRhLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJTZWFyY2hhYmxlRm9ybURhdGEu aAkocmV2aXNpb24gNjIwMzYpCisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlNlYXJjaGFi bGVGb3JtRGF0YS5oCSh3b3JraW5nIGNvcHkpCkBAIC00Myw3ICs0Myw3IEBAIGNsYXNzIFdlYlNl YXJjaGFibGVGb3JtRGF0YSB7CiBwdWJsaWM6CiAgICAgLy8gSWYgdGhlIHByb3ZpZGVkIGZvcm0g aXMgc3VpdGFibGUgZm9yIGF1dG9tYXRlZCBzZWFyY2hpbmcsIGlzVmFsaWQoKQogICAgIC8vIHdp bGwgcmV0dXJuIGZhbHNlLgotICAgIFdlYlNlYXJjaGFibGVGb3JtRGF0YShjb25zdCBXZWJGb3Jt RWxlbWVudCYpOworICAgIFdFQktJVF9BUEkgV2ViU2VhcmNoYWJsZUZvcm1EYXRhKGNvbnN0IFdl YkZvcm1FbGVtZW50Jik7CiAKICAgICBib29sIGlzVmFsaWQoKSB7IHJldHVybiBtX3VybC5pc1Zh bGlkKCk7IH0KIApJbmRleDogV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJTdG9yYWdlRXZlbnRE aXNwYXRjaGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJTdG9y YWdlRXZlbnREaXNwYXRjaGVyLmgJKHJldmlzaW9uIDYyMDM2KQorKysgV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJTdG9yYWdlRXZlbnREaXNwYXRjaGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTQx LDcgKzQxLDcgQEAgY2xhc3MgV2ViVVJMOwogLy8gRklYTUU6IE1ha2UgdGhpcyAob3Igc29tZXRo aW5nKSB3b3JrIGZvciBTZXNzaW9uU3RvcmFnZSEKIGNsYXNzIFdlYlN0b3JhZ2VFdmVudERpc3Bh dGNoZXIgewogcHVibGljOgotICAgIHN0YXRpYyBXZWJTdG9yYWdlRXZlbnREaXNwYXRjaGVyKiBj cmVhdGUoKTsKKyAgICBXRUJLSVRfQVBJIHN0YXRpYyBXZWJTdG9yYWdlRXZlbnREaXNwYXRjaGVy KiBjcmVhdGUoKTsKIAogICAgIHZpcnR1YWwgfldlYlN0b3JhZ2VFdmVudERpc3BhdGNoZXIoKSB7 IH0KIApJbmRleDogV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJTdHJpbmcuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlN0cmluZy5oCShyZXZpc2lvbiA2MjAzNikK KysrIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViU3RyaW5nLmgJKHdvcmtpbmcgY29weSkKQEAg LTEzMSw3ICsxMzEsNyBAQCBwdWJsaWM6CiAgICAgV2ViU3RyaW5nKGNvbnN0IE51bGxhYmxlU3Ry aW5nMTYmIHMpIDogbV9wcml2YXRlKDApCiAgICAgewogICAgICAgICBpZiAocy5pc19udWxsKCkp Ci0gICAgICAgICAgICBhc3NpZ24oMCk7CisgICAgICAgICAgICByZXNldCgpOwogICAgICAgICBl bHNlCiAgICAgICAgICAgICBhc3NpZ24ocy5zdHJpbmcoKS5kYXRhKCksIHMuc3RyaW5nKCkubGVu Z3RoKCkpOwogICAgIH0KQEAgLTEzOSw3ICsxMzksNyBAQCBwdWJsaWM6CiAgICAgV2ViU3RyaW5n JiBvcGVyYXRvcj0oY29uc3QgTnVsbGFibGVTdHJpbmcxNiYgcykKICAgICB7CiAgICAgICAgIGlm IChzLmlzX251bGwoKSkKLSAgICAgICAgICAgIGFzc2lnbigwKTsKKyAgICAgICAgICAgIHJlc2V0 KCk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIGFzc2lnbihzLnN0cmluZygpLmRhdGEoKSwg cy5zdHJpbmcoKS5sZW5ndGgoKSk7CiAgICAgICAgIHJldHVybiAqdGhpczsK