47396 2010-10-07 20:22:43 -0700 [chromium] Fix indentation in ChromiumDataObject.h 2010-10-07 23:36:46 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 0 dcheng webkit-unassigned commit-queue tony oldest_to_newest 291424 0 dcheng 2010-10-07 20:22:43 -0700 Just a cleanup patch to make followup diffs smaller. 291456 1 70204 dcheng 2010-10-07 22:55:42 -0700 Created attachment 70204 Patch 291472 2 70204 commit-queue 2010-10-07 23:36:41 -0700 Comment on attachment 70204 Patch Clearing flags on attachment: 70204 Committed r69380: <http://trac.webkit.org/changeset/69380> 291473 3 commit-queue 2010-10-07 23:36:46 -0700 All reviewed patches have been landed. Closing bug. 70204 2010-10-07 22:55:42 -0700 2010-10-07 23:36:41 -0700 Patch foo.patch text/plain 7312 dcheng ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OGY5ZTgzYy4uYWFhMzkzNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxMC0xMC0wOCAgRGFuaWVsIENoZW5n ICA8ZGNoZW5nQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIEZpeCBpbmRlbnRhdGlvbiBpbiBDaHJvbWl1bURh dGFPYmplY3QuaCAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQ3Mzk2CisKKyAgICAgICAgSnVzdCBhIGNsZWFudXAgcGF0Y2ggdG8gbWFrZSBmb2xsb3d1 cCBkaWZmcyBzbWFsbGVyLgorCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vQ2hyb21pdW1E YXRhT2JqZWN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWl1bURhdGFPYmplY3Q6OmNyZWF0 ZSk6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWl1bURhdGFPYmplY3Q6OmNvcHkpOgorICAgICAg ICAoV2ViQ29yZTo6Q2hyb21pdW1EYXRhT2JqZWN0Ojp1cmxUaXRsZSk6CisgICAgICAgIChXZWJD b3JlOjpDaHJvbWl1bURhdGFPYmplY3Q6OnNldFVybFRpdGxlKToKKyAgICAgICAgKFdlYkNvcmU6 OkNocm9taXVtRGF0YU9iamVjdDo6aHRtbEJhc2VVcmwpOgorICAgICAgICAoV2ViQ29yZTo6Q2hy b21pdW1EYXRhT2JqZWN0OjpzZXRIdG1sQmFzZVVybCk6CisgICAgICAgIChXZWJDb3JlOjpDaHJv bWl1bURhdGFPYmplY3Q6OmNvbnRhaW5zRmlsZW5hbWVzKToKKyAgICAgICAgKFdlYkNvcmU6OkNo cm9taXVtRGF0YU9iamVjdDo6ZmlsZW5hbWVzKToKKyAgICAgICAgKFdlYkNvcmU6OkNocm9taXVt RGF0YU9iamVjdDo6c2V0RmlsZW5hbWVzKToKKyAgICAgICAgKFdlYkNvcmU6OkNocm9taXVtRGF0 YU9iamVjdDo6ZmlsZUV4dGVuc2lvbik6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWl1bURhdGFP YmplY3Q6OnNldEZpbGVFeHRlbnNpb24pOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21pdW1EYXRh T2JqZWN0OjpmaWxlQ29udGVudEZpbGVuYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OkNocm9taXVt RGF0YU9iamVjdDo6c2V0RmlsZUNvbnRlbnRGaWxlbmFtZSk6CisgICAgICAgIChXZWJDb3JlOjpD aHJvbWl1bURhdGFPYmplY3Q6OmZpbGVDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkNocm9t aXVtRGF0YU9iamVjdDo6c2V0RmlsZUNvbnRlbnQpOgorCiAyMDEwLTEwLTA3ICBEYW5pZWwgQ2hl bmcgIDxkY2hlbmdAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9DaHJvbWl1bURh dGFPYmplY3QuaCBiL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vQ2hyb21pdW1EYXRhT2JqZWN0 LmgKaW5kZXggY2Q1OGVjYi4uZDg2NDIzYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9j aHJvbWl1bS9DaHJvbWl1bURhdGFPYmplY3QuaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2Nocm9t aXVtL0Nocm9taXVtRGF0YU9iamVjdC5oCkBAIC00Miw3NyArNDIsNzcgQEAKIAogbmFtZXNwYWNl IFdlYkNvcmUgewogCi0gICAgLy8gQSBkYXRhIG9iamVjdCBmb3IgaG9sZGluZyBkYXRhIHRoYXQg d291bGQgYmUgaW4gYSBjbGlwYm9hcmQgb3IgbW92ZWQKLSAgICAvLyBkdXJpbmcgYSBkcmFnLW4t ZHJvcCBvcGVyYXRpb24uICBUaGlzIGlzIHRoZSBkYXRhIHRoYXQgV2ViQ29yZSBpcyBhd2FyZQot ICAgIC8vIG9mIGFuZCBpcyBub3Qgc3BlY2lmaWMgdG8gYSBwbGF0Zm9ybS4KLSAgICBjbGFzcyBD aHJvbWl1bURhdGFPYmplY3QgOiBwdWJsaWMgUmVmQ291bnRlZDxDaHJvbWl1bURhdGFPYmplY3Q+ IHsKLSAgICBwdWJsaWM6Ci0gICAgICAgIHN0YXRpYyBQYXNzUmVmUHRyPENocm9taXVtRGF0YU9i amVjdD4gY3JlYXRlKENsaXBib2FyZDo6Q2xpcGJvYXJkVHlwZSBjbGlwYm9hcmRUeXBlKQotICAg ICAgICB7Ci0gICAgICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IENocm9taXVtRGF0YU9iamVj dChjbGlwYm9hcmRUeXBlKSk7Ci0gICAgICAgIH0KLQotICAgICAgICBQYXNzUmVmUHRyPENocm9t aXVtRGF0YU9iamVjdD4gY29weSgpIGNvbnN0Ci0gICAgICAgIHsKLSAgICAgICAgICAgIHJldHVy biBhZG9wdFJlZihuZXcgQ2hyb21pdW1EYXRhT2JqZWN0KCp0aGlzKSk7Ci0gICAgICAgIH0KLQot ICAgICAgICB2b2lkIGNsZWFyRGF0YShjb25zdCBTdHJpbmcmIHR5cGUpOwotICAgICAgICB2b2lk IGNsZWFyQWxsKCk7Ci0gICAgICAgIHZvaWQgY2xlYXJBbGxFeGNlcHRGaWxlcygpOwotCi0gICAg ICAgIGJvb2wgaGFzRGF0YSgpIGNvbnN0OwotCi0gICAgICAgIEhhc2hTZXQ8U3RyaW5nPiB0eXBl cygpIGNvbnN0OwotICAgICAgICBTdHJpbmcgZ2V0RGF0YShjb25zdCBTdHJpbmcmIHR5cGUsIGJv b2wmIHN1Y2Nlc3MpOwotICAgICAgICBib29sIHNldERhdGEoY29uc3QgU3RyaW5nJiB0eXBlLCBj b25zdCBTdHJpbmcmIGRhdGEpOwotCi0gICAgICAgIC8vIFNwZWNpYWwgaGFuZGxlcnMgZm9yIFVS TC9IVE1MIG1ldGFkYXRhLgotICAgICAgICBTdHJpbmcgdXJsVGl0bGUoKSBjb25zdCB7IHJldHVy biBtX3VybFRpdGxlOyB9Ci0gICAgICAgIHZvaWQgc2V0VXJsVGl0bGUoY29uc3QgU3RyaW5nJiB1 cmxUaXRsZSkgeyBtX3VybFRpdGxlID0gdXJsVGl0bGU7IH0KLSAgICAgICAgS1VSTCBodG1sQmFz ZVVybCgpIGNvbnN0IHsgcmV0dXJuIG1faHRtbEJhc2VVcmw7IH0KLSAgICAgICAgdm9pZCBzZXRI dG1sQmFzZVVybChjb25zdCBLVVJMJiB1cmwpIHsgbV9odG1sQmFzZVVybCA9IHVybDsgfQotCi0g ICAgICAgIC8vIFVzZWQgdG8gaGFuZGxlIGZpbGVzIGJlaW5nIGRyYWdnZWQgaW4uCi0gICAgICAg IGJvb2wgY29udGFpbnNGaWxlbmFtZXMoKSBjb25zdCB7IHJldHVybiAhbV9maWxlbmFtZXMuaXNF bXB0eSgpOyB9Ci0gICAgICAgIFZlY3RvcjxTdHJpbmc+IGZpbGVuYW1lcygpIGNvbnN0IHsgcmV0 dXJuIG1fZmlsZW5hbWVzOyB9Ci0gICAgICAgIHZvaWQgc2V0RmlsZW5hbWVzKGNvbnN0IFZlY3Rv cjxTdHJpbmc+JiBmaWxlbmFtZXMpIHsgbV9maWxlbmFtZXMgPSBmaWxlbmFtZXM7IH0KLQotICAg ICAgICAvLyBVc2VkIHRvIGhhbmRsZSBmaWxlcyAoaW1hZ2VzKSBiZWluZyBkcmFnZ2VkIG91dC4K LSAgICAgICAgU3RyaW5nIGZpbGVFeHRlbnNpb24oKSBjb25zdCB7IHJldHVybiBtX2ZpbGVFeHRl bnNpb247IH0KLSAgICAgICAgdm9pZCBzZXRGaWxlRXh0ZW5zaW9uKGNvbnN0IFN0cmluZyYgZmls ZUV4dGVuc2lvbikgeyBtX2ZpbGVFeHRlbnNpb24gPSBmaWxlRXh0ZW5zaW9uOyB9Ci0gICAgICAg IFN0cmluZyBmaWxlQ29udGVudEZpbGVuYW1lKCkgY29uc3QgeyByZXR1cm4gbV9maWxlQ29udGVu dEZpbGVuYW1lOyB9Ci0gICAgICAgIHZvaWQgc2V0RmlsZUNvbnRlbnRGaWxlbmFtZShjb25zdCBT dHJpbmcmIGZpbGVDb250ZW50RmlsZW5hbWUpIHsgbV9maWxlQ29udGVudEZpbGVuYW1lID0gZmls ZUNvbnRlbnRGaWxlbmFtZTsgfQotICAgICAgICBQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gZmls ZUNvbnRlbnQoKSBjb25zdCB7IHJldHVybiBtX2ZpbGVDb250ZW50OyB9Ci0gICAgICAgIHZvaWQg c2V0RmlsZUNvbnRlbnQoUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+IGZpbGVDb250ZW50KSB7IG1f ZmlsZUNvbnRlbnQgPSBmaWxlQ29udGVudDsgfQotCi0gICAgcHJpdmF0ZToKLSAgICAgICAgQ2hy b21pdW1EYXRhT2JqZWN0KENsaXBib2FyZDo6Q2xpcGJvYXJkVHlwZSk7Ci0gICAgICAgIENocm9t aXVtRGF0YU9iamVjdChjb25zdCBDaHJvbWl1bURhdGFPYmplY3QmKTsKLQotICAgICAgICBDbGlw Ym9hcmQ6OkNsaXBib2FyZFR5cGUgbV9jbGlwYm9hcmRUeXBlOwotCi0gICAgICAgIFN0cmluZyBt X3VybFRpdGxlOwotCi0gICAgICAgIFN0cmluZyBtX2Rvd25sb2FkTWV0YWRhdGE7Ci0KLSAgICAg ICAgU3RyaW5nIG1fZmlsZUV4dGVuc2lvbjsKLSAgICAgICAgVmVjdG9yPFN0cmluZz4gbV9maWxl bmFtZXM7Ci0KLSAgICAgICAgU3RyaW5nIG1fcGxhaW5UZXh0OwotCi0gICAgICAgIFN0cmluZyBt X3RleHRIdG1sOwotICAgICAgICBLVVJMIG1faHRtbEJhc2VVcmw7Ci0KLSAgICAgICAgU3RyaW5n IG1fZmlsZUNvbnRlbnRGaWxlbmFtZTsKLSAgICAgICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gbV9m aWxlQ29udGVudDsKLQotICAgICAgICAvLyBUaGVzZSB0d28gYXJlIGxpbmtlZC4gU2V0dGluZyBt X3VybCB3aWxsIHNldCBtX3VyaUxpc3QgdG8gdGhlIHNhbWUKLSAgICAgICAgLy8gc3RyaW5nIHZh bHVlOyBzZXR0aW5nIG1fdXJpTGlzdCB3aWxsIGNhdXNlIGl0cyBjb250ZW50cyB0byBiZSBwYXJz ZWQKLSAgICAgICAgLy8gYWNjb3JkaW5nIHRvIFJGQyAyNDgzIGFuZCB0aGUgZmlyc3QgVVJMIGZv dW5kIHdpbGwgYmUgc2V0IGluIG1fdXJsLgotICAgICAgICBLVVJMIG1fdXJsOwotICAgICAgICBT dHJpbmcgbV91cmlMaXN0OwotICAgIH07CisvLyBBIGRhdGEgb2JqZWN0IGZvciBob2xkaW5nIGRh dGEgdGhhdCB3b3VsZCBiZSBpbiBhIGNsaXBib2FyZCBvciBtb3ZlZAorLy8gZHVyaW5nIGEgZHJh Zy1uLWRyb3Agb3BlcmF0aW9uLiAgVGhpcyBpcyB0aGUgZGF0YSB0aGF0IFdlYkNvcmUgaXMgYXdh cmUKKy8vIG9mIGFuZCBpcyBub3Qgc3BlY2lmaWMgdG8gYSBwbGF0Zm9ybS4KK2NsYXNzIENocm9t aXVtRGF0YU9iamVjdCA6IHB1YmxpYyBSZWZDb3VudGVkPENocm9taXVtRGF0YU9iamVjdD4gewor cHVibGljOgorICAgIHN0YXRpYyBQYXNzUmVmUHRyPENocm9taXVtRGF0YU9iamVjdD4gY3JlYXRl KENsaXBib2FyZDo6Q2xpcGJvYXJkVHlwZSBjbGlwYm9hcmRUeXBlKQorICAgIHsKKyAgICAgICAg cmV0dXJuIGFkb3B0UmVmKG5ldyBDaHJvbWl1bURhdGFPYmplY3QoY2xpcGJvYXJkVHlwZSkpOwor ICAgIH0KKworICAgIFBhc3NSZWZQdHI8Q2hyb21pdW1EYXRhT2JqZWN0PiBjb3B5KCkgY29uc3QK KyAgICB7CisgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgQ2hyb21pdW1EYXRhT2JqZWN0KCp0 aGlzKSk7CisgICAgfQorCisgICAgdm9pZCBjbGVhckRhdGEoY29uc3QgU3RyaW5nJiB0eXBlKTsK KyAgICB2b2lkIGNsZWFyQWxsKCk7CisgICAgdm9pZCBjbGVhckFsbEV4Y2VwdEZpbGVzKCk7CisK KyAgICBib29sIGhhc0RhdGEoKSBjb25zdDsKKworICAgIEhhc2hTZXQ8U3RyaW5nPiB0eXBlcygp IGNvbnN0OworICAgIFN0cmluZyBnZXREYXRhKGNvbnN0IFN0cmluZyYgdHlwZSwgYm9vbCYgc3Vj Y2Vzcyk7CisgICAgYm9vbCBzZXREYXRhKGNvbnN0IFN0cmluZyYgdHlwZSwgY29uc3QgU3RyaW5n JiBkYXRhKTsKKworICAgIC8vIFNwZWNpYWwgaGFuZGxlcnMgZm9yIFVSTC9IVE1MIG1ldGFkYXRh LgorICAgIFN0cmluZyB1cmxUaXRsZSgpIGNvbnN0IHsgcmV0dXJuIG1fdXJsVGl0bGU7IH0KKyAg ICB2b2lkIHNldFVybFRpdGxlKGNvbnN0IFN0cmluZyYgdXJsVGl0bGUpIHsgbV91cmxUaXRsZSA9 IHVybFRpdGxlOyB9CisgICAgS1VSTCBodG1sQmFzZVVybCgpIGNvbnN0IHsgcmV0dXJuIG1faHRt bEJhc2VVcmw7IH0KKyAgICB2b2lkIHNldEh0bWxCYXNlVXJsKGNvbnN0IEtVUkwmIHVybCkgeyBt X2h0bWxCYXNlVXJsID0gdXJsOyB9CisKKyAgICAvLyBVc2VkIHRvIGhhbmRsZSBmaWxlcyBiZWlu ZyBkcmFnZ2VkIGluLgorICAgIGJvb2wgY29udGFpbnNGaWxlbmFtZXMoKSBjb25zdCB7IHJldHVy biAhbV9maWxlbmFtZXMuaXNFbXB0eSgpOyB9CisgICAgVmVjdG9yPFN0cmluZz4gZmlsZW5hbWVz KCkgY29uc3QgeyByZXR1cm4gbV9maWxlbmFtZXM7IH0KKyAgICB2b2lkIHNldEZpbGVuYW1lcyhj b25zdCBWZWN0b3I8U3RyaW5nPiYgZmlsZW5hbWVzKSB7IG1fZmlsZW5hbWVzID0gZmlsZW5hbWVz OyB9CisKKyAgICAvLyBVc2VkIHRvIGhhbmRsZSBmaWxlcyAoaW1hZ2VzKSBiZWluZyBkcmFnZ2Vk IG91dC4KKyAgICBTdHJpbmcgZmlsZUV4dGVuc2lvbigpIGNvbnN0IHsgcmV0dXJuIG1fZmlsZUV4 dGVuc2lvbjsgfQorICAgIHZvaWQgc2V0RmlsZUV4dGVuc2lvbihjb25zdCBTdHJpbmcmIGZpbGVF eHRlbnNpb24pIHsgbV9maWxlRXh0ZW5zaW9uID0gZmlsZUV4dGVuc2lvbjsgfQorICAgIFN0cmlu ZyBmaWxlQ29udGVudEZpbGVuYW1lKCkgY29uc3QgeyByZXR1cm4gbV9maWxlQ29udGVudEZpbGVu YW1lOyB9CisgICAgdm9pZCBzZXRGaWxlQ29udGVudEZpbGVuYW1lKGNvbnN0IFN0cmluZyYgZmls ZUNvbnRlbnRGaWxlbmFtZSkgeyBtX2ZpbGVDb250ZW50RmlsZW5hbWUgPSBmaWxlQ29udGVudEZp bGVuYW1lOyB9CisgICAgUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+IGZpbGVDb250ZW50KCkgY29u c3QgeyByZXR1cm4gbV9maWxlQ29udGVudDsgfQorICAgIHZvaWQgc2V0RmlsZUNvbnRlbnQoUGFz c1JlZlB0cjxTaGFyZWRCdWZmZXI+IGZpbGVDb250ZW50KSB7IG1fZmlsZUNvbnRlbnQgPSBmaWxl Q29udGVudDsgfQorCitwcml2YXRlOgorICAgIENocm9taXVtRGF0YU9iamVjdChDbGlwYm9hcmQ6 OkNsaXBib2FyZFR5cGUpOworICAgIENocm9taXVtRGF0YU9iamVjdChjb25zdCBDaHJvbWl1bURh dGFPYmplY3QmKTsKKworICAgIENsaXBib2FyZDo6Q2xpcGJvYXJkVHlwZSBtX2NsaXBib2FyZFR5 cGU7CisKKyAgICBTdHJpbmcgbV91cmxUaXRsZTsKKworICAgIFN0cmluZyBtX2Rvd25sb2FkTWV0 YWRhdGE7CisKKyAgICBTdHJpbmcgbV9maWxlRXh0ZW5zaW9uOworICAgIFZlY3RvcjxTdHJpbmc+ IG1fZmlsZW5hbWVzOworCisgICAgU3RyaW5nIG1fcGxhaW5UZXh0OworCisgICAgU3RyaW5nIG1f dGV4dEh0bWw7CisgICAgS1VSTCBtX2h0bWxCYXNlVXJsOworCisgICAgU3RyaW5nIG1fZmlsZUNv bnRlbnRGaWxlbmFtZTsKKyAgICBSZWZQdHI8U2hhcmVkQnVmZmVyPiBtX2ZpbGVDb250ZW50Owor CisgICAgLy8gVGhlc2UgdHdvIGFyZSBsaW5rZWQuIFNldHRpbmcgbV91cmwgd2lsbCBzZXQgbV91 cmlMaXN0IHRvIHRoZSBzYW1lCisgICAgLy8gc3RyaW5nIHZhbHVlOyBzZXR0aW5nIG1fdXJpTGlz dCB3aWxsIGNhdXNlIGl0cyBjb250ZW50cyB0byBiZSBwYXJzZWQKKyAgICAvLyBhY2NvcmRpbmcg dG8gUkZDIDI0ODMgYW5kIHRoZSBmaXJzdCBVUkwgZm91bmQgd2lsbCBiZSBzZXQgaW4gbV91cmwu CisgICAgS1VSTCBtX3VybDsKKyAgICBTdHJpbmcgbV91cmlMaXN0OworfTsKIAogfSAvLyBuYW1l c3BhY2UgV2ViQ29yZQogCg==