33839 2010-01-19 03:52:22 -0800 Style in WebCore/bridge/Bridge needs fixing 2010-01-20 03:49:27 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 33801 1 steveblock steveblock abarth android-webkit-unforking commit-queue eric steveblock oldest_to_newest 182198 0 steveblock 2010-01-19 03:52:22 -0800 Style in WebCore/bridge/Bridge needs fixing See Bug 33801, which this bug blocks 182212 1 46902 steveblock 2010-01-19 06:05:45 -0800 Created attachment 46902 Patch 1 for Bug 33839 182715 2 46902 steveblock 2010-01-20 03:35:29 -0800 Comment on attachment 46902 Patch 1 for Bug 33839 This patch has been in the commit queue for over 12 hours but keeps getting pushed down the queue by other, more recent patches. Giving up and landing manually. 182718 3 steveblock 2010-01-20 03:39:21 -0800 Landed as http://trac.webkit.org/changeset/53541 Closing bug as resolved 182720 4 eric 2010-01-20 03:41:20 -0800 Well, that and the bots have been red much of the day. bug 33893 is our latest blocker. the commit-queue's landing speed greatly regressed with http://trac.webkit.org/changeset/52764 But our biggest problem is just that the webkit.org bots are red all the time. :( Sorry the cq didn't work for you. Hopefully webkit-patch land-from-bug was at least helpful. 182727 5 steveblock 2010-01-20 03:49:27 -0800 > Well, that and the bots have been red much of the day. bug 33893 is our latest > blocker. It's true that the bots are often red, but a number of patches have been landed in that time. > Sorry the cq didn't work for you. Hopefully webkit-patch land-from-bug was at > least helpful. No problem. Just makes me more keen to fix Bug 33395! 46902 2010-01-19 06:05:45 -0800 2010-01-20 03:35:29 -0800 Patch 1 for Bug 33839 bridgeStyle.txt text/plain 12585 steveblock SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MzQ2NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzAgQEAKKzIwMTAtMDEtMTkgIFN0ZXZlIEJsb2NrICA8c3RldmVibG9ja0Bnb29n bGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEZpeGVzIHN0eWxlIGluIFdlYkNvcmUvYnJpZGdlL0JyaWRnZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzM4MzkKKworICAgICAgICBObyBuZXcgdGVz dHMsIHN0eWxlIGZpeGVzIG9ubHkuCisKKyAgICAgICAgKiBicmlkZ2UvQnJpZGdlLmNwcDogTW9k aWZpZWQuCisgICAgICAgICogYnJpZGdlL0JyaWRnZS5oOiBNb2RpZmllZC4KKyAgICAgICAgKiBi cmlkZ2UvYy9jX2luc3RhbmNlLmNwcDogTW9kaWZpZWQuCisgICAgICAgIChKU0M6OkJpbmRpbmdz OjpDSW5zdGFuY2U6Omludm9rZU1ldGhvZCk6IE1vZGlmaWVkLiBVc2UgcmVuYW1lZCBtX3Jvb3RP YmplY3QgbWVtYmVyCisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpDSW5zdGFuY2U6Omludm9rZURl ZmF1bHRNZXRob2QpOiBNb2RpZmllZC4gVXNlIHJlbmFtZWQgbV9yb290T2JqZWN0IG1lbWJlcgor ICAgICAgICAoSlNDOjpCaW5kaW5nczo6Q0luc3RhbmNlOjppbnZva2VDb25zdHJ1Y3QpOiBNb2Rp ZmllZC4gVXNlIHJlbmFtZWQgbV9yb290T2JqZWN0IG1lbWJlcgorICAgICAgICAqIGJyaWRnZS9q bmkvam5pX3J1bnRpbWUuY3BwOiBNb2RpZmllZC4KKyAgICAgICAgKEphdmFBcnJheTo6SmF2YUFy cmF5KTogTW9kaWZpZWQuIFVzZSByZW5hbWVkIG1fcm9vdE9iamVjdCBtZW1iZXIKKyAgICAgICAg KEphdmFBcnJheTo6cm9vdE9iamVjdCk6IE1vZGlmaWVkLiBVc2UgcmVuYW1lZCBtX3Jvb3RPYmpl Y3QgbWVtYmVyCisgICAgICAgICogYnJpZGdlL29iamMvb2JqY19pbnN0YW5jZS5tbTogTW9kaWZp ZWQuCisgICAgICAgIChPYmpjSW5zdGFuY2U6Omludm9rZU1ldGhvZCk6IE1vZGlmaWVkLiBVc2Ug cmVuYW1lZCBtX3Jvb3RPYmplY3QgbWVtYmVyCisgICAgICAgIChPYmpjSW5zdGFuY2U6Omludm9r ZURlZmF1bHRNZXRob2QpOiBNb2RpZmllZC4gVXNlIHJlbmFtZWQgbV9yb290T2JqZWN0IG1lbWJl cgorICAgICAgICAoT2JqY0luc3RhbmNlOjpnZXRWYWx1ZU9mVW5kZWZpbmVkRmllbGQpOiBNb2Rp ZmllZC4gVXNlIHJlbmFtZWQgbV9yb290T2JqZWN0IG1lbWJlcgorICAgICAgICAqIGJyaWRnZS9v YmpjL29iamNfcnVudGltZS5tbTogTW9kaWZpZWQuCisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpP YmpjQXJyYXk6OnZhbHVlQXQpOiBNb2RpZmllZC4gVXNlIHJlbmFtZWQgbV9yb290T2JqZWN0IG1l bWJlcgorICAgICAgICAqIGJyaWRnZS9xdC9xdF9ydW50aW1lLmNwcDogTW9kaWZpZWQuCisgICAg ICAgIChKU0M6OkJpbmRpbmdzOjo6OnJvb3RPYmplY3QpOiBNb2RpZmllZC4gVXNlIHJlbmFtZWQg bV9yb290T2JqZWN0IG1lbWJlcgorCiAyMDEwLTAxLTE5ICBTdGV2ZSBCbG9jayAgPHN0ZXZlYmxv Y2tAZ29vZ2xlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeC4KSW5kZXg6IFdl YkNvcmUvYnJpZGdlL0JyaWRnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9icmlkZ2UvQnJp ZGdlLmNwcAkocmV2aXNpb24gNTM0NjQpCisrKyBXZWJDb3JlL2JyaWRnZS9CcmlkZ2UuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0yMCw3ICsyMCw3IEBACiAgKiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJ TlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZCiAgKiBPRiBMSUFC SUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKICAq IChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBP VVQgT0YgVEhFIFVTRQotICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRI RSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4gCisgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVO IElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKICNp bmNsdWRlICJjb25maWcuaCIKQEAgLTM0LDEyICszNCwxNCBAQAogI2luY2x1ZGUgInF0X2luc3Rh bmNlLmgiCiAjZW5kaWYKIAotbmFtZXNwYWNlIEpTQyB7IG5hbWVzcGFjZSBCaW5kaW5ncyB7Citu YW1lc3BhY2UgSlNDIHsKKworbmFtZXNwYWNlIEJpbmRpbmdzIHsKIAogQXJyYXk6OkFycmF5KFBh c3NSZWZQdHI8Um9vdE9iamVjdD4gcm9vdE9iamVjdCkKLSAgICA6IF9yb290T2JqZWN0KHJvb3RP YmplY3QpCisgICAgOiBtX3Jvb3RPYmplY3Qocm9vdE9iamVjdCkKIHsKLSAgICBBU1NFUlQoX3Jv b3RPYmplY3QpOworICAgIEFTU0VSVChtX3Jvb3RPYmplY3QpOwogfQogCiBBcnJheTo6fkFycmF5 KCkKQEAgLTQ3LDEwICs0OSwxMCBAQCBBcnJheTo6fkFycmF5KCkKIH0KIAogSW5zdGFuY2U6Oklu c3RhbmNlKFBhc3NSZWZQdHI8Um9vdE9iamVjdD4gcm9vdE9iamVjdCkKLSAgICA6IF9yb290T2Jq ZWN0KHJvb3RPYmplY3QpCisgICAgOiBtX3Jvb3RPYmplY3Qocm9vdE9iamVjdCkKICAgICAsIG1f cnVudGltZU9iamVjdCgwKQogewotICAgIEFTU0VSVChfcm9vdE9iamVjdCk7CisgICAgQVNTRVJU KG1fcm9vdE9iamVjdCk7CiB9CiAKIEluc3RhbmNlOjp+SW5zdGFuY2UoKQpAQCAtODIsMjggKzg0 LDI4IEBAIHZvaWQgSW5zdGFuY2U6OmVuZCgpCiAKIFJ1bnRpbWVPYmplY3RJbXAqIEluc3RhbmNl OjpjcmVhdGVSdW50aW1lT2JqZWN0KEV4ZWNTdGF0ZSogZXhlYykKIHsKLSAgICBBU1NFUlQoX3Jv b3RPYmplY3QpOwotICAgIEFTU0VSVChfcm9vdE9iamVjdC0+aXNWYWxpZCgpKTsKKyAgICBBU1NF UlQobV9yb290T2JqZWN0KTsKKyAgICBBU1NFUlQobV9yb290T2JqZWN0LT5pc1ZhbGlkKCkpOwog ICAgIGlmIChtX3J1bnRpbWVPYmplY3QpCiAgICAgICAgIHJldHVybiBtX3J1bnRpbWVPYmplY3Q7 CiAgICAgSlNMb2NrIGxvY2soU2lsZW5jZUFzc2VydGlvbnNPbmx5KTsKICAgICBtX3J1bnRpbWVP YmplY3QgPSBuZXdSdW50aW1lT2JqZWN0KGV4ZWMpOwotICAgIF9yb290T2JqZWN0LT5hZGRSdW50 aW1lT2JqZWN0KG1fcnVudGltZU9iamVjdCk7CisgICAgbV9yb290T2JqZWN0LT5hZGRSdW50aW1l T2JqZWN0KG1fcnVudGltZU9iamVjdCk7CiAgICAgcmV0dXJuIG1fcnVudGltZU9iamVjdDsKIH0K IAogUnVudGltZU9iamVjdEltcCogSW5zdGFuY2U6Om5ld1J1bnRpbWVPYmplY3QoRXhlY1N0YXRl KiBleGVjKQogewogICAgIEpTTG9jayBsb2NrKFNpbGVuY2VBc3NlcnRpb25zT25seSk7Ci0gICAg cmV0dXJuIG5ldyAoZXhlYykgUnVudGltZU9iamVjdEltcChleGVjLCB0aGlzKTsKKyAgICByZXR1 cm4gbmV3IChleGVjKVJ1bnRpbWVPYmplY3RJbXAoZXhlYywgdGhpcyk7CiB9CiAKIHZvaWQgSW5z dGFuY2U6OndpbGxEZXN0cm95UnVudGltZU9iamVjdCgpCiB7Ci0gICAgQVNTRVJUKF9yb290T2Jq ZWN0KTsKLSAgICBBU1NFUlQoX3Jvb3RPYmplY3QtPmlzVmFsaWQoKSk7CisgICAgQVNTRVJUKG1f cm9vdE9iamVjdCk7CisgICAgQVNTRVJUKG1fcm9vdE9iamVjdC0+aXNWYWxpZCgpKTsKICAgICBB U1NFUlQobV9ydW50aW1lT2JqZWN0KTsKLSAgICBfcm9vdE9iamVjdC0+cmVtb3ZlUnVudGltZU9i amVjdChtX3J1bnRpbWVPYmplY3QpOworICAgIG1fcm9vdE9iamVjdC0+cmVtb3ZlUnVudGltZU9i amVjdChtX3J1bnRpbWVPYmplY3QpOwogICAgIG1fcnVudGltZU9iamVjdCA9IDA7CiB9CiAKQEAg LTExMyw5ICsxMTUsMTEgQEAgdm9pZCBJbnN0YW5jZTo6d2lsbEludmFsaWRhdGVSdW50aW1lT2Jq ZQogICAgIG1fcnVudGltZU9iamVjdCA9IDA7CiB9CiAKLVJvb3RPYmplY3QqIEluc3RhbmNlOjpy b290T2JqZWN0KCkgY29uc3QgCi17IAotICAgIHJldHVybiBfcm9vdE9iamVjdCAmJiBfcm9vdE9i amVjdC0+aXNWYWxpZCgpID8gX3Jvb3RPYmplY3QuZ2V0KCkgOiAwOworUm9vdE9iamVjdCogSW5z dGFuY2U6OnJvb3RPYmplY3QoKSBjb25zdAoreworICAgIHJldHVybiBtX3Jvb3RPYmplY3QgJiYg bV9yb290T2JqZWN0LT5pc1ZhbGlkKCkgPyBtX3Jvb3RPYmplY3QuZ2V0KCkgOiAwOwogfQogCi19 IH0gLy8gbmFtZXNwYWNlIEpTQzo6QmluZGluZ3MKK30gLy8gbmFtZXNwYWNlIEJpbmRpbmdzCisK K30gLy8gbmFtZXNwYWNlIEpTQwpJbmRleDogV2ViQ29yZS9icmlkZ2UvQnJpZGdlLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9icmlkZ2UvQnJpZGdlLmgJKHJldmlzaW9uIDUzNDY0KQorKysgV2Vi Q29yZS9icmlkZ2UvQnJpZGdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTIwLDcgKzIwLDcgQEAKICAq IFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9O IEFOWSBUSEVPUlkKICAqIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNU IExJQUJJTElUWSwgT1IgVE9SVAogICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lT RSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCi0gKiBPRiBUSElTIFNPRlRXQVJF LCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLiAKKyAq IE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0Yg U1VDSCBEQU1BR0UuCiAgKi8KIAogI2lmbmRlZiBCcmlkZ2VfaApAQCAtNTgsNyArNTgsNyBAQCBw dWJsaWM6CiBjbGFzcyBNZXRob2QgOiBwdWJsaWMgTm9uY29weWFibGUgewogcHVibGljOgogICAg IHZpcnR1YWwgaW50IG51bVBhcmFtZXRlcnMoKSBjb25zdCA9IDA7Ci0gICAgICAgIAorCiAgICAg dmlydHVhbCB+TWV0aG9kKCkgeyB9CiB9OwogCkBAIC04NSwxMiArODUsMTIgQEAgcHVibGljOgog ICAgIC8vIGFueSBuZWVkZWQgc3RhdGUuCiAgICAgdm9pZCBiZWdpbigpOwogICAgIHZvaWQgZW5k KCk7Ci0gICAgCisKICAgICB2aXJ0dWFsIENsYXNzKiBnZXRDbGFzcygpIGNvbnN0ID0gMDsKICAg ICBSdW50aW1lT2JqZWN0SW1wKiBjcmVhdGVSdW50aW1lT2JqZWN0KEV4ZWNTdGF0ZSopOwogICAg IHZvaWQgd2lsbEludmFsaWRhdGVSdW50aW1lT2JqZWN0KCk7CiAgICAgdm9pZCB3aWxsRGVzdHJv eVJ1bnRpbWVPYmplY3QoKTsKLSAgICAKKwogICAgIC8vIFJldHVybnMgZmFsc2UgaWYgdGhlIHZh bHVlIHdhcyBub3Qgc2V0IHN1Y2Nlc3NmdWxseS4KICAgICB2aXJ0dWFsIGJvb2wgc2V0VmFsdWVP ZlVuZGVmaW5lZEZpZWxkKEV4ZWNTdGF0ZSosIGNvbnN0IElkZW50aWZpZXImLCBKU1ZhbHVlKSB7 IHJldHVybiBmYWxzZTsgfQogCkBAIC05OCwxOCArOTgsMTggQEAgcHVibGljOgogCiAgICAgdmly dHVhbCBib29sIHN1cHBvcnRzSW52b2tlRGVmYXVsdE1ldGhvZCgpIGNvbnN0IHsgcmV0dXJuIGZh bHNlOyB9CiAgICAgdmlydHVhbCBKU1ZhbHVlIGludm9rZURlZmF1bHRNZXRob2QoRXhlY1N0YXRl KiwgY29uc3QgQXJnTGlzdCYpIHsgcmV0dXJuIGpzVW5kZWZpbmVkKCk7IH0KLSAgICAKKwogICAg IHZpcnR1YWwgYm9vbCBzdXBwb3J0c0NvbnN0cnVjdCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9 CiAgICAgdmlydHVhbCBKU1ZhbHVlIGludm9rZUNvbnN0cnVjdChFeGVjU3RhdGUqLCBjb25zdCBB cmdMaXN0JikgeyByZXR1cm4gSlNWYWx1ZSgpOyB9Ci0gICAgCisKICAgICB2aXJ0dWFsIHZvaWQg Z2V0UHJvcGVydHlOYW1lcyhFeGVjU3RhdGUqLCBQcm9wZXJ0eU5hbWVBcnJheSYpIHsgfQogCiAg ICAgdmlydHVhbCBKU1ZhbHVlIGRlZmF1bHRWYWx1ZShFeGVjU3RhdGUqLCBQcmVmZXJyZWRQcmlt aXRpdmVUeXBlKSBjb25zdCA9IDA7Ci0gICAgCisKICAgICB2aXJ0dWFsIEpTVmFsdWUgdmFsdWVP ZihFeGVjU3RhdGUqIGV4ZWMpIGNvbnN0ID0gMDsKLSAgICAKKwogICAgIFJvb3RPYmplY3QqIHJv b3RPYmplY3QoKSBjb25zdDsKLSAgICAKKwogICAgIHZpcnR1YWwgfkluc3RhbmNlKCk7CiAKICAg ICB2aXJ0dWFsIGJvb2wgZ2V0T3duUHJvcGVydHlTbG90KEpTT2JqZWN0KiwgRXhlY1N0YXRlKiwg Y29uc3QgSWRlbnRpZmllciYsIFByb3BlcnR5U2xvdCYpIHsgcmV0dXJuIGZhbHNlOyB9CkBAIC0x MjEsNyArMTIxLDcgQEAgcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgdm9pZCB2aXJ0dWFsRW5kKCkg eyB9CiAgICAgdmlydHVhbCBSdW50aW1lT2JqZWN0SW1wKiBuZXdSdW50aW1lT2JqZWN0KEV4ZWNT dGF0ZSopOwogCi0gICAgUmVmUHRyPFJvb3RPYmplY3Q+IF9yb290T2JqZWN0OworICAgIFJlZlB0 cjxSb290T2JqZWN0PiBtX3Jvb3RPYmplY3Q7CiAKIHByaXZhdGU6CiAgICAgUnVudGltZU9iamVj dEltcCogbV9ydW50aW1lT2JqZWN0OwpAQCAtMTMxLDIxICsxMzEsMjEgQEAgY2xhc3MgQXJyYXkg OiBwdWJsaWMgTm9uY29weWFibGUgewogcHVibGljOgogICAgIEFycmF5KFBhc3NSZWZQdHI8Um9v dE9iamVjdD4pOwogICAgIHZpcnR1YWwgfkFycmF5KCk7Ci0gICAgCisKICAgICB2aXJ0dWFsIHZv aWQgc2V0VmFsdWVBdChFeGVjU3RhdGUqLCB1bnNpZ25lZCBpbmRleCwgSlNWYWx1ZSkgY29uc3Qg PSAwOwogICAgIHZpcnR1YWwgSlNWYWx1ZSB2YWx1ZUF0KEV4ZWNTdGF0ZSosIHVuc2lnbmVkIGlu ZGV4KSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCB1bnNpZ25lZCBpbnQgZ2V0TGVuZ3RoKCkgY29u c3QgPSAwOwogCiBwcm90ZWN0ZWQ6Ci0gICAgUmVmUHRyPFJvb3RPYmplY3Q+IF9yb290T2JqZWN0 OworICAgIFJlZlB0cjxSb290T2JqZWN0PiBtX3Jvb3RPYmplY3Q7CiB9OwogCiBjb25zdCBjaGFy KiBzaWduYXR1cmVGb3JQYXJhbWV0ZXJzKGNvbnN0IEFyZ0xpc3QmKTsKIAogdHlwZWRlZiBIYXNo TWFwPFJlZlB0cjxVU3RyaW5nOjpSZXA+LCBNZXRob2RMaXN0Kj4gTWV0aG9kTGlzdE1hcDsKLXR5 cGVkZWYgSGFzaE1hcDxSZWZQdHI8VVN0cmluZzo6UmVwPiwgTWV0aG9kKj4gTWV0aG9kTWFwOyAK LXR5cGVkZWYgSGFzaE1hcDxSZWZQdHI8VVN0cmluZzo6UmVwPiwgRmllbGQqPiBGaWVsZE1hcDsg Ci0gICAgCit0eXBlZGVmIEhhc2hNYXA8UmVmUHRyPFVTdHJpbmc6OlJlcD4sIE1ldGhvZCo+IE1l dGhvZE1hcDsKK3R5cGVkZWYgSGFzaE1hcDxSZWZQdHI8VVN0cmluZzo6UmVwPiwgRmllbGQqPiBG aWVsZE1hcDsKKwogfSAvLyBuYW1lc3BhY2UgQmluZGluZ3MKIAogfSAvLyBuYW1lc3BhY2UgSlND CkluZGV4OiBXZWJDb3JlL2JyaWRnZS9jL2NfaW5zdGFuY2UuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvYnJpZGdlL2MvY19pbnN0YW5jZS5jcHAJKHJldmlzaW9uIDUzNDUwKQorKysgV2ViQ29y ZS9icmlkZ2UvYy9jX2luc3RhbmNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTM4LDcgKzEzOCw3 IEBAIEpTVmFsdWUgQ0luc3RhbmNlOjppbnZva2VNZXRob2QoRXhlY1N0YXQKICAgICBmb3IgKGkg PSAwOyBpIDwgY291bnQ7IGkrKykKICAgICAgICAgX05QTl9SZWxlYXNlVmFyaWFudFZhbHVlKCZj QXJnc1tpXSk7CiAKLSAgICBKU1ZhbHVlIHJlc3VsdFZhbHVlID0gY29udmVydE5QVmFyaWFudFRv VmFsdWUoZXhlYywgJnJlc3VsdFZhcmlhbnQsIF9yb290T2JqZWN0LmdldCgpKTsKKyAgICBKU1Zh bHVlIHJlc3VsdFZhbHVlID0gY29udmVydE5QVmFyaWFudFRvVmFsdWUoZXhlYywgJnJlc3VsdFZh cmlhbnQsIG1fcm9vdE9iamVjdC5nZXQoKSk7CiAgICAgX05QTl9SZWxlYXNlVmFyaWFudFZhbHVl KCZyZXN1bHRWYXJpYW50KTsKICAgICByZXR1cm4gcmVzdWx0VmFsdWU7CiB9CkBAIC0xNzMsNyAr MTczLDcgQEAgSlNWYWx1ZSBDSW5zdGFuY2U6Omludm9rZURlZmF1bHRNZXRob2QoRQogICAgIGZv ciAoaSA9IDA7IGkgPCBjb3VudDsgaSsrKQogICAgICAgICBfTlBOX1JlbGVhc2VWYXJpYW50VmFs dWUoJmNBcmdzW2ldKTsKIAotICAgIEpTVmFsdWUgcmVzdWx0VmFsdWUgPSBjb252ZXJ0TlBWYXJp YW50VG9WYWx1ZShleGVjLCAmcmVzdWx0VmFyaWFudCwgX3Jvb3RPYmplY3QuZ2V0KCkpOworICAg IEpTVmFsdWUgcmVzdWx0VmFsdWUgPSBjb252ZXJ0TlBWYXJpYW50VG9WYWx1ZShleGVjLCAmcmVz dWx0VmFyaWFudCwgbV9yb290T2JqZWN0LmdldCgpKTsKICAgICBfTlBOX1JlbGVhc2VWYXJpYW50 VmFsdWUoJnJlc3VsdFZhcmlhbnQpOwogICAgIHJldHVybiByZXN1bHRWYWx1ZTsKIH0KQEAgLTIx Miw3ICsyMTIsNyBAQCBKU1ZhbHVlIENJbnN0YW5jZTo6aW52b2tlQ29uc3RydWN0KEV4ZWNTCiAg ICAgZm9yIChpID0gMDsgaSA8IGNvdW50OyBpKyspCiAgICAgICAgIF9OUE5fUmVsZWFzZVZhcmlh bnRWYWx1ZSgmY0FyZ3NbaV0pOwogCi0gICAgSlNWYWx1ZSByZXN1bHRWYWx1ZSA9IGNvbnZlcnRO UFZhcmlhbnRUb1ZhbHVlKGV4ZWMsICZyZXN1bHRWYXJpYW50LCBfcm9vdE9iamVjdC5nZXQoKSk7 CisgICAgSlNWYWx1ZSByZXN1bHRWYWx1ZSA9IGNvbnZlcnROUFZhcmlhbnRUb1ZhbHVlKGV4ZWMs ICZyZXN1bHRWYXJpYW50LCBtX3Jvb3RPYmplY3QuZ2V0KCkpOwogICAgIF9OUE5fUmVsZWFzZVZh cmlhbnRWYWx1ZSgmcmVzdWx0VmFyaWFudCk7CiAgICAgcmV0dXJuIHJlc3VsdFZhbHVlOwogfQpJ bmRleDogV2ViQ29yZS9icmlkZ2Uvam5pL2puaV9ydW50aW1lLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL2JyaWRnZS9qbmkvam5pX3J1bnRpbWUuY3BwCShyZXZpc2lvbiA1MzQ1MCkKKysrIFdl YkNvcmUvYnJpZGdlL2puaS9qbmlfcnVudGltZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM3OSw3 ICszNzksNyBAQCBKYXZhQXJyYXk6OkphdmFBcnJheShqb2JqZWN0IGFycmF5LCBjb25zCiAgICAg Sk5JRW52ICplbnYgPSBnZXRKTklFbnYoKTsKICAgICBfbGVuZ3RoID0gZW52LT5HZXRBcnJheUxl bmd0aCgoamFycmF5KV9hcnJheS0+bV9pbnN0YW5jZSk7CiAgICAgX3R5cGUgPSBzdHJkdXAodHlw ZSk7Ci0gICAgX3Jvb3RPYmplY3QgPSByb290T2JqZWN0OworICAgIG1fcm9vdE9iamVjdCA9IHJv b3RPYmplY3Q7CiB9CiAKIEphdmFBcnJheTo6fkphdmFBcnJheSAoKSAKQEAgLTM4OSw3ICszODks NyBAQCBKYXZhQXJyYXk6On5KYXZhQXJyYXkgKCkgCiAKIFJvb3RPYmplY3QqIEphdmFBcnJheTo6 cm9vdE9iamVjdCgpIGNvbnN0IAogeyAKLSAgICByZXR1cm4gX3Jvb3RPYmplY3QgJiYgX3Jvb3RP YmplY3QtPmlzVmFsaWQoKSA/IF9yb290T2JqZWN0LmdldCgpIDogMDsKKyAgICByZXR1cm4gbV9y b290T2JqZWN0ICYmIG1fcm9vdE9iamVjdC0+aXNWYWxpZCgpID8gbV9yb290T2JqZWN0LmdldCgp IDogMDsKIH0KIAogdm9pZCBKYXZhQXJyYXk6OnNldFZhbHVlQXQoRXhlY1N0YXRlKiBleGVjLCB1 bnNpZ25lZCBpbmRleCwgSlNWYWx1ZSBhVmFsdWUpIGNvbnN0CkluZGV4OiBXZWJDb3JlL2JyaWRn ZS9vYmpjL29iamNfaW5zdGFuY2UubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9icmlkZ2Uvb2Jq Yy9vYmpjX2luc3RhbmNlLm1tCShyZXZpc2lvbiA1MzQ1MCkKKysrIFdlYkNvcmUvYnJpZGdlL29i amMvb2JqY19pbnN0YW5jZS5tbQkod29ya2luZyBjb3B5KQpAQCAtMjc3LDcgKzI3Nyw3IEBAIEpT VmFsdWUgT2JqY0luc3RhbmNlOjppbnZva2VNZXRob2QoRXhlY1MKIAogICAgIGlmICgqdHlwZSAh PSAndicpIHsKICAgICAgICAgW2ludm9jYXRpb24gZ2V0UmV0dXJuVmFsdWU6YnVmZmVyXTsKLSAg ICAgICAgcmVzdWx0ID0gY29udmVydE9iamNWYWx1ZVRvVmFsdWUoZXhlYywgYnVmZmVyLCBvYmpj VmFsdWVUeXBlLCBfcm9vdE9iamVjdC5nZXQoKSk7CisgICAgICAgIHJlc3VsdCA9IGNvbnZlcnRP YmpjVmFsdWVUb1ZhbHVlKGV4ZWMsIGJ1ZmZlciwgb2JqY1ZhbHVlVHlwZSwgbV9yb290T2JqZWN0 LmdldCgpKTsKICAgICB9CiB9IEBjYXRjaChOU0V4Y2VwdGlvbiogbG9jYWxFeGNlcHRpb24pIHsK IH0KQEAgLTMyOSw3ICszMjksNyBAQCBKU1ZhbHVlIE9iamNJbnN0YW5jZTo6aW52b2tlRGVmYXVs dE1ldGhvCiAgICAgLy8gT0sgd2l0aCAzMiBoZXJlLgogICAgIGNoYXIgYnVmZmVyWzMyXTsKICAg ICBbaW52b2NhdGlvbiBnZXRSZXR1cm5WYWx1ZTpidWZmZXJdOwotICAgIHJlc3VsdCA9IGNvbnZl cnRPYmpjVmFsdWVUb1ZhbHVlKGV4ZWMsIGJ1ZmZlciwgb2JqY1ZhbHVlVHlwZSwgX3Jvb3RPYmpl Y3QuZ2V0KCkpOworICAgIHJlc3VsdCA9IGNvbnZlcnRPYmpjVmFsdWVUb1ZhbHVlKGV4ZWMsIGJ1 ZmZlciwgb2JqY1ZhbHVlVHlwZSwgbV9yb290T2JqZWN0LmdldCgpKTsKIH0gQGNhdGNoKE5TRXhj ZXB0aW9uKiBsb2NhbEV4Y2VwdGlvbikgewogfQogICAgIG1vdmVHbG9iYWxFeGNlcHRpb25Ub0V4 ZWNTdGF0ZShleGVjKTsKQEAgLTM4Myw3ICszODMsNyBAQCBKU1ZhbHVlIE9iamNJbnN0YW5jZTo6 Z2V0VmFsdWVPZlVuZGVmaW5lCiAgICAgCiAgICAgICAgIEB0cnkgewogICAgICAgICAgICAgaWQg b2JqY1ZhbHVlID0gW3RhcmdldE9iamVjdCB2YWx1ZUZvclVuZGVmaW5lZEtleTpbTlNTdHJpbmcg c3RyaW5nV2l0aENTdHJpbmc6cHJvcGVydHkuYXNjaWkoKSBlbmNvZGluZzpOU0FTQ0lJU3RyaW5n RW5jb2RpbmddXTsKLSAgICAgICAgICAgIHJlc3VsdCA9IGNvbnZlcnRPYmpjVmFsdWVUb1ZhbHVl KGV4ZWMsICZvYmpjVmFsdWUsIE9iamNPYmplY3RUeXBlLCBfcm9vdE9iamVjdC5nZXQoKSk7Cisg ICAgICAgICAgICByZXN1bHQgPSBjb252ZXJ0T2JqY1ZhbHVlVG9WYWx1ZShleGVjLCAmb2JqY1Zh bHVlLCBPYmpjT2JqZWN0VHlwZSwgbV9yb290T2JqZWN0LmdldCgpKTsKICAgICAgICAgfSBAY2F0 Y2goTlNFeGNlcHRpb24qIGxvY2FsRXhjZXB0aW9uKSB7CiAgICAgICAgICAgICAvLyBEbyBub3Ro aW5nLiAgQ2xhc3MgZGlkIG5vdCBvdmVycmlkZSB2YWx1ZUZvclVuZGVmaW5lZEtleTouCiAgICAg ICAgIH0KSW5kZXg6IFdlYkNvcmUvYnJpZGdlL29iamMvb2JqY19ydW50aW1lLm1tCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvYnJpZGdlL29iamMvb2JqY19ydW50aW1lLm1tCShyZXZpc2lvbiA1MzQ1 MCkKKysrIFdlYkNvcmUvYnJpZGdlL29iamMvb2JqY19ydW50aW1lLm1tCSh3b3JraW5nIGNvcHkp CkBAIC0xNzQsNyArMTc0LDcgQEAgSlNWYWx1ZSBPYmpjQXJyYXk6OnZhbHVlQXQoRXhlY1N0YXRl KiBleAogICAgIEB0cnkgewogICAgICAgICBpZCBvYmogPSBbX2FycmF5LmdldCgpIG9iamVjdEF0 SW5kZXg6aW5kZXhdOwogICAgICAgICBpZiAob2JqKQotICAgICAgICAgICAgcmV0dXJuIGNvbnZl cnRPYmpjVmFsdWVUb1ZhbHVlIChleGVjLCAmb2JqLCBPYmpjT2JqZWN0VHlwZSwgX3Jvb3RPYmpl Y3QuZ2V0KCkpOworICAgICAgICAgICAgcmV0dXJuIGNvbnZlcnRPYmpjVmFsdWVUb1ZhbHVlIChl eGVjLCAmb2JqLCBPYmpjT2JqZWN0VHlwZSwgbV9yb290T2JqZWN0LmdldCgpKTsKICAgICB9IEBj YXRjaChOU0V4Y2VwdGlvbiogbG9jYWxFeGNlcHRpb24pIHsKICAgICAgICAgcmV0dXJuIHRocm93 RXJyb3IoZXhlYywgR2VuZXJhbEVycm9yLCAiT2JqZWN0aXZlLUMgZXhjZXB0aW9uLiIpOwogICAg IH0KSW5kZXg6IFdlYkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRpbWUuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRpbWUuY3BwCShyZXZpc2lvbiA1MzQ2NCkKKysrIFdl YkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRpbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNzQzLDcg KzE3NDMsNyBAQCB0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4gUXRBcnJheTxUPjo6flF0QXJyCiAKIHRl bXBsYXRlIDx0eXBlbmFtZSBUPiBSb290T2JqZWN0KiBRdEFycmF5PFQ+Ojpyb290T2JqZWN0KCkg Y29uc3QKIHsKLSAgICByZXR1cm4gX3Jvb3RPYmplY3QgJiYgX3Jvb3RPYmplY3QtPmlzVmFsaWQo KSA/IF9yb290T2JqZWN0LmdldCgpIDogMDsKKyAgICByZXR1cm4gbV9yb290T2JqZWN0ICYmIG1f cm9vdE9iamVjdC0+aXNWYWxpZCgpID8gbV9yb290T2JqZWN0LmdldCgpIDogMDsKIH0KIAogdGVt cGxhdGUgPHR5cGVuYW1lIFQ+IHZvaWQgUXRBcnJheTxUPjo6c2V0VmFsdWVBdChFeGVjU3RhdGUq IGV4ZWMsIHVuc2lnbmVkIGluZGV4LCBKU1ZhbHVlIGFWYWx1ZSkgY29uc3QK