43035 2010-07-27 03:03:09 -0700 [Chromium] Make Chromium compile with ENABLE_DATABASE=0 2010-07-27 18:09:13 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dumi dumi levin michaeln oldest_to_newest 256478 0 dumi 2010-07-27 03:03:09 -0700 We need to move all WebSQLDatabases code behind #if ENABLE(DATABASE) and make Chromium compile with ENABLE_DATABASE=0. 256719 1 62717 dumi 2010-07-27 11:34:01 -0700 Created attachment 62717 patch 256745 2 levin 2010-07-27 12:13:01 -0700 I would be happy to r+ this except I can't figure out why various files have the ifdef's removed. (Beating a dead horse, some very short ChangeLog comments would be helpful in explaining this.) 256751 3 dumi 2010-07-27 12:23:35 -0700 (In reply to comment #2) > I would be happy to r+ this except I can't figure out why various files have the ifdef's removed. (Beating a dead horse, some very short ChangeLog comments would be helpful in explaining this.) there's a layer of "general" DB classes in WebCore/platform/sql/, and then a layer of HTML5 DB classes in WebCore/storage/. DatabaseAuthorizer.cpp and ChromiumBridge.{h|cpp} are used by the "general" DB classes, which are used by other features too (like Geolocation). so those functions need to be compiled in even when HTML5 DBs are turned off. i'll add this to the ChangeLog comments and re-upload the patch in a second. 256755 4 62726 dumi 2010-07-27 12:29:16 -0700 Created attachment 62726 patch 256960 5 dumi 2010-07-27 18:08:50 -0700 landed: r64151. 256962 6 dumi 2010-07-27 18:09:13 -0700 landed: r64151. 62717 2010-07-27 11:34:01 -0700 2010-07-27 12:29:16 -0700 patch patch text/plain 11200 dumi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NDE0MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTAtMDctMjcgIER1bWl0cnUgRGFuaWxpdWMgIDxkdW1pQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBNb3ZlIGFsbCBXZWJTUUxEYXRhYmFzZXMtc3BlY2lmaWMgY29kZSBiZWhpbmQgI2lmIEVOQUJM RShEQVRBQkFTRSkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00MzAzNQorCisgICAgICAgIE1ha2UgQ2hyb21pdW0gY29tcGlsZSB3aXRoIEVOQUJMRV9E QVRBQkFTRT0wLgorCisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4RE9NV2luZG93Q3Vz dG9tLmNwcDoKKyAgICAgICAgKiBwYWdlL0RPTVdpbmRvdy5pZGw6CisgICAgICAgICogcGxhdGZv cm0vY2hyb21pdW0vQ2hyb21pdW1CcmlkZ2UuaDoKKyAgICAgICAgKiBzdG9yYWdlL0RhdGFiYXNl QXV0aG9yaXplci5jcHA6CisgICAgICAgICogc3RvcmFnZS9jaHJvbWl1bS9EYXRhYmFzZU9ic2Vy dmVyLmg6CisgICAgICAgICogc3RvcmFnZS9jaHJvbWl1bS9EYXRhYmFzZVRyYWNrZXJDaHJvbWl1 bS5jcHA6CisgICAgICAgICogc3RvcmFnZS9jaHJvbWl1bS9RdW90YVRyYWNrZXIuY3BwOgorICAg ICAgICAqIHN0b3JhZ2UvY2hyb21pdW0vUXVvdGFUcmFja2VyLmg6CisgICAgICAgICogc3RvcmFn ZS9jaHJvbWl1bS9TUUxUcmFuc2FjdGlvbkNsaWVudENocm9taXVtLmNwcDoKKwogMjAxMC0wNy0y NyAgVmljdG9yIFdhbmcgIDx2aWN0b3J3QGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmll d2VkLCByb2xsaW5nIG91dCByNjQxMDQuCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3Rv bS9WOERPTVdpbmRvd0N1c3RvbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92 OC9jdXN0b20vVjhET01XaW5kb3dDdXN0b20uY3BwCShyZXZpc2lvbiA2NDE0MykKKysrIFdlYkNv cmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RE9NV2luZG93Q3VzdG9tLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNzkwLDYgKzc5MCw3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOERPTVdpbmRvdzo6 c2V0SW4KICAgICByZXR1cm4gV2luZG93U2V0VGltZW91dEltcGwoYXJncywgZmFsc2UpOwogfQog CisjaWYgRU5BQkxFKERBVEFCQVNFKQogdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4RE9NV2luZG93 OjpvcGVuRGF0YWJhc2VDYWxsYmFjayhjb25zdCB2ODo6QXJndW1lbnRzJiBhcmdzKQogewogICAg IElOQ19TVEFUUygiRE9NLkRPTVdpbmRvdy5vcGVuRGF0YWJhc2UiKTsKQEAgLTgxOSw2ICs4MjAs NyBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhET01XaW5kb3c6Om9wZW5ECiAgICAgVjhQcm94 eTo6c2V0RE9NRXhjZXB0aW9uKGVjKTsKICAgICByZXR1cm4gcmVzdWx0OwogfQorI2VuZGlmIC8v IEVOQUJMRShEQVRBQkFTRSkKIAogYm9vbCBWOERPTVdpbmRvdzo6bmFtZWRTZWN1cml0eUNoZWNr KHY4OjpMb2NhbDx2ODo6T2JqZWN0PiBob3N0LCB2ODo6TG9jYWw8djg6OlZhbHVlPiBrZXksIHY4 OjpBY2Nlc3NUeXBlIHR5cGUsIHY4OjpMb2NhbDx2ODo6VmFsdWU+KQogewpJbmRleDogV2ViQ29y ZS9wYWdlL0RPTVdpbmRvdy5pZGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL0RPTVdpbmRv dy5pZGwJKHJldmlzaW9uIDY0MTQzKQorKysgV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5pZGwJKHdv cmtpbmcgY29weSkKQEAgLTc0MSw5ICs3NDEsNyBAQCBtb2R1bGUgd2luZG93IHsKICNlbmRpZgog I2VuZGlmCiAKLSNpZiBkZWZpbmVkKEVOQUJMRV9EQVRBQkFTRSkKLSAgICAgICAgYXR0cmlidXRl IFNRTEV4Y2VwdGlvbkNvbnN0cnVjdG9yIFNRTEV4Y2VwdGlvbjsKLSNlbmRpZgorICAgICAgICBh dHRyaWJ1dGUgW0NvbmRpdGlvbmFsPURBVEFCQVNFXSBTUUxFeGNlcHRpb25Db25zdHJ1Y3RvciBT UUxFeGNlcHRpb247CiAKICAgICAgICAgYXR0cmlidXRlIFtDb25kaXRpb25hbD1UT1VDSF9FVkVO VFNdIFRvdWNoRXZlbnRDb25zdHJ1Y3RvciBUb3VjaEV2ZW50OwogCkluZGV4OiBXZWJDb3JlL3Bs YXRmb3JtL2Nocm9taXVtL0Nocm9taXVtQnJpZGdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9w bGF0Zm9ybS9jaHJvbWl1bS9DaHJvbWl1bUJyaWRnZS5oCShyZXZpc2lvbiA2NDE0MykKKysrIFdl YkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vQ2hyb21pdW1CcmlkZ2UuaAkod29ya2luZyBjb3B5KQpA QCAtMTU1LDggKzE1NSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgLy8gR2VvbG9j YXRpb24gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0KICAgICAgICAgc3RhdGljIEdlb2xvY2F0aW9uU2VydmljZUJyaWRnZSogY3JlYXRlR2Vv bG9jYXRpb25TZXJ2aWNlQnJpZGdlKEdlb2xvY2F0aW9uU2VydmljZUNocm9taXVtKik7CiAKLSAg ICAgICAgLy8gSFRNTDUgREIgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0KLSNpZiBFTkFCTEUoREFUQUJBU0UpCisgICAgICAgIC8vIERh dGFiYXNlcyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiAgICAgICAgIC8vIFJldHVybnMgYSBoYW5kbGUgdG8gdGhlIERCIGZpbGUgYW5k IG9vcHRpb25hbGx5IGEgaGFuZGxlIHRvIGl0cyBjb250YWluaW5nIGRpcmVjdG9yeQogICAgICAg ICBzdGF0aWMgUGxhdGZvcm1GaWxlSGFuZGxlIGRhdGFiYXNlT3BlbkZpbGUoY29uc3QgU3RyaW5n JiB2ZnNGbGVOYW1lLCBpbnQgZGVzaXJlZEZsYWdzKTsKICAgICAgICAgLy8gUmV0dXJucyBhIFNR TGl0ZSBjb2RlIChTUUxJVEVfT0sgPSAwLCBvbiBzdWNjZXNzKQpAQCAtMTY1LDcgKzE2NCw2IEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgc3RhdGljIGxvbmcgZGF0YWJhc2VHZXRGaWxl QXR0cmlidXRlcyhjb25zdCBTdHJpbmcmIHZmc0ZpbGVOYW1lKTsKICAgICAgICAgLy8gUmV0dXJu cyB0aGUgc2l6ZSBvZiB0aGUgREIgZmlsZQogICAgICAgICBzdGF0aWMgbG9uZyBsb25nIGRhdGFi YXNlR2V0RmlsZVNpemUoY29uc3QgU3RyaW5nJiB2ZnNGaWxlTmFtZSk7Ci0jZW5kaWYKIAogICAg ICAgICAvLyBJbmRleGVkREIgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLQogICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxJbmRleGVkRGF0 YWJhc2U+IGluZGV4ZWREYXRhYmFzZSgpOwpJbmRleDogV2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNl QXV0aG9yaXplci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNlQXV0 aG9yaXplci5jcHAJKHJldmlzaW9uIDY0MTQzKQorKysgV2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNl QXV0aG9yaXplci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI5LDcgKzI5LDYgQEAKICNpbmNsdWRl ICJjb25maWcuaCIKICNpbmNsdWRlICJEYXRhYmFzZUF1dGhvcml6ZXIuaCIKIAotI2lmIEVOQUJM RShEQVRBQkFTRSkKICNpbmNsdWRlICJQbGF0Zm9ybVN0cmluZy5oIgogI2luY2x1ZGUgPHd0Zi9Q YXNzUmVmUHRyLmg+CiAKQEAgLTQyMCw1ICs0MTksMyBAQCBpbnQgRGF0YWJhc2VBdXRob3JpemVy Ojp1cGRhdGVEZWxldGVzQmFzCiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKLQotI2VuZGlm IC8vIEVOQUJMRShEQVRBQkFTRSkKSW5kZXg6IFdlYkNvcmUvc3RvcmFnZS9jaHJvbWl1bS9EYXRh YmFzZU9ic2VydmVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9zdG9yYWdlL2Nocm9taXVtL0Rh dGFiYXNlT2JzZXJ2ZXIuaAkocmV2aXNpb24gNjQxNDMpCisrKyBXZWJDb3JlL3N0b3JhZ2UvY2hy b21pdW0vRGF0YWJhc2VPYnNlcnZlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMSw2ICszMSw4IEBA CiAjaWZuZGVmIERhdGFiYXNlT2JzZXJ2ZXJfaAogI2RlZmluZSBEYXRhYmFzZU9ic2VydmVyX2gK IAorI2lmIEVOQUJMRShEQVRBQkFTRSkKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBB YnN0cmFjdERhdGFiYXNlOwpAQCAtNDksNCArNTEsNiBAQCBwdWJsaWM6CiAKIH0KIAorI2VuZGlm IC8vIEVOQUJMRShEQVRBQkFTRSkKKwogI2VuZGlmIC8vIERhdGFiYXNlT2JzZXJ2ZXJfaApJbmRl eDogV2ViQ29yZS9zdG9yYWdlL2Nocm9taXVtL0RhdGFiYXNlVHJhY2tlckNocm9taXVtLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL3N0b3JhZ2UvY2hyb21pdW0vRGF0YWJhc2VUcmFja2VyQ2hy b21pdW0uY3BwCShyZXZpc2lvbiA2NDE0MykKKysrIFdlYkNvcmUvc3RvcmFnZS9jaHJvbWl1bS9E YXRhYmFzZVRyYWNrZXJDaHJvbWl1bS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxLDYgKzMxLDgg QEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJEYXRhYmFzZVRyYWNrZXIuaCIKIAor I2lmIEVOQUJMRShEQVRBQkFTRSkKKwogI2luY2x1ZGUgIkFic3RyYWN0RGF0YWJhc2UuaCIKICNp bmNsdWRlICJEYXRhYmFzZU9ic2VydmVyLmgiCiAjaW5jbHVkZSAiUXVvdGFUcmFja2VyLmgiCkBA IC0xNzMsMyArMTc1LDUgQEAgdW5zaWduZWQgbG9uZyBsb25nIERhdGFiYXNlVHJhY2tlcjo6Z2V0 TQogfQogCiB9CisKKyNlbmRpZiAvLyBFTkFCTEUoREFUQUJBU0UpCkluZGV4OiBXZWJDb3JlL3N0 b3JhZ2UvY2hyb21pdW0vUXVvdGFUcmFja2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3N0 b3JhZ2UvY2hyb21pdW0vUXVvdGFUcmFja2VyLmNwcAkocmV2aXNpb24gNjQxNDMpCisrKyBXZWJD b3JlL3N0b3JhZ2UvY2hyb21pdW0vUXVvdGFUcmFja2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MzEsOCArMzEsOSBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlF1b3RhVHJhY2tl ci5oIgogCisjaWYgRU5BQkxFKERBVEFCQVNFKQorCiAjaW5jbHVkZSA8d3RmL1N0ZExpYkV4dHJh cy5oPgotI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUg ewogCkBAIC02NywzICs2OCw1IEBAIHZvaWQgUXVvdGFUcmFja2VyOjp1cGRhdGVEYXRhYmFzZVNp emVBbmQKIH0KIAogfQorCisjZW5kaWYgLy8gRU5BQkxFKERBVEFCQVNFKQpJbmRleDogV2ViQ29y ZS9zdG9yYWdlL2Nocm9taXVtL1F1b3RhVHJhY2tlci5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv c3RvcmFnZS9jaHJvbWl1bS9RdW90YVRyYWNrZXIuaAkocmV2aXNpb24gNjQxNDMpCisrKyBXZWJD b3JlL3N0b3JhZ2UvY2hyb21pdW0vUXVvdGFUcmFja2VyLmgJKHdvcmtpbmcgY29weSkKQEAgLTMx LDEwICszMSwxMiBAQAogI2lmbmRlZiBRdW90YVRyYWNrZXJfaAogI2RlZmluZSBRdW90YVRyYWNr ZXJfaAogCisjaWYgRU5BQkxFKERBVEFCQVNFKQorCisjaW5jbHVkZSAiUGxhdGZvcm1TdHJpbmcu aCIKICNpbmNsdWRlICJTZWN1cml0eU9yaWdpbi5oIgogI2luY2x1ZGUgIlN0cmluZ0hhc2guaCIK ICNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgotI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4K IAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC02MCw0ICs2Miw2IEBAIHByaXZhdGU6CiAKIH0K IAorI2VuZGlmIC8vIEVOQUJMRShEQVRBQkFTRSkKKwogI2VuZGlmIC8vIFF1b3RhVHJhY2tlcl9o CkluZGV4OiBXZWJDb3JlL3N0b3JhZ2UvY2hyb21pdW0vU1FMVHJhbnNhY3Rpb25DbGllbnRDaHJv bWl1bS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9zdG9yYWdlL2Nocm9taXVtL1NRTFRyYW5z YWN0aW9uQ2xpZW50Q2hyb21pdW0uY3BwCShyZXZpc2lvbiA2NDE0MykKKysrIFdlYkNvcmUvc3Rv cmFnZS9jaHJvbWl1bS9TUUxUcmFuc2FjdGlvbkNsaWVudENocm9taXVtLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMzEsNiArMzEsOCBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlNR TFRyYW5zYWN0aW9uQ2xpZW50LmgiCiAKKyNpZiBFTkFCTEUoREFUQUJBU0UpCisKICNpbmNsdWRl ICJBYnN0cmFjdERhdGFiYXNlLmgiCiAjaW5jbHVkZSAiRGF0YWJhc2VPYnNlcnZlci5oIgogI2lu Y2x1ZGUgIlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQuaCIKQEAgLTgzLDMgKzg1LDUgQEAgYm9vbCBT UUxUcmFuc2FjdGlvbkNsaWVudDo6ZGlkRXhjZWVkUXVvdAogfQogCiB9CisKKyNlbmRpZiAvLyBF TkFCTEUoREFUQUJBU0UpCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDY0MTQzKQorKysgV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisy MDEwLTA3LTI3ICBEdW1pdHJ1IERhbmlsaXVjICA8ZHVtaUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZSBhbGwgV2ViU1FM RGF0YWJhc2VzLXNwZWNpZmljIGNvZGUgYmVoaW5kICNpZiBFTkFCTEUoREFUQUJBU0UpLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDMwMzUKKworICAg ICAgICBNYWtlIENocm9taXVtIGNvbXBpbGUgd2l0aCBFTkFCTEVfREFUQUJBU0U9MC4KKworICAg ICAgICAqIHNyYy9DaHJvbWl1bUJyaWRnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWl1 bUJyaWRnZTo6ZGF0YWJhc2VHZXRGaWxlU2l6ZSk6CisgICAgICAgICogc3JjL0RhdGFiYXNlT2Jz ZXJ2ZXIuY3BwOgorICAgICAgICAqIHNyYy9XZWJEYXRhYmFzZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpBYnN0cmFjdERhdGFiYXNlOjpzdHJpbmdJZGVudGlmaWVyKToKKyAgICAgICAgKFdlYkNv cmU6OkFic3RyYWN0RGF0YWJhc2U6OmRpc3BsYXlOYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OkFi c3RyYWN0RGF0YWJhc2U6OmVzdGltYXRlZFNpemUpOgorICAgICAgICAoV2ViQ29yZTo6QWJzdHJh Y3REYXRhYmFzZTo6c2VjdXJpdHlPcmlnaW4pOgorICAgICAgICAoV2ViS2l0OjpXZWJEYXRhYmFz ZTo6dXBkYXRlRGF0YWJhc2VTaXplKToKKyAgICAgICAgKFdlYktpdDo6V2ViRGF0YWJhc2U6OmNs b3NlRGF0YWJhc2VJbW1lZGlhdGVseSk6CisKIDIwMTAtMDctMjcgIFBhdmVsIFBvZGl2aWxvdiAg PHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVs ZG1hbi4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21pdW1CcmlkZ2UuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21pdW1CcmlkZ2UuY3BwCShyZXZpc2lv biA2NDE0MykKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21pdW1CcmlkZ2UuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC00NjksOSArNDY5LDggQEAgR2VvbG9jYXRpb25TZXJ2aWNlQnJpZGdlKiBD aHJvbWl1bUJyaWRnZQogICAgIHJldHVybiBjcmVhdGVHZW9sb2NhdGlvblNlcnZpY2VCcmlkZ2VJ bXBsKGdlb2xvY2F0aW9uU2VydmljZUNocm9taXVtKTsKIH0KIAotLy8gSFRNTDUgREIgLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLQorLy8gRGF0YWJhc2VzIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCi0jaWYgRU5BQkxFKERBVEFCQVNFKQogUGxh dGZvcm1GaWxlSGFuZGxlIENocm9taXVtQnJpZGdlOjpkYXRhYmFzZU9wZW5GaWxlKGNvbnN0IFN0 cmluZyYgdmZzRmlsZU5hbWUsIGludCBkZXNpcmVkRmxhZ3MpCiB7CiAgICAgcmV0dXJuIHdlYktp dENsaWVudCgpLT5kYXRhYmFzZU9wZW5GaWxlKFdlYlN0cmluZyh2ZnNGaWxlTmFtZSksIGRlc2ly ZWRGbGFncyk7CkBAIC00OTEsNyArNDkwLDYgQEAgbG9uZyBsb25nIENocm9taXVtQnJpZGdlOjpk YXRhYmFzZUdldEZpbAogewogICAgIHJldHVybiB3ZWJLaXRDbGllbnQoKS0+ZGF0YWJhc2VHZXRG aWxlU2l6ZShXZWJTdHJpbmcodmZzRmlsZU5hbWUpKTsKIH0KLSNlbmRpZgogCiAvLyBJbmRleGVk IERhdGFiYXNlIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tCiAKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvRGF0YWJhc2VPYnNlcnZl ci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9EYXRhYmFzZU9ic2VydmVy LmNwcAkocmV2aXNpb24gNjQxNDMpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL0RhdGFiYXNlT2Jz ZXJ2ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMSw2ICszMSw4IEBACiAjaW5jbHVkZSAiY29u ZmlnLmgiCiAjaW5jbHVkZSAiRGF0YWJhc2VPYnNlcnZlci5oIgogCisjaWYgRU5BQkxFKERBVEFC QVNFKQorCiAjaW5jbHVkZSAiQWJzdHJhY3REYXRhYmFzZS5oIgogI2luY2x1ZGUgIkRvY3VtZW50 LmgiCiAjaW5jbHVkZSAiU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5oIgpAQCAtODQsMyArODYsNSBA QCB2b2lkIERhdGFiYXNlT2JzZXJ2ZXI6OmRhdGFiYXNlQ2xvc2VkKEFiCiB9CiAKIH0gLy8gbmFt ZXNwYWNlIFdlYkNvcmUKKworI2VuZGlmIC8vIEVOQUJMRShEQVRBQkFTRSkKSW5kZXg6IFdlYktp dC9jaHJvbWl1bS9zcmMvV2ViRGF0YWJhc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJv bWl1bS9zcmMvV2ViRGF0YWJhc2UuY3BwCShyZXZpc2lvbiA2NDE0MykKKysrIFdlYktpdC9jaHJv bWl1bS9zcmMvV2ViRGF0YWJhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MCw2ICs0MCwxOCBA QAogI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgog CisjaWYgIUVOQUJMRShEQVRBQkFTRSkKK25hbWVzcGFjZSBXZWJDb3JlIHsKK2NsYXNzIEFic3Ry YWN0RGF0YWJhc2UgeworcHVibGljOgorICAgIFN0cmluZyBzdHJpbmdJZGVudGlmaWVyKCkgY29u c3QgeyByZXR1cm4gU3RyaW5nKCk7IH0KKyAgICBTdHJpbmcgZGlzcGxheU5hbWUoKSBjb25zdCB7 IHJldHVybiBTdHJpbmcoKTsgfQorICAgIHVuc2lnbmVkIGxvbmcgbG9uZyBlc3RpbWF0ZWRTaXpl KCkgY29uc3QgeyByZXR1cm4gMDsgfQorICAgIFNlY3VyaXR5T3JpZ2luKiBzZWN1cml0eU9yaWdp bigpIGNvbnN0IHsgcmV0dXJuIDA7IH0KK307Cit9CisjZW5kaWYgLy8gIUVOQUJMRShEQVRBQkFT RSkKKwogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewpAQCAt ODQsMTcgKzk2LDIxIEBAIHZvaWQgV2ViRGF0YWJhc2U6OnVwZGF0ZURhdGFiYXNlU2l6ZSgKICAg ICBjb25zdCBXZWJTdHJpbmcmIG9yaWdpbklkZW50aWZpZXIsIGNvbnN0IFdlYlN0cmluZyYgZGF0 YWJhc2VOYW1lLAogICAgIHVuc2lnbmVkIGxvbmcgbG9uZyBkYXRhYmFzZVNpemUsIHVuc2lnbmVk IGxvbmcgbG9uZyBzcGFjZUF2YWlsYWJsZSkKIHsKKyNpZiBFTkFCTEUoREFUQUJBU0UpCiAgICAg V2ViQ29yZTo6UXVvdGFUcmFja2VyOjppbnN0YW5jZSgpLnVwZGF0ZURhdGFiYXNlU2l6ZUFuZFNw YWNlQXZhaWxhYmxlVG9PcmlnaW4oCiAgICAgICAgIG9yaWdpbklkZW50aWZpZXIsIGRhdGFiYXNl TmFtZSwgZGF0YWJhc2VTaXplLCBzcGFjZUF2YWlsYWJsZSk7CisjZW5kaWYgLy8gRU5BQkxFKERB VEFCQVNFKQogfQogCiB2b2lkIFdlYkRhdGFiYXNlOjpjbG9zZURhdGFiYXNlSW1tZWRpYXRlbHko Y29uc3QgV2ViU3RyaW5nJiBvcmlnaW5JZGVudGlmaWVyLCBjb25zdCBXZWJTdHJpbmcmIGRhdGFi YXNlTmFtZSkKIHsKKyNpZiBFTkFCTEUoREFUQUJBU0UpCiAgICAgSGFzaFNldDxSZWZQdHI8QWJz dHJhY3REYXRhYmFzZT4gPiBkYXRhYmFzZUhhbmRsZXM7CiAgICAgUmVmUHRyPFNlY3VyaXR5T3Jp Z2luPiBvcmlnaW4gPSBTZWN1cml0eU9yaWdpbjo6Y3JlYXRlRnJvbURhdGFiYXNlSWRlbnRpZmll cihvcmlnaW5JZGVudGlmaWVyKTsKICAgICBEYXRhYmFzZVRyYWNrZXI6OnRyYWNrZXIoKS5nZXRP cGVuRGF0YWJhc2VzKG9yaWdpbi5nZXQoKSwgZGF0YWJhc2VOYW1lLCAmZGF0YWJhc2VIYW5kbGVz KTsKICAgICBmb3IgKEhhc2hTZXQ8UmVmUHRyPEFic3RyYWN0RGF0YWJhc2U+ID46Oml0ZXJhdG9y IGl0ID0gZGF0YWJhc2VIYW5kbGVzLmJlZ2luKCk7IGl0ICE9IGRhdGFiYXNlSGFuZGxlcy5lbmQo KTsgKytpdCkKICAgICAgICAgaXQtPmdldCgpLT5jbG9zZUltbWVkaWF0ZWx5KCk7CisjZW5kaWYg Ly8gRU5BQkxFKERBVEFCQVNFKQogfQogCiBXZWJEYXRhYmFzZTo6V2ViRGF0YWJhc2UoY29uc3Qg QWJzdHJhY3REYXRhYmFzZSogZGF0YWJhc2UpCg== 62726 2010-07-27 12:29:16 -0700 2010-07-27 12:42:59 -0700 patch patch text/plain 11485 dumi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NDE0MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjYgQEAKKzIwMTAtMDctMjcgIER1bWl0cnUgRGFuaWxpdWMgIDxkdW1pQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBNb3ZlIGFsbCBXZWJTUUxEYXRhYmFzZXMtc3BlY2lmaWMgY29kZSBiZWhpbmQgI2lmIEVOQUJM RShEQVRBQkFTRSkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00MzAzNQorCisgICAgICAgIE1ha2UgQ2hyb21pdW0gY29tcGlsZSB3aXRoIEVOQUJMRV9E QVRBQkFTRT0wLiBUaGUgI2lmZGVmcyBpbgorICAgICAgICBEYXRhYmFzZUF1dGhvcml6ZXIgYW5k IENocm9taXVtQnJpZGdlIGFyZSByZW1vdmVkLCBiZWNhdXNlIHRoZXkncmUKKyAgICAgICAgdXNl ZCBieSBub24tSFRNTDUgREJzIHRvbyAodGhlIGNsYXNzZXMgaW4gV2ViQ29yZS9wbGF0Zm9ybS9z cWwvKSwKKyAgICAgICAgd2hpY2ggYXJlIHVzZWQgYnkgb3RoZXIgZmVhdHVyZXMgdG9vLiBTbyB0 aGV5IG5lZWQgdG8gYmUgY29tcGlsZWQKKyAgICAgICAgaW4gZXZlbiBpZiBIVE1MNSBEQnMgYXJl IGRpc2FibGVkLgorCisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4RE9NV2luZG93Q3Vz dG9tLmNwcDoKKyAgICAgICAgKiBwYWdlL0RPTVdpbmRvdy5pZGw6CisgICAgICAgICogcGxhdGZv cm0vY2hyb21pdW0vQ2hyb21pdW1CcmlkZ2UuaDoKKyAgICAgICAgKiBzdG9yYWdlL0RhdGFiYXNl QXV0aG9yaXplci5jcHA6CisgICAgICAgICogc3RvcmFnZS9jaHJvbWl1bS9EYXRhYmFzZU9ic2Vy dmVyLmg6CisgICAgICAgICogc3RvcmFnZS9jaHJvbWl1bS9EYXRhYmFzZVRyYWNrZXJDaHJvbWl1 bS5jcHA6CisgICAgICAgICogc3RvcmFnZS9jaHJvbWl1bS9RdW90YVRyYWNrZXIuY3BwOgorICAg ICAgICAqIHN0b3JhZ2UvY2hyb21pdW0vUXVvdGFUcmFja2VyLmg6CisgICAgICAgICogc3RvcmFn ZS9jaHJvbWl1bS9TUUxUcmFuc2FjdGlvbkNsaWVudENocm9taXVtLmNwcDoKKwogMjAxMC0wNy0y NyAgVmljdG9yIFdhbmcgIDx2aWN0b3J3QGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmll d2VkLCByb2xsaW5nIG91dCByNjQxMDQuCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3Rv bS9WOERPTVdpbmRvd0N1c3RvbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92 OC9jdXN0b20vVjhET01XaW5kb3dDdXN0b20uY3BwCShyZXZpc2lvbiA2NDE0MykKKysrIFdlYkNv cmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RE9NV2luZG93Q3VzdG9tLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNzkwLDYgKzc5MCw3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOERPTVdpbmRvdzo6 c2V0SW4KICAgICByZXR1cm4gV2luZG93U2V0VGltZW91dEltcGwoYXJncywgZmFsc2UpOwogfQog CisjaWYgRU5BQkxFKERBVEFCQVNFKQogdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4RE9NV2luZG93 OjpvcGVuRGF0YWJhc2VDYWxsYmFjayhjb25zdCB2ODo6QXJndW1lbnRzJiBhcmdzKQogewogICAg IElOQ19TVEFUUygiRE9NLkRPTVdpbmRvdy5vcGVuRGF0YWJhc2UiKTsKQEAgLTgxOSw2ICs4MjAs NyBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhET01XaW5kb3c6Om9wZW5ECiAgICAgVjhQcm94 eTo6c2V0RE9NRXhjZXB0aW9uKGVjKTsKICAgICByZXR1cm4gcmVzdWx0OwogfQorI2VuZGlmIC8v IEVOQUJMRShEQVRBQkFTRSkKIAogYm9vbCBWOERPTVdpbmRvdzo6bmFtZWRTZWN1cml0eUNoZWNr KHY4OjpMb2NhbDx2ODo6T2JqZWN0PiBob3N0LCB2ODo6TG9jYWw8djg6OlZhbHVlPiBrZXksIHY4 OjpBY2Nlc3NUeXBlIHR5cGUsIHY4OjpMb2NhbDx2ODo6VmFsdWU+KQogewpJbmRleDogV2ViQ29y ZS9wYWdlL0RPTVdpbmRvdy5pZGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL0RPTVdpbmRv dy5pZGwJKHJldmlzaW9uIDY0MTQzKQorKysgV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5pZGwJKHdv cmtpbmcgY29weSkKQEAgLTc0MSw5ICs3NDEsNyBAQCBtb2R1bGUgd2luZG93IHsKICNlbmRpZgog I2VuZGlmCiAKLSNpZiBkZWZpbmVkKEVOQUJMRV9EQVRBQkFTRSkKLSAgICAgICAgYXR0cmlidXRl IFNRTEV4Y2VwdGlvbkNvbnN0cnVjdG9yIFNRTEV4Y2VwdGlvbjsKLSNlbmRpZgorICAgICAgICBh dHRyaWJ1dGUgW0NvbmRpdGlvbmFsPURBVEFCQVNFXSBTUUxFeGNlcHRpb25Db25zdHJ1Y3RvciBT UUxFeGNlcHRpb247CiAKICAgICAgICAgYXR0cmlidXRlIFtDb25kaXRpb25hbD1UT1VDSF9FVkVO VFNdIFRvdWNoRXZlbnRDb25zdHJ1Y3RvciBUb3VjaEV2ZW50OwogCkluZGV4OiBXZWJDb3JlL3Bs YXRmb3JtL2Nocm9taXVtL0Nocm9taXVtQnJpZGdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9w bGF0Zm9ybS9jaHJvbWl1bS9DaHJvbWl1bUJyaWRnZS5oCShyZXZpc2lvbiA2NDE0MykKKysrIFdl YkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vQ2hyb21pdW1CcmlkZ2UuaAkod29ya2luZyBjb3B5KQpA QCAtMTU1LDggKzE1NSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgLy8gR2VvbG9j YXRpb24gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0KICAgICAgICAgc3RhdGljIEdlb2xvY2F0aW9uU2VydmljZUJyaWRnZSogY3JlYXRlR2Vv bG9jYXRpb25TZXJ2aWNlQnJpZGdlKEdlb2xvY2F0aW9uU2VydmljZUNocm9taXVtKik7CiAKLSAg ICAgICAgLy8gSFRNTDUgREIgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0KLSNpZiBFTkFCTEUoREFUQUJBU0UpCisgICAgICAgIC8vIERh dGFiYXNlcyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiAgICAgICAgIC8vIFJldHVybnMgYSBoYW5kbGUgdG8gdGhlIERCIGZpbGUgYW5k IG9vcHRpb25hbGx5IGEgaGFuZGxlIHRvIGl0cyBjb250YWluaW5nIGRpcmVjdG9yeQogICAgICAg ICBzdGF0aWMgUGxhdGZvcm1GaWxlSGFuZGxlIGRhdGFiYXNlT3BlbkZpbGUoY29uc3QgU3RyaW5n JiB2ZnNGbGVOYW1lLCBpbnQgZGVzaXJlZEZsYWdzKTsKICAgICAgICAgLy8gUmV0dXJucyBhIFNR TGl0ZSBjb2RlIChTUUxJVEVfT0sgPSAwLCBvbiBzdWNjZXNzKQpAQCAtMTY1LDcgKzE2NCw2IEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgc3RhdGljIGxvbmcgZGF0YWJhc2VHZXRGaWxl QXR0cmlidXRlcyhjb25zdCBTdHJpbmcmIHZmc0ZpbGVOYW1lKTsKICAgICAgICAgLy8gUmV0dXJu cyB0aGUgc2l6ZSBvZiB0aGUgREIgZmlsZQogICAgICAgICBzdGF0aWMgbG9uZyBsb25nIGRhdGFi YXNlR2V0RmlsZVNpemUoY29uc3QgU3RyaW5nJiB2ZnNGaWxlTmFtZSk7Ci0jZW5kaWYKIAogICAg ICAgICAvLyBJbmRleGVkREIgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLQogICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxJbmRleGVkRGF0 YWJhc2U+IGluZGV4ZWREYXRhYmFzZSgpOwpJbmRleDogV2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNl QXV0aG9yaXplci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNlQXV0 aG9yaXplci5jcHAJKHJldmlzaW9uIDY0MTQzKQorKysgV2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNl QXV0aG9yaXplci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI5LDcgKzI5LDYgQEAKICNpbmNsdWRl ICJjb25maWcuaCIKICNpbmNsdWRlICJEYXRhYmFzZUF1dGhvcml6ZXIuaCIKIAotI2lmIEVOQUJM RShEQVRBQkFTRSkKICNpbmNsdWRlICJQbGF0Zm9ybVN0cmluZy5oIgogI2luY2x1ZGUgPHd0Zi9Q YXNzUmVmUHRyLmg+CiAKQEAgLTQyMCw1ICs0MTksMyBAQCBpbnQgRGF0YWJhc2VBdXRob3JpemVy Ojp1cGRhdGVEZWxldGVzQmFzCiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKLQotI2VuZGlm IC8vIEVOQUJMRShEQVRBQkFTRSkKSW5kZXg6IFdlYkNvcmUvc3RvcmFnZS9jaHJvbWl1bS9EYXRh YmFzZU9ic2VydmVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9zdG9yYWdlL2Nocm9taXVtL0Rh dGFiYXNlT2JzZXJ2ZXIuaAkocmV2aXNpb24gNjQxNDMpCisrKyBXZWJDb3JlL3N0b3JhZ2UvY2hy b21pdW0vRGF0YWJhc2VPYnNlcnZlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMSw2ICszMSw4IEBA CiAjaWZuZGVmIERhdGFiYXNlT2JzZXJ2ZXJfaAogI2RlZmluZSBEYXRhYmFzZU9ic2VydmVyX2gK IAorI2lmIEVOQUJMRShEQVRBQkFTRSkKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBB YnN0cmFjdERhdGFiYXNlOwpAQCAtNDksNCArNTEsNiBAQCBwdWJsaWM6CiAKIH0KIAorI2VuZGlm IC8vIEVOQUJMRShEQVRBQkFTRSkKKwogI2VuZGlmIC8vIERhdGFiYXNlT2JzZXJ2ZXJfaApJbmRl eDogV2ViQ29yZS9zdG9yYWdlL2Nocm9taXVtL0RhdGFiYXNlVHJhY2tlckNocm9taXVtLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL3N0b3JhZ2UvY2hyb21pdW0vRGF0YWJhc2VUcmFja2VyQ2hy b21pdW0uY3BwCShyZXZpc2lvbiA2NDE0MykKKysrIFdlYkNvcmUvc3RvcmFnZS9jaHJvbWl1bS9E YXRhYmFzZVRyYWNrZXJDaHJvbWl1bS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxLDYgKzMxLDgg QEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJEYXRhYmFzZVRyYWNrZXIuaCIKIAor I2lmIEVOQUJMRShEQVRBQkFTRSkKKwogI2luY2x1ZGUgIkFic3RyYWN0RGF0YWJhc2UuaCIKICNp bmNsdWRlICJEYXRhYmFzZU9ic2VydmVyLmgiCiAjaW5jbHVkZSAiUXVvdGFUcmFja2VyLmgiCkBA IC0xNzMsMyArMTc1LDUgQEAgdW5zaWduZWQgbG9uZyBsb25nIERhdGFiYXNlVHJhY2tlcjo6Z2V0 TQogfQogCiB9CisKKyNlbmRpZiAvLyBFTkFCTEUoREFUQUJBU0UpCkluZGV4OiBXZWJDb3JlL3N0 b3JhZ2UvY2hyb21pdW0vUXVvdGFUcmFja2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3N0 b3JhZ2UvY2hyb21pdW0vUXVvdGFUcmFja2VyLmNwcAkocmV2aXNpb24gNjQxNDMpCisrKyBXZWJD b3JlL3N0b3JhZ2UvY2hyb21pdW0vUXVvdGFUcmFja2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MzEsOCArMzEsOSBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlF1b3RhVHJhY2tl ci5oIgogCisjaWYgRU5BQkxFKERBVEFCQVNFKQorCiAjaW5jbHVkZSA8d3RmL1N0ZExpYkV4dHJh cy5oPgotI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUg ewogCkBAIC02NywzICs2OCw1IEBAIHZvaWQgUXVvdGFUcmFja2VyOjp1cGRhdGVEYXRhYmFzZVNp emVBbmQKIH0KIAogfQorCisjZW5kaWYgLy8gRU5BQkxFKERBVEFCQVNFKQpJbmRleDogV2ViQ29y ZS9zdG9yYWdlL2Nocm9taXVtL1F1b3RhVHJhY2tlci5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv c3RvcmFnZS9jaHJvbWl1bS9RdW90YVRyYWNrZXIuaAkocmV2aXNpb24gNjQxNDMpCisrKyBXZWJD b3JlL3N0b3JhZ2UvY2hyb21pdW0vUXVvdGFUcmFja2VyLmgJKHdvcmtpbmcgY29weSkKQEAgLTMx LDEwICszMSwxMiBAQAogI2lmbmRlZiBRdW90YVRyYWNrZXJfaAogI2RlZmluZSBRdW90YVRyYWNr ZXJfaAogCisjaWYgRU5BQkxFKERBVEFCQVNFKQorCisjaW5jbHVkZSAiUGxhdGZvcm1TdHJpbmcu aCIKICNpbmNsdWRlICJTZWN1cml0eU9yaWdpbi5oIgogI2luY2x1ZGUgIlN0cmluZ0hhc2guaCIK ICNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgotI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4K IAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC02MCw0ICs2Miw2IEBAIHByaXZhdGU6CiAKIH0K IAorI2VuZGlmIC8vIEVOQUJMRShEQVRBQkFTRSkKKwogI2VuZGlmIC8vIFF1b3RhVHJhY2tlcl9o CkluZGV4OiBXZWJDb3JlL3N0b3JhZ2UvY2hyb21pdW0vU1FMVHJhbnNhY3Rpb25DbGllbnRDaHJv bWl1bS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9zdG9yYWdlL2Nocm9taXVtL1NRTFRyYW5z YWN0aW9uQ2xpZW50Q2hyb21pdW0uY3BwCShyZXZpc2lvbiA2NDE0MykKKysrIFdlYkNvcmUvc3Rv cmFnZS9jaHJvbWl1bS9TUUxUcmFuc2FjdGlvbkNsaWVudENocm9taXVtLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMzEsNiArMzEsOCBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlNR TFRyYW5zYWN0aW9uQ2xpZW50LmgiCiAKKyNpZiBFTkFCTEUoREFUQUJBU0UpCisKICNpbmNsdWRl ICJBYnN0cmFjdERhdGFiYXNlLmgiCiAjaW5jbHVkZSAiRGF0YWJhc2VPYnNlcnZlci5oIgogI2lu Y2x1ZGUgIlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQuaCIKQEAgLTgzLDMgKzg1LDUgQEAgYm9vbCBT UUxUcmFuc2FjdGlvbkNsaWVudDo6ZGlkRXhjZWVkUXVvdAogfQogCiB9CisKKyNlbmRpZiAvLyBF TkFCTEUoREFUQUJBU0UpCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDY0MTQzKQorKysgV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisy MDEwLTA3LTI3ICBEdW1pdHJ1IERhbmlsaXVjICA8ZHVtaUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZSBhbGwgV2ViU1FM RGF0YWJhc2VzLXNwZWNpZmljIGNvZGUgYmVoaW5kICNpZiBFTkFCTEUoREFUQUJBU0UpLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDMwMzUKKworICAg ICAgICBNYWtlIENocm9taXVtIGNvbXBpbGUgd2l0aCBFTkFCTEVfREFUQUJBU0U9MC4KKworICAg ICAgICAqIHNyYy9DaHJvbWl1bUJyaWRnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWl1 bUJyaWRnZTo6ZGF0YWJhc2VHZXRGaWxlU2l6ZSk6CisgICAgICAgICogc3JjL0RhdGFiYXNlT2Jz ZXJ2ZXIuY3BwOgorICAgICAgICAqIHNyYy9XZWJEYXRhYmFzZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpBYnN0cmFjdERhdGFiYXNlOjpzdHJpbmdJZGVudGlmaWVyKToKKyAgICAgICAgKFdlYkNv cmU6OkFic3RyYWN0RGF0YWJhc2U6OmRpc3BsYXlOYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OkFi c3RyYWN0RGF0YWJhc2U6OmVzdGltYXRlZFNpemUpOgorICAgICAgICAoV2ViQ29yZTo6QWJzdHJh Y3REYXRhYmFzZTo6c2VjdXJpdHlPcmlnaW4pOgorICAgICAgICAoV2ViS2l0OjpXZWJEYXRhYmFz ZTo6dXBkYXRlRGF0YWJhc2VTaXplKToKKyAgICAgICAgKFdlYktpdDo6V2ViRGF0YWJhc2U6OmNs b3NlRGF0YWJhc2VJbW1lZGlhdGVseSk6CisKIDIwMTAtMDctMjcgIFBhdmVsIFBvZGl2aWxvdiAg PHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVs ZG1hbi4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21pdW1CcmlkZ2UuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21pdW1CcmlkZ2UuY3BwCShyZXZpc2lv biA2NDE0MykKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21pdW1CcmlkZ2UuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC00NjksOSArNDY5LDggQEAgR2VvbG9jYXRpb25TZXJ2aWNlQnJpZGdlKiBD aHJvbWl1bUJyaWRnZQogICAgIHJldHVybiBjcmVhdGVHZW9sb2NhdGlvblNlcnZpY2VCcmlkZ2VJ bXBsKGdlb2xvY2F0aW9uU2VydmljZUNocm9taXVtKTsKIH0KIAotLy8gSFRNTDUgREIgLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLQorLy8gRGF0YWJhc2VzIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCi0jaWYgRU5BQkxFKERBVEFCQVNFKQogUGxh dGZvcm1GaWxlSGFuZGxlIENocm9taXVtQnJpZGdlOjpkYXRhYmFzZU9wZW5GaWxlKGNvbnN0IFN0 cmluZyYgdmZzRmlsZU5hbWUsIGludCBkZXNpcmVkRmxhZ3MpCiB7CiAgICAgcmV0dXJuIHdlYktp dENsaWVudCgpLT5kYXRhYmFzZU9wZW5GaWxlKFdlYlN0cmluZyh2ZnNGaWxlTmFtZSksIGRlc2ly ZWRGbGFncyk7CkBAIC00OTEsNyArNDkwLDYgQEAgbG9uZyBsb25nIENocm9taXVtQnJpZGdlOjpk YXRhYmFzZUdldEZpbAogewogICAgIHJldHVybiB3ZWJLaXRDbGllbnQoKS0+ZGF0YWJhc2VHZXRG aWxlU2l6ZShXZWJTdHJpbmcodmZzRmlsZU5hbWUpKTsKIH0KLSNlbmRpZgogCiAvLyBJbmRleGVk IERhdGFiYXNlIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tCiAKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvRGF0YWJhc2VPYnNlcnZl ci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9EYXRhYmFzZU9ic2VydmVy LmNwcAkocmV2aXNpb24gNjQxNDMpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL0RhdGFiYXNlT2Jz ZXJ2ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMSw2ICszMSw4IEBACiAjaW5jbHVkZSAiY29u ZmlnLmgiCiAjaW5jbHVkZSAiRGF0YWJhc2VPYnNlcnZlci5oIgogCisjaWYgRU5BQkxFKERBVEFC QVNFKQorCiAjaW5jbHVkZSAiQWJzdHJhY3REYXRhYmFzZS5oIgogI2luY2x1ZGUgIkRvY3VtZW50 LmgiCiAjaW5jbHVkZSAiU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5oIgpAQCAtODQsMyArODYsNSBA QCB2b2lkIERhdGFiYXNlT2JzZXJ2ZXI6OmRhdGFiYXNlQ2xvc2VkKEFiCiB9CiAKIH0gLy8gbmFt ZXNwYWNlIFdlYkNvcmUKKworI2VuZGlmIC8vIEVOQUJMRShEQVRBQkFTRSkKSW5kZXg6IFdlYktp dC9jaHJvbWl1bS9zcmMvV2ViRGF0YWJhc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJv bWl1bS9zcmMvV2ViRGF0YWJhc2UuY3BwCShyZXZpc2lvbiA2NDE0MykKKysrIFdlYktpdC9jaHJv bWl1bS9zcmMvV2ViRGF0YWJhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MCw2ICs0MCwxOCBA QAogI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgog CisjaWYgIUVOQUJMRShEQVRBQkFTRSkKK25hbWVzcGFjZSBXZWJDb3JlIHsKK2NsYXNzIEFic3Ry YWN0RGF0YWJhc2UgeworcHVibGljOgorICAgIFN0cmluZyBzdHJpbmdJZGVudGlmaWVyKCkgY29u c3QgeyByZXR1cm4gU3RyaW5nKCk7IH0KKyAgICBTdHJpbmcgZGlzcGxheU5hbWUoKSBjb25zdCB7 IHJldHVybiBTdHJpbmcoKTsgfQorICAgIHVuc2lnbmVkIGxvbmcgbG9uZyBlc3RpbWF0ZWRTaXpl KCkgY29uc3QgeyByZXR1cm4gMDsgfQorICAgIFNlY3VyaXR5T3JpZ2luKiBzZWN1cml0eU9yaWdp bigpIGNvbnN0IHsgcmV0dXJuIDA7IH0KK307Cit9CisjZW5kaWYgLy8gIUVOQUJMRShEQVRBQkFT RSkKKwogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewpAQCAt ODQsMTcgKzk2LDIxIEBAIHZvaWQgV2ViRGF0YWJhc2U6OnVwZGF0ZURhdGFiYXNlU2l6ZSgKICAg ICBjb25zdCBXZWJTdHJpbmcmIG9yaWdpbklkZW50aWZpZXIsIGNvbnN0IFdlYlN0cmluZyYgZGF0 YWJhc2VOYW1lLAogICAgIHVuc2lnbmVkIGxvbmcgbG9uZyBkYXRhYmFzZVNpemUsIHVuc2lnbmVk IGxvbmcgbG9uZyBzcGFjZUF2YWlsYWJsZSkKIHsKKyNpZiBFTkFCTEUoREFUQUJBU0UpCiAgICAg V2ViQ29yZTo6UXVvdGFUcmFja2VyOjppbnN0YW5jZSgpLnVwZGF0ZURhdGFiYXNlU2l6ZUFuZFNw YWNlQXZhaWxhYmxlVG9PcmlnaW4oCiAgICAgICAgIG9yaWdpbklkZW50aWZpZXIsIGRhdGFiYXNl TmFtZSwgZGF0YWJhc2VTaXplLCBzcGFjZUF2YWlsYWJsZSk7CisjZW5kaWYgLy8gRU5BQkxFKERB VEFCQVNFKQogfQogCiB2b2lkIFdlYkRhdGFiYXNlOjpjbG9zZURhdGFiYXNlSW1tZWRpYXRlbHko Y29uc3QgV2ViU3RyaW5nJiBvcmlnaW5JZGVudGlmaWVyLCBjb25zdCBXZWJTdHJpbmcmIGRhdGFi YXNlTmFtZSkKIHsKKyNpZiBFTkFCTEUoREFUQUJBU0UpCiAgICAgSGFzaFNldDxSZWZQdHI8QWJz dHJhY3REYXRhYmFzZT4gPiBkYXRhYmFzZUhhbmRsZXM7CiAgICAgUmVmUHRyPFNlY3VyaXR5T3Jp Z2luPiBvcmlnaW4gPSBTZWN1cml0eU9yaWdpbjo6Y3JlYXRlRnJvbURhdGFiYXNlSWRlbnRpZmll cihvcmlnaW5JZGVudGlmaWVyKTsKICAgICBEYXRhYmFzZVRyYWNrZXI6OnRyYWNrZXIoKS5nZXRP cGVuRGF0YWJhc2VzKG9yaWdpbi5nZXQoKSwgZGF0YWJhc2VOYW1lLCAmZGF0YWJhc2VIYW5kbGVz KTsKICAgICBmb3IgKEhhc2hTZXQ8UmVmUHRyPEFic3RyYWN0RGF0YWJhc2U+ID46Oml0ZXJhdG9y IGl0ID0gZGF0YWJhc2VIYW5kbGVzLmJlZ2luKCk7IGl0ICE9IGRhdGFiYXNlSGFuZGxlcy5lbmQo KTsgKytpdCkKICAgICAgICAgaXQtPmdldCgpLT5jbG9zZUltbWVkaWF0ZWx5KCk7CisjZW5kaWYg Ly8gRU5BQkxFKERBVEFCQVNFKQogfQogCiBXZWJEYXRhYmFzZTo6V2ViRGF0YWJhc2UoY29uc3Qg QWJzdHJhY3REYXRhYmFzZSogZGF0YWJhc2UpCg==