23333 2009-01-14 15:29:53 -0800 Upstream Chromium platform changes to compensate for api changes 2009-01-15 13:26:11 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 levin levin oldest_to_newest 105806 0 levin 2009-01-14 15:29:53 -0800 Various WebKit details (interfaces, names, etc.) have been changing while this platform is being upstreamed. This patches fixes several of them. 105807 1 26733 levin 2009-01-14 15:30:30 -0800 Created attachment 26733 Patch for bug. 105808 2 26733 darin 2009-01-14 15:31:34 -0800 Comment on attachment 26733 Patch for bug. All looks good. 105809 3 26734 levin 2009-01-14 15:34:59 -0800 Created attachment 26734 Only change to last patch: Added bug number to ChangeLog. I forgot this last time. Sorry about that. 105810 4 dglazkov 2009-01-14 15:52:49 -0800 Landed in http://trac.webkit.org/changeset/39918 105955 5 26769 levin 2009-01-15 13:15:05 -0800 Created attachment 26769 One more name change. Renaming of this item happened in r39688. 105957 6 26769 darin 2009-01-15 13:16:08 -0800 Comment on attachment 26769 One more name change. r=me 105960 7 dglazkov 2009-01-15 13:26:11 -0800 Committed in http://trac.webkit.org/changeset/39943 26733 2009-01-14 15:30:30 -0800 2009-01-14 15:56:13 -0800 Patch for bug. upstream.txt text/plain 9011 levin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzOTkxMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjkgQEAKKzIwMDktMDEtMTQgIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0u b3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBs YXRmb3JtIGNvZGUgZml4ZXMuIFRoZXNlIGNvbXBlbnNhdGUgZm9yIGNoYW5nZXMgaW4gcGxhdGZv cm0KKyAgICAgICAgY2FsbGJhY2tzIGZyb20gV2ViS2l0IGFuZCBtaW5vciBhcGkgdHdlYWtzLgor CisgICAgICAgIEkgZW51bWVyYXRlZCBhIGZldyBiZWxvdy4KKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRDYWNoZUNocm9taXVtV2luLmNwcDoKKyAgICAgICAgZm9u dEV4aXN0cyBoYXMgYmVlbiBnb25lIHNpbmNlIHIzNDc5NC4KKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL3NraWEvSW1hZ2VTa2lhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBhaW50U2tC aXRtYXApOgorCisgICAgICAgIChXZWJDb3JlOjpGcmFtZURhdGE6OmNsZWFyKToKKyAgICAgICAg cjM5NzUxIGNoYW5nZXMgdGhpcyBhcGkgdG8gdGFrZSBhbmQgcmV0dXJuIGEgYm9vbC4KKworICAg ICAgICAoV2ViQ29yZTo6SW1hZ2U6OmRyYXdQYXR0ZXJuKToKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9za2lhL1BhdGhTa2lhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhdGg6OmFwcGx5 KToKKyAgICAgICAgKFdlYkNvcmU6OmJvdW5kaW5nQm94Rm9yQ3VycmVudFN0cm9rZSk6CisgICAg ICAgIChXZWJDb3JlOjpQYXRoOjpzdHJva2VDb250YWlucyk6CisgICAgICAgICogc3ZnL2dyYXBo aWNzL3NraWEvUmVuZGVyUGF0aFNraWEuY3BwOiBSZW1vdmVkLgorICAgICAgICBEdWUgdG8gcjM5 ODA1LgorCiAyMDA5LTAxLTE0ICBKZXJlbXkgTW9za292aWNoICA8amVyZW15QGNocm9taXVtLm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KSW5kZXg6IFdlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udENhY2hlQ2hyb21pdW1XaW4uY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udENhY2hlQ2hyb21p dW1XaW4uY3BwCShyZXZpc2lvbiAzOTkxMykKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vRm9udENhY2hlQ2hyb21pdW1XaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MTYs MjggKzUxNiw2IEBAIHN0YXRpYyB2b2lkIEZpbGxMb2dGb250KGNvbnN0IEZvbnREZXNjcmkKICAg ICB3aW5mb250LT5sZldlaWdodCA9IHRvR0RJRm9udFdlaWdodChmb250RGVzY3JpcHRpb24ud2Vp Z2h0KCkpOwogfQogCi1ib29sIEZvbnRDYWNoZTo6Zm9udEV4aXN0cyhjb25zdCBGb250RGVzY3Jp cHRpb24mIGZvbnREZXNjcmlwdGlvbiwgY29uc3QgQXRvbWljU3RyaW5nJiBmYW1pbHkpCi17Ci0g ICAgTE9HRk9OVCB3aW5mb250ID0gezB9OwotICAgIEZpbGxMb2dGb250KGZvbnREZXNjcmlwdGlv biwgJndpbmZvbnQpOwotICAgIFN0cmluZyB3aW5OYW1lOwotICAgIEhGT05UIGhmb250ID0gY3Jl YXRlRm9udEluZGlyZWN0QW5kR2V0V2luTmFtZShmYW1pbHksICZ3aW5mb250LCAmd2luTmFtZSk7 Ci0gICAgaWYgKCFoZm9udCkKLSAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIERlbGV0ZU9iamVj dChoZm9udCk7Ci0gICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGZhbWlseSwgd2luTmFtZSkpCi0g ICAgICByZXR1cm4gdHJ1ZTsKLSAgICAvLyBGb3IgQ0pLIGZvbnRzIHdpdGggYm90aCBFbmdsaXNo IGFuZCBuYXRpdmUgbmFtZXMsIAotICAgIC8vIEdldFRleHRGYWNlIHJldHVybnMgYSBuYXRpdmUg bmFtZSB1bmRlciB0aGUgZm9udCdzICJsb2NhbGUiCi0gICAgLy8gYW5kIGFuIEVuZ2xpc2ggbmFt ZSB1bmRlciBvdGhlciBsb2NhbGVzIHJlZ2FyZGxlc3Mgb2YgCi0gICAgLy8gbGZGYWNlTmFtZSBm aWVsZCBvZiBMT0dGT05ULiBBcyBhIHJlc3VsdCwgd2UgbmVlZCB0byBjaGVjawotICAgIC8vIGlm IGEgZm9udCBoYXMgYW4gYWx0ZXJuYXRlIG5hbWUuIElmIHRoZXJlIGlzLCB3ZSBuZWVkIHRvCi0g ICAgLy8gY29tcGFyZSBpdCB3aXRoIHdoYXQncyByZXF1ZXN0ZWQgaW4gdGhlIGZpcnN0IHBsYWNl LgotICAgIFN0cmluZyBhbHROYW1lOwotICAgIHJldHVybiBMb29rdXBBbHROYW1lKGZhbWlseSwg YWx0TmFtZSkgJiYgZXF1YWxJZ25vcmluZ0Nhc2UoYWx0TmFtZSwgd2luTmFtZSk7Ci19Ci0KIHN0 cnVjdCBUcmFpdHNJbkZhbWlseVByb2NEYXRhIHsKICAgICBUcmFpdHNJbkZhbWlseVByb2NEYXRh KGNvbnN0IEF0b21pY1N0cmluZyYgZmFtaWx5TmFtZSkKICAgICAgICAgOiBtX2ZhbWlseU5hbWUo ZmFtaWx5TmFtZSkKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZVNr aWEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFn ZVNraWEuY3BwCShyZXZpc2lvbiAzOTkxMykKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv c2tpYS9JbWFnZVNraWEuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMjgsNyArMjI4LDcgQEAgc3Rh dGljIHZvaWQgcGFpbnRTa0JpdG1hcChQbGF0Zm9ybUNvbnRleAogCiAgICAgc2tpYTo6UGxhdGZv cm1DYW52YXMqIGNhbnZhcyA9IHBsYXRmb3JtQ29udGV4dC0+Y2FudmFzKCk7CiAKLSAgICBSZXNh bXBsaW5nTW9kZSByZXNhbXBsaW5nID0gcGxhdGZvcm1Db250ZXh0LT5Jc1ByaW50aW5nKCkgPyBS RVNBTVBMRV9OT05FIDoKKyAgICBSZXNhbXBsaW5nTW9kZSByZXNhbXBsaW5nID0gcGxhdGZvcm1D b250ZXh0LT5pc1ByaW50aW5nKCkgPyBSRVNBTVBMRV9OT05FIDoKICAgICAgICAgY29tcHV0ZVJl c2FtcGxpbmdNb2RlKGJpdG1hcCwgc3JjUmVjdC53aWR0aCgpLCBzcmNSZWN0LmhlaWdodCgpLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgU2tTY2FsYXJUb0Zsb2F0KGRlc3RSZWN0Lndp ZHRoKCkpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgU2tTY2FsYXJUb0Zsb2F0KGRl c3RSZWN0LmhlaWdodCgpKSk7CkBAIC0yNzksMTUgKzI3OSwxOSBAQCBzdGF0aWMgRmxvYXRSZWN0 IG5vcm1hbGl6ZVJlY3QoY29uc3QgRmxvCiAgICAgcmV0dXJuIG5vcm07CiB9CiAKLXZvaWQgRnJh bWVEYXRhOjpjbGVhcigpCitib29sIEZyYW1lRGF0YTo6Y2xlYXIoYm9vbCBjbGVhck1ldGFkYXRh KQogewotICAgIC8vIEltYWdlU291cmNlOjpjcmVhdGVGcmFtZUF0SW5kZXgoKSBhbGxvY2F0ZWQg fG1fZnJhbWV8IGFuZCBwYXNzZWQKLSAgICAvLyBvd25lcnNoaXAgdG8gQml0bWFwSW1hZ2U7IHdl IG11c3QgZGVsZXRlIGl0IGhlcmUuCi0gICAgZGVsZXRlIG1fZnJhbWU7Ci0gICAgbV9mcmFtZSA9 IDA7Ci0gICAgLy8gTk9URTogV2UgcHVycG9zZWZ1bGx5IGRvbid0IHJlc2V0IG1ldGFkYXRhIGhl cmUsIHNvIHRoYXQgZXZlbiBpZiB3ZQotICAgIC8vIHRocm93IGF3YXkgcHJldmlvdXNseS1kZWNv ZGVkIGRhdGEsIGFuaW1hdGlvbiBsb29wcyBjYW4gc3RpbGwgYWNjZXNzCi0gICAgLy8gcHJvcGVy dGllcyBsaWtlIGZyYW1lIGR1cmF0aW9ucyB3aXRob3V0IHJlLWRlY29kaW5nLgorICAgIGlmIChj bGVhck1ldGFkYXRhKQorICAgICAgICBtX2hhdmVNZXRhZGF0YSA9IGZhbHNlOworCisgICAgaWYg KG1fZnJhbWUpIHsKKyAgICAgICAgLy8gSW1hZ2VTb3VyY2U6OmNyZWF0ZUZyYW1lQXRJbmRleCgp IGFsbG9jYXRlZCB8bV9mcmFtZXwgYW5kIHBhc3NlZAorICAgICAgICAvLyBvd25lcnNoaXAgdG8g Qml0bWFwSW1hZ2U7IHdlIG11c3QgZGVsZXRlIGl0IGhlcmUuCisgICAgICAgIGRlbGV0ZSBtX2Zy YW1lOworICAgICAgICBtX2ZyYW1lID0gMDsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQor ICAgIHJldHVybiBmYWxzZTsKIH0KIAogUGFzc1JlZlB0cjxJbWFnZT4gSW1hZ2U6OmxvYWRQbGF0 Zm9ybVJlc291cmNlKGNvbnN0IGNoYXIgKm5hbWUpCkBAIC0zMjgsNyArMzMyLDcgQEAgdm9pZCBJ bWFnZTo6ZHJhd1BhdHRlcm4oR3JhcGhpY3NDb250ZXh0KgogCiAgICAgLy8gQ29tcHV0ZSB0aGUg cmVzYW1wbGluZyBtb2RlLgogICAgIFJlc2FtcGxpbmdNb2RlIHJlc2FtcGxpbmc7Ci0gICAgaWYg KGNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLT5Jc1ByaW50aW5nKCkpCisgICAgaWYgKGNvbnRl eHQtPnBsYXRmb3JtQ29udGV4dCgpLT5pc1ByaW50aW5nKCkpCiAgICAgICByZXNhbXBsaW5nID0g UkVTQU1QTEVfTElORUFSOwogICAgIGVsc2UgewogICAgICAgcmVzYW1wbGluZyA9IGNvbXB1dGVS ZXNhbXBsaW5nTW9kZSgqYml0bWFwLApJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9z a2lhL1BhdGhTa2lhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3NraWEvUGF0aFNraWEuY3BwCShyZXZpc2lvbiAzOTkxMykKKysrIFdlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3Mvc2tpYS9QYXRoU2tpYS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE3NCw3ICsxNzQs NiBAQCB2b2lkIFBhdGg6OmFwcGx5KHZvaWQqIGluZm8sIFBhdGhBcHBsaWVyCiB7CiAgICAgU2tQ YXRoOjpJdGVyIGl0ZXIoKm1fcGF0aCwgZmFsc2UpOwogICAgIFNrUG9pbnQgcHRzWzRdOwotCiAg ICAgUGF0aEVsZW1lbnQgcGF0aEVsZW1lbnQ7CiAgICAgRmxvYXRQb2ludCBwYXRoUG9pbnRzWzNd OwogCkBAIC0yNzUsNyArMjc0LDcgQEAgc3RhdGljIEZsb2F0UmVjdCBib3VuZGluZ0JveEZvckN1 cnJlbnRTdAogICAgIFNrUGFpbnQgcGFpbnQ7CiAgICAgY29udGV4dC0+cGxhdGZvcm1Db250ZXh0 KCktPnNldHVwUGFpbnRGb3JTdHJva2luZygmcGFpbnQsIDAsIDApOwogICAgIFNrUGF0aCBib3Vu ZGluZ1BhdGg7Ci0gICAgcGFpbnQuZ2V0RmlsbFBhdGgoKmNvbnRleHQtPnBsYXRmb3JtQ29udGV4 dCgpLT5jdXJyZW50UGF0aCgpLCAmYm91bmRpbmdQYXRoKTsKKyAgICBwYWludC5nZXRGaWxsUGF0 aChjb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKS0+Y3VycmVudFBhdGgoKSwgJmJvdW5kaW5nUGF0 aCk7CiAgICAgU2tSZWN0IHI7CiAgICAgYm91bmRpbmdQYXRoLmNvbXB1dGVCb3VuZHMoJnIsIFNr UGF0aDo6a0V4YWN0X0JvdW5kc1R5cGUpOwogICAgIHJldHVybiByOwpAQCAtMjk2LDQgKzI5NSwy MiBAQCBGbG9hdFJlY3QgUGF0aDo6c3Ryb2tlQm91bmRpbmdSZWN0KFN0cm9rCiAgICAgcmV0dXJu IHI7CiB9CiAKK2Jvb2wgUGF0aDo6c3Ryb2tlQ29udGFpbnMoU3Ryb2tlU3R5bGVBcHBsaWVyKiBh cHBsaWVyLCBjb25zdCBGbG9hdFBvaW50JiBwb2ludCkgY29uc3QKK3sKKyAgICBBU1NFUlQoYXBw bGllcik7CisgICAgR3JhcGhpY3NDb250ZXh0KiBzY3JhdGNoID0gc2NyYXRjaENvbnRleHQoKTsK KyAgICBzY3JhdGNoLT5zYXZlKCk7CisKKyAgICBhcHBsaWVyLT5zdHJva2VTdHlsZShzY3JhdGNo KTsKKworICAgIFNrUGFpbnQgcGFpbnQ7CisgICAgc2NyYXRjaC0+cGxhdGZvcm1Db250ZXh0KCkt PnNldHVwUGFpbnRGb3JTdHJva2luZygmcGFpbnQsIDAsIDApOworICAgIFNrUGF0aCBzdHJva2VQ YXRoOworICAgIHBhaW50LmdldEZpbGxQYXRoKCpwbGF0Zm9ybVBhdGgoKSwgJnN0cm9rZVBhdGgp OworICAgIGJvb2wgY29udGFpbnMgPSBTa1BhdGhDb250YWluc1BvaW50KCZzdHJva2VQYXRoLCBw b2ludCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBTa1BhdGg6OmtX aW5kaW5nX0ZpbGxUeXBlKTsKKworICAgIHNjcmF0Y2gtPnJlc3RvcmUoKTsKKyAgICByZXR1cm4g Y29udGFpbnM7Cit9CiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBXZWJDb3JlL3N2Zy9n cmFwaGljcy9za2lhL1JlbmRlclBhdGhTa2lhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3N2 Zy9ncmFwaGljcy9za2lhL1JlbmRlclBhdGhTa2lhLmNwcAkocmV2aXNpb24gMzk5MTMpCisrKyBX ZWJDb3JlL3N2Zy9ncmFwaGljcy9za2lhL1JlbmRlclBhdGhTa2lhLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMSw2OSArMCwwIEBACi0vKgotICogQ29weXJpZ2h0IChjKSAyMDA4LCBHb29nbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICogCi0gKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGlu IHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKLSAqIG1vZGlmaWNhdGlv biwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBh cmUKLSAqIG1ldDoKLSAqIAotICogICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2Rl IG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqIG5vdGljZSwgdGhpcyBsaXN0IG9m IGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KLSAqICAgICAqIFJlZGlz dHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUKLSAqIGNv cHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n IGRpc2NsYWltZXIKLSAqIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlh bHMgcHJvdmlkZWQgd2l0aCB0aGUKLSAqIGRpc3RyaWJ1dGlvbi4KLSAqICAgICAqIE5laXRoZXIg dGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKLSAqIGNvbnRyaWJ1 dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVyaXZlZCBm cm9tCi0gKiB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJt aXNzaW9uLgotICogCi0gKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklH SFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCi0gKiAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBP UiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAotICogTElNSVRFRCBUTywg VEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9S Ci0gKiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hB TEwgVEhFIENPUFlSSUdIVAotICogT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1Ig QU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCi0gKiBTUEVDSUFMLCBFWEVNUExBUlks IE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCi0gKiBMSU1JVEVE IFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9G IFVTRSwKLSAqIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9X RVZFUiBDQVVTRUQgQU5EIE9OIEFOWQotICogVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJ TiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAotICogKElOQ0xVRElORyBORUdM SUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCi0g KiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9G IFNVQ0ggREFNQUdFLgotICovCi0KLSNpbmNsdWRlICJjb25maWcuaCIKLSNpbmNsdWRlICJHcmFw aGljc0NvbnRleHQuaCIKLSNpbmNsdWRlICJQbGF0Zm9ybUNvbnRleHRTa2lhLmgiCi0jaW5jbHVk ZSAiUmVuZGVyUGF0aC5oIgotI2luY2x1ZGUgIlNraWFVdGlscy5oIgotI2luY2x1ZGUgIlNrUGFp bnQuaCIKLSNpbmNsdWRlICJTa1BhdGguaCIKLSNpbmNsdWRlICJTVkdQYWludFNlcnZlci5oIgot Ci0jaWYgRU5BQkxFKFNWRykKLQotbmFtZXNwYWNlIFdlYkNvcmUgewotCi1ib29sIFJlbmRlclBh dGg6OnN0cm9rZUNvbnRhaW5zKGNvbnN0IEZsb2F0UG9pbnQmIHBvaW50LCBib29sIHJlcXVpcmVz U3Ryb2tlKSBjb25zdAotewotICAgIGlmIChwYXRoKCkuaXNFbXB0eSgpKQotICAgICAgICByZXR1 cm4gZmFsc2U7Ci0KLSAgICBpZiAocmVxdWlyZXNTdHJva2UgJiYgIVNWR1BhaW50U2VydmVyOjpz dHJva2VQYWludFNlcnZlcihzdHlsZSgpLCB0aGlzKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwot Ci0gICAgR3JhcGhpY3NDb250ZXh0KiBzY3JhdGNoID0gc2NyYXRjaENvbnRleHQoKTsKLSAgICBz Y3JhdGNoLT5zYXZlKCk7Ci0gICAgYXBwbHlTdHJva2VTdHlsZVRvQ29udGV4dChzY3JhdGNoLCBz dHlsZSgpLCB0aGlzKTsKLQotICAgIFNrUGFpbnQgcGFpbnQ7Ci0gICAgc2NyYXRjaC0+cGxhdGZv cm1Db250ZXh0KCktPnNldHVwUGFpbnRGb3JTdHJva2luZygmcGFpbnQsIDAsIDApOwotICAgIFNr UGF0aCBzdHJva2VQYXRoOwotICAgIHBhaW50LmdldEZpbGxQYXRoKCpwYXRoKCkucGxhdGZvcm1Q YXRoKCksICZzdHJva2VQYXRoKTsKLSAgICBib29sIGNvbnRhaW5zID0gU2tQYXRoQ29udGFpbnNQ b2ludCgmc3Ryb2tlUGF0aCwgcG9pbnQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgU2tQYXRoOjprV2luZGluZ19GaWxsVHlwZSk7Ci0KLSAgICBzY3JhdGNoLT5yZXN0 b3JlKCk7Ci0gICAgcmV0dXJuIGNvbnRhaW5zOwotfQotCi19Ci0KLSNlbmRpZiAvLyBFTkFCTEUo U1ZHKQo= 26734 2009-01-14 15:34:59 -0800 2009-01-14 15:56:01 -0800 Only change to last patch: Added bug number to ChangeLog. I forgot this last time. upstream.txt text/plain 9068 levin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzOTkxMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzEgQEAKKzIwMDktMDEtMTQgIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0u b3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzMzMworCisgICAgICAgIFBs YXRmb3JtIGNvZGUgZml4ZXMuIFRoZXNlIGNvbXBlbnNhdGUgZm9yIGNoYW5nZXMgaW4gcGxhdGZv cm0KKyAgICAgICAgY2FsbGJhY2tzIGZyb20gV2ViS2l0IGFuZCBtaW5vciBhcGkgdHdlYWtzLgor CisgICAgICAgIEkgZW51bWVyYXRlZCBhIGZldyBiZWxvdy4KKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRDYWNoZUNocm9taXVtV2luLmNwcDoKKyAgICAgICAgZm9u dEV4aXN0cyBoYXMgYmVlbiBnb25lIHNpbmNlIHIzNDc5NC4KKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL3NraWEvSW1hZ2VTa2lhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBhaW50U2tC aXRtYXApOgorCisgICAgICAgIChXZWJDb3JlOjpGcmFtZURhdGE6OmNsZWFyKToKKyAgICAgICAg cjM5NzUxIGNoYW5nZXMgdGhpcyBhcGkgdG8gdGFrZSBhbmQgcmV0dXJuIGEgYm9vbC4KKworICAg ICAgICAoV2ViQ29yZTo6SW1hZ2U6OmRyYXdQYXR0ZXJuKToKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9za2lhL1BhdGhTa2lhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhdGg6OmFwcGx5 KToKKyAgICAgICAgKFdlYkNvcmU6OmJvdW5kaW5nQm94Rm9yQ3VycmVudFN0cm9rZSk6CisgICAg ICAgIChXZWJDb3JlOjpQYXRoOjpzdHJva2VDb250YWlucyk6CisgICAgICAgICogc3ZnL2dyYXBo aWNzL3NraWEvUmVuZGVyUGF0aFNraWEuY3BwOiBSZW1vdmVkLgorICAgICAgICBEdWUgdG8gcjM5 ODA1LgorCiAyMDA5LTAxLTE0ICBKZXJlbXkgTW9za292aWNoICA8amVyZW15QGNocm9taXVtLm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KSW5kZXg6IFdlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udENhY2hlQ2hyb21pdW1XaW4uY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udENhY2hlQ2hyb21p dW1XaW4uY3BwCShyZXZpc2lvbiAzOTkxMykKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vRm9udENhY2hlQ2hyb21pdW1XaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MTYs MjggKzUxNiw2IEBAIHN0YXRpYyB2b2lkIEZpbGxMb2dGb250KGNvbnN0IEZvbnREZXNjcmkKICAg ICB3aW5mb250LT5sZldlaWdodCA9IHRvR0RJRm9udFdlaWdodChmb250RGVzY3JpcHRpb24ud2Vp Z2h0KCkpOwogfQogCi1ib29sIEZvbnRDYWNoZTo6Zm9udEV4aXN0cyhjb25zdCBGb250RGVzY3Jp cHRpb24mIGZvbnREZXNjcmlwdGlvbiwgY29uc3QgQXRvbWljU3RyaW5nJiBmYW1pbHkpCi17Ci0g ICAgTE9HRk9OVCB3aW5mb250ID0gezB9OwotICAgIEZpbGxMb2dGb250KGZvbnREZXNjcmlwdGlv biwgJndpbmZvbnQpOwotICAgIFN0cmluZyB3aW5OYW1lOwotICAgIEhGT05UIGhmb250ID0gY3Jl YXRlRm9udEluZGlyZWN0QW5kR2V0V2luTmFtZShmYW1pbHksICZ3aW5mb250LCAmd2luTmFtZSk7 Ci0gICAgaWYgKCFoZm9udCkKLSAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIERlbGV0ZU9iamVj dChoZm9udCk7Ci0gICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGZhbWlseSwgd2luTmFtZSkpCi0g ICAgICByZXR1cm4gdHJ1ZTsKLSAgICAvLyBGb3IgQ0pLIGZvbnRzIHdpdGggYm90aCBFbmdsaXNo IGFuZCBuYXRpdmUgbmFtZXMsIAotICAgIC8vIEdldFRleHRGYWNlIHJldHVybnMgYSBuYXRpdmUg bmFtZSB1bmRlciB0aGUgZm9udCdzICJsb2NhbGUiCi0gICAgLy8gYW5kIGFuIEVuZ2xpc2ggbmFt ZSB1bmRlciBvdGhlciBsb2NhbGVzIHJlZ2FyZGxlc3Mgb2YgCi0gICAgLy8gbGZGYWNlTmFtZSBm aWVsZCBvZiBMT0dGT05ULiBBcyBhIHJlc3VsdCwgd2UgbmVlZCB0byBjaGVjawotICAgIC8vIGlm IGEgZm9udCBoYXMgYW4gYWx0ZXJuYXRlIG5hbWUuIElmIHRoZXJlIGlzLCB3ZSBuZWVkIHRvCi0g ICAgLy8gY29tcGFyZSBpdCB3aXRoIHdoYXQncyByZXF1ZXN0ZWQgaW4gdGhlIGZpcnN0IHBsYWNl LgotICAgIFN0cmluZyBhbHROYW1lOwotICAgIHJldHVybiBMb29rdXBBbHROYW1lKGZhbWlseSwg YWx0TmFtZSkgJiYgZXF1YWxJZ25vcmluZ0Nhc2UoYWx0TmFtZSwgd2luTmFtZSk7Ci19Ci0KIHN0 cnVjdCBUcmFpdHNJbkZhbWlseVByb2NEYXRhIHsKICAgICBUcmFpdHNJbkZhbWlseVByb2NEYXRh KGNvbnN0IEF0b21pY1N0cmluZyYgZmFtaWx5TmFtZSkKICAgICAgICAgOiBtX2ZhbWlseU5hbWUo ZmFtaWx5TmFtZSkKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZVNr aWEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFn ZVNraWEuY3BwCShyZXZpc2lvbiAzOTkxMykKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv c2tpYS9JbWFnZVNraWEuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMjgsNyArMjI4LDcgQEAgc3Rh dGljIHZvaWQgcGFpbnRTa0JpdG1hcChQbGF0Zm9ybUNvbnRleAogCiAgICAgc2tpYTo6UGxhdGZv cm1DYW52YXMqIGNhbnZhcyA9IHBsYXRmb3JtQ29udGV4dC0+Y2FudmFzKCk7CiAKLSAgICBSZXNh bXBsaW5nTW9kZSByZXNhbXBsaW5nID0gcGxhdGZvcm1Db250ZXh0LT5Jc1ByaW50aW5nKCkgPyBS RVNBTVBMRV9OT05FIDoKKyAgICBSZXNhbXBsaW5nTW9kZSByZXNhbXBsaW5nID0gcGxhdGZvcm1D b250ZXh0LT5pc1ByaW50aW5nKCkgPyBSRVNBTVBMRV9OT05FIDoKICAgICAgICAgY29tcHV0ZVJl c2FtcGxpbmdNb2RlKGJpdG1hcCwgc3JjUmVjdC53aWR0aCgpLCBzcmNSZWN0LmhlaWdodCgpLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgU2tTY2FsYXJUb0Zsb2F0KGRlc3RSZWN0Lndp ZHRoKCkpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgU2tTY2FsYXJUb0Zsb2F0KGRl c3RSZWN0LmhlaWdodCgpKSk7CkBAIC0yNzksMTUgKzI3OSwxOSBAQCBzdGF0aWMgRmxvYXRSZWN0 IG5vcm1hbGl6ZVJlY3QoY29uc3QgRmxvCiAgICAgcmV0dXJuIG5vcm07CiB9CiAKLXZvaWQgRnJh bWVEYXRhOjpjbGVhcigpCitib29sIEZyYW1lRGF0YTo6Y2xlYXIoYm9vbCBjbGVhck1ldGFkYXRh KQogewotICAgIC8vIEltYWdlU291cmNlOjpjcmVhdGVGcmFtZUF0SW5kZXgoKSBhbGxvY2F0ZWQg fG1fZnJhbWV8IGFuZCBwYXNzZWQKLSAgICAvLyBvd25lcnNoaXAgdG8gQml0bWFwSW1hZ2U7IHdl IG11c3QgZGVsZXRlIGl0IGhlcmUuCi0gICAgZGVsZXRlIG1fZnJhbWU7Ci0gICAgbV9mcmFtZSA9 IDA7Ci0gICAgLy8gTk9URTogV2UgcHVycG9zZWZ1bGx5IGRvbid0IHJlc2V0IG1ldGFkYXRhIGhl cmUsIHNvIHRoYXQgZXZlbiBpZiB3ZQotICAgIC8vIHRocm93IGF3YXkgcHJldmlvdXNseS1kZWNv ZGVkIGRhdGEsIGFuaW1hdGlvbiBsb29wcyBjYW4gc3RpbGwgYWNjZXNzCi0gICAgLy8gcHJvcGVy dGllcyBsaWtlIGZyYW1lIGR1cmF0aW9ucyB3aXRob3V0IHJlLWRlY29kaW5nLgorICAgIGlmIChj bGVhck1ldGFkYXRhKQorICAgICAgICBtX2hhdmVNZXRhZGF0YSA9IGZhbHNlOworCisgICAgaWYg KG1fZnJhbWUpIHsKKyAgICAgICAgLy8gSW1hZ2VTb3VyY2U6OmNyZWF0ZUZyYW1lQXRJbmRleCgp IGFsbG9jYXRlZCB8bV9mcmFtZXwgYW5kIHBhc3NlZAorICAgICAgICAvLyBvd25lcnNoaXAgdG8g Qml0bWFwSW1hZ2U7IHdlIG11c3QgZGVsZXRlIGl0IGhlcmUuCisgICAgICAgIGRlbGV0ZSBtX2Zy YW1lOworICAgICAgICBtX2ZyYW1lID0gMDsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQor ICAgIHJldHVybiBmYWxzZTsKIH0KIAogUGFzc1JlZlB0cjxJbWFnZT4gSW1hZ2U6OmxvYWRQbGF0 Zm9ybVJlc291cmNlKGNvbnN0IGNoYXIgKm5hbWUpCkBAIC0zMjgsNyArMzMyLDcgQEAgdm9pZCBJ bWFnZTo6ZHJhd1BhdHRlcm4oR3JhcGhpY3NDb250ZXh0KgogCiAgICAgLy8gQ29tcHV0ZSB0aGUg cmVzYW1wbGluZyBtb2RlLgogICAgIFJlc2FtcGxpbmdNb2RlIHJlc2FtcGxpbmc7Ci0gICAgaWYg KGNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLT5Jc1ByaW50aW5nKCkpCisgICAgaWYgKGNvbnRl eHQtPnBsYXRmb3JtQ29udGV4dCgpLT5pc1ByaW50aW5nKCkpCiAgICAgICByZXNhbXBsaW5nID0g UkVTQU1QTEVfTElORUFSOwogICAgIGVsc2UgewogICAgICAgcmVzYW1wbGluZyA9IGNvbXB1dGVS ZXNhbXBsaW5nTW9kZSgqYml0bWFwLApJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9z a2lhL1BhdGhTa2lhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3NraWEvUGF0aFNraWEuY3BwCShyZXZpc2lvbiAzOTkxMykKKysrIFdlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3Mvc2tpYS9QYXRoU2tpYS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE3NCw3ICsxNzQs NiBAQCB2b2lkIFBhdGg6OmFwcGx5KHZvaWQqIGluZm8sIFBhdGhBcHBsaWVyCiB7CiAgICAgU2tQ YXRoOjpJdGVyIGl0ZXIoKm1fcGF0aCwgZmFsc2UpOwogICAgIFNrUG9pbnQgcHRzWzRdOwotCiAg ICAgUGF0aEVsZW1lbnQgcGF0aEVsZW1lbnQ7CiAgICAgRmxvYXRQb2ludCBwYXRoUG9pbnRzWzNd OwogCkBAIC0yNzUsNyArMjc0LDcgQEAgc3RhdGljIEZsb2F0UmVjdCBib3VuZGluZ0JveEZvckN1 cnJlbnRTdAogICAgIFNrUGFpbnQgcGFpbnQ7CiAgICAgY29udGV4dC0+cGxhdGZvcm1Db250ZXh0 KCktPnNldHVwUGFpbnRGb3JTdHJva2luZygmcGFpbnQsIDAsIDApOwogICAgIFNrUGF0aCBib3Vu ZGluZ1BhdGg7Ci0gICAgcGFpbnQuZ2V0RmlsbFBhdGgoKmNvbnRleHQtPnBsYXRmb3JtQ29udGV4 dCgpLT5jdXJyZW50UGF0aCgpLCAmYm91bmRpbmdQYXRoKTsKKyAgICBwYWludC5nZXRGaWxsUGF0 aChjb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKS0+Y3VycmVudFBhdGgoKSwgJmJvdW5kaW5nUGF0 aCk7CiAgICAgU2tSZWN0IHI7CiAgICAgYm91bmRpbmdQYXRoLmNvbXB1dGVCb3VuZHMoJnIsIFNr UGF0aDo6a0V4YWN0X0JvdW5kc1R5cGUpOwogICAgIHJldHVybiByOwpAQCAtMjk2LDQgKzI5NSwy MiBAQCBGbG9hdFJlY3QgUGF0aDo6c3Ryb2tlQm91bmRpbmdSZWN0KFN0cm9rCiAgICAgcmV0dXJu IHI7CiB9CiAKK2Jvb2wgUGF0aDo6c3Ryb2tlQ29udGFpbnMoU3Ryb2tlU3R5bGVBcHBsaWVyKiBh cHBsaWVyLCBjb25zdCBGbG9hdFBvaW50JiBwb2ludCkgY29uc3QKK3sKKyAgICBBU1NFUlQoYXBw bGllcik7CisgICAgR3JhcGhpY3NDb250ZXh0KiBzY3JhdGNoID0gc2NyYXRjaENvbnRleHQoKTsK KyAgICBzY3JhdGNoLT5zYXZlKCk7CisKKyAgICBhcHBsaWVyLT5zdHJva2VTdHlsZShzY3JhdGNo KTsKKworICAgIFNrUGFpbnQgcGFpbnQ7CisgICAgc2NyYXRjaC0+cGxhdGZvcm1Db250ZXh0KCkt PnNldHVwUGFpbnRGb3JTdHJva2luZygmcGFpbnQsIDAsIDApOworICAgIFNrUGF0aCBzdHJva2VQ YXRoOworICAgIHBhaW50LmdldEZpbGxQYXRoKCpwbGF0Zm9ybVBhdGgoKSwgJnN0cm9rZVBhdGgp OworICAgIGJvb2wgY29udGFpbnMgPSBTa1BhdGhDb250YWluc1BvaW50KCZzdHJva2VQYXRoLCBw b2ludCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBTa1BhdGg6OmtX aW5kaW5nX0ZpbGxUeXBlKTsKKworICAgIHNjcmF0Y2gtPnJlc3RvcmUoKTsKKyAgICByZXR1cm4g Y29udGFpbnM7Cit9CiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBXZWJDb3JlL3N2Zy9n cmFwaGljcy9za2lhL1JlbmRlclBhdGhTa2lhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3N2 Zy9ncmFwaGljcy9za2lhL1JlbmRlclBhdGhTa2lhLmNwcAkocmV2aXNpb24gMzk5MTMpCisrKyBX ZWJDb3JlL3N2Zy9ncmFwaGljcy9za2lhL1JlbmRlclBhdGhTa2lhLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMSw2OSArMCwwIEBACi0vKgotICogQ29weXJpZ2h0IChjKSAyMDA4LCBHb29nbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICogCi0gKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGlu IHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKLSAqIG1vZGlmaWNhdGlv biwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBh cmUKLSAqIG1ldDoKLSAqIAotICogICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2Rl IG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqIG5vdGljZSwgdGhpcyBsaXN0IG9m IGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KLSAqICAgICAqIFJlZGlz dHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUKLSAqIGNv cHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n IGRpc2NsYWltZXIKLSAqIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlh bHMgcHJvdmlkZWQgd2l0aCB0aGUKLSAqIGRpc3RyaWJ1dGlvbi4KLSAqICAgICAqIE5laXRoZXIg dGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKLSAqIGNvbnRyaWJ1 dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVyaXZlZCBm cm9tCi0gKiB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJt aXNzaW9uLgotICogCi0gKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklH SFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCi0gKiAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBP UiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAotICogTElNSVRFRCBUTywg VEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9S Ci0gKiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hB TEwgVEhFIENPUFlSSUdIVAotICogT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1Ig QU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCi0gKiBTUEVDSUFMLCBFWEVNUExBUlks IE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCi0gKiBMSU1JVEVE IFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9G IFVTRSwKLSAqIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9X RVZFUiBDQVVTRUQgQU5EIE9OIEFOWQotICogVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJ TiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAotICogKElOQ0xVRElORyBORUdM SUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCi0g KiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9G IFNVQ0ggREFNQUdFLgotICovCi0KLSNpbmNsdWRlICJjb25maWcuaCIKLSNpbmNsdWRlICJHcmFw aGljc0NvbnRleHQuaCIKLSNpbmNsdWRlICJQbGF0Zm9ybUNvbnRleHRTa2lhLmgiCi0jaW5jbHVk ZSAiUmVuZGVyUGF0aC5oIgotI2luY2x1ZGUgIlNraWFVdGlscy5oIgotI2luY2x1ZGUgIlNrUGFp bnQuaCIKLSNpbmNsdWRlICJTa1BhdGguaCIKLSNpbmNsdWRlICJTVkdQYWludFNlcnZlci5oIgot Ci0jaWYgRU5BQkxFKFNWRykKLQotbmFtZXNwYWNlIFdlYkNvcmUgewotCi1ib29sIFJlbmRlclBh dGg6OnN0cm9rZUNvbnRhaW5zKGNvbnN0IEZsb2F0UG9pbnQmIHBvaW50LCBib29sIHJlcXVpcmVz U3Ryb2tlKSBjb25zdAotewotICAgIGlmIChwYXRoKCkuaXNFbXB0eSgpKQotICAgICAgICByZXR1 cm4gZmFsc2U7Ci0KLSAgICBpZiAocmVxdWlyZXNTdHJva2UgJiYgIVNWR1BhaW50U2VydmVyOjpz dHJva2VQYWludFNlcnZlcihzdHlsZSgpLCB0aGlzKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwot Ci0gICAgR3JhcGhpY3NDb250ZXh0KiBzY3JhdGNoID0gc2NyYXRjaENvbnRleHQoKTsKLSAgICBz Y3JhdGNoLT5zYXZlKCk7Ci0gICAgYXBwbHlTdHJva2VTdHlsZVRvQ29udGV4dChzY3JhdGNoLCBz dHlsZSgpLCB0aGlzKTsKLQotICAgIFNrUGFpbnQgcGFpbnQ7Ci0gICAgc2NyYXRjaC0+cGxhdGZv cm1Db250ZXh0KCktPnNldHVwUGFpbnRGb3JTdHJva2luZygmcGFpbnQsIDAsIDApOwotICAgIFNr UGF0aCBzdHJva2VQYXRoOwotICAgIHBhaW50LmdldEZpbGxQYXRoKCpwYXRoKCkucGxhdGZvcm1Q YXRoKCksICZzdHJva2VQYXRoKTsKLSAgICBib29sIGNvbnRhaW5zID0gU2tQYXRoQ29udGFpbnNQ b2ludCgmc3Ryb2tlUGF0aCwgcG9pbnQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgU2tQYXRoOjprV2luZGluZ19GaWxsVHlwZSk7Ci0KLSAgICBzY3JhdGNoLT5yZXN0 b3JlKCk7Ci0gICAgcmV0dXJuIGNvbnRhaW5zOwotfQotCi19Ci0KLSNlbmRpZiAvLyBFTkFCTEUo U1ZHKQo= 26769 2009-01-15 13:15:05 -0800 2009-01-15 13:16:08 -0800 One more name change. name-change.txt text/plain 1249 levin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzOTk0MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMDktMDEtMTUgIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0u b3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzMzMworCisgICAgICAgIEFk anVzdCBkdWUgdG8gYSBuYW1lIGNoYW5nZSB0aGF0IGhhcHBlbmVkIGluIGEgV2ViS2l0LgorCisg ICAgICAgICogc3ZnL2dyYXBoaWNzL3NraWEvU1ZHUGFpbnRTZXJ2ZXJQYXR0ZXJuU2tpYS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTVkdQYWludFNlcnZlclBhdHRlcm46OnNldHVwKToKKwogMjAw OS0wMS0xNSAgRGltaXRyaSBHbGF6a292ICA8ZGdsYXprb3ZAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpJbmRleDogV2ViQ29yZS9zdmcvZ3JhcGhpY3Mv c2tpYS9TVkdQYWludFNlcnZlclBhdHRlcm5Ta2lhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L3N2Zy9ncmFwaGljcy9za2lhL1NWR1BhaW50U2VydmVyUGF0dGVyblNraWEuY3BwCShyZXZpc2lv biAzOTk0MSkKKysrIFdlYkNvcmUvc3ZnL2dyYXBoaWNzL3NraWEvU1ZHUGFpbnRTZXJ2ZXJQYXR0 ZXJuU2tpYS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYwLDcgKzYwLDcgQEAgYm9vbCBTVkdQYWlu dFNlcnZlclBhdHRlcm46OnNldHVwKEdyYXBoaQogICAgIGlmICghdGlsZSgpKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKLSAgICBBZmZpbmVUcmFuc2Zvcm0gdHJhbnNmb3JtID0gcGF0dGVyblRy YW5zZm9ybSgpOworICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4IHRyYW5zZm9ybSA9IHBhdHRlcm5U cmFuc2Zvcm0oKTsKICAgICB0cmFuc2Zvcm0udHJhbnNsYXRlKHBhdHRlcm5Cb3VuZGFyaWVzKCku eCgpLCBwYXR0ZXJuQm91bmRhcmllcygpLnkoKSk7CiAKICAgICBSZWZQdHI8UGF0dGVybj4gcGF0 dGVybihQYXR0ZXJuOjpjcmVhdGUodGlsZSgpLT5pbWFnZSgpLCB0cnVlLCB0cnVlKSk7Cg==