41021 2010-06-22 16:32:17 -0700 Use the ArgumentCoder class template for decoding 2010-06-22 16:35:56 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 241528 0 andersca 2010-06-22 16:32:17 -0700 Use the ArgumentCoder class template for decoding 241531 1 59442 andersca 2010-06-22 16:33:00 -0700 Created attachment 59442 Patch 241534 2 andersca 2010-06-22 16:35:56 -0700 Committed r61635: <http://trac.webkit.org/changeset/61635> 59442 2010-06-22 16:33:00 -0700 2010-06-22 16:34:22 -0700 Patch bug-41021-20100622163259.patch text/plain 7261 andersca SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MTYzNCkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDYtMjIgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBVc2UgdGhlIEFyZ3VtZW50Q29kZXIgY2xhc3MgdGVtcGxhdGUgZm9yIGRlY29kaW5nCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MTAyMQorCisgICAg ICAgICogUGxhdGZvcm0vQ29yZUlQQy9Bcmd1bWVudENvZGVyLmg6CisgICAgICAgIChDb3JlSVBD OjpBcmd1bWVudENvZGVyOjpkZWNvZGUpOgorICAgICAgICAqIFBsYXRmb3JtL0NvcmVJUEMvQXJn dW1lbnREZWNvZGVyLmg6CisgICAgICAgIChDb3JlSVBDOjpBcmd1bWVudERlY29kZXI6OmRlY29k ZSk6CisgICAgICAgICogU2hhcmVkL1dlYkNvcmVUeXBlQXJndW1lbnRNYXJzaGFsbGluZy5oOgor ICAgICAgICAoQ29yZUlQQzo6KToKKwogMjAxMC0wNi0yMiAgQW5kZXJzIENhcmxzc29uICA8YW5k ZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3RlaW4uCklu ZGV4OiBXZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvQXJndW1lbnRDb2Rlci5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9Bcmd1bWVudENvZGVyLmgJKHJldmlzaW9uIDYx NjM0KQorKysgV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0FyZ3VtZW50Q29kZXIuaAkod29ya2lu ZyBjb3B5KQpAQCAtMzgsNiArMzgsMTEgQEAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gc3RydWN0IEFy Z3VtZW50Q29kZQogICAgIHsKICAgICAgICAgdC5lbmNvZGUoKmVuY29kZXIpOwogICAgIH0KKwor ICAgIHN0YXRpYyBib29sIGRlY29kZShBcmd1bWVudERlY29kZXIqIGRlY29kZXIsIFQmIHQpCisg ICAgeworICAgICAgICByZXR1cm4gVDo6ZGVjb2RlKCpkZWNvZGVyLCB0KTsKKyAgICB9CiB9Owog CiB9CkluZGV4OiBXZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvQXJndW1lbnREZWNvZGVyLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0FyZ3VtZW50RGVjb2Rlci5oCShy ZXZpc2lvbiA2MTYyNykKKysrIFdlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9Bcmd1bWVudERlY29k ZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMjYsMjUgKzI2LDEzIEBACiAjaWZuZGVmIEFyZ3VtZW50 RGVjb2Rlcl9oCiAjZGVmaW5lIEFyZ3VtZW50RGVjb2Rlcl9oCiAKKyNpbmNsdWRlICJBcmd1bWVu dENvZGVyLmgiCiAjaW5jbHVkZSAiQXR0YWNobWVudC5oIgogI2luY2x1ZGUgPHd0Zi9EZXF1ZS5o PgotI2luY2x1ZGUgPHd0Zi9UeXBlVHJhaXRzLmg+CiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgog CiBuYW1lc3BhY2UgQ29yZUlQQyB7CiAKLWNsYXNzIEFyZ3VtZW50RGVjb2RlcjsKLWNsYXNzIEF0 dGFjaG1lbnQ7Ci0KLW5hbWVzcGFjZSBBcmd1bWVudENvZGVycyB7Ci0KLXRlbXBsYXRlPHR5cGVu YW1lIFQ+IGJvb2wgZGVjb2RlKEFyZ3VtZW50RGVjb2RlciYgZGVjb2RlciwgVCYgdCkKLXsKLSAg ICByZXR1cm4gV1RGOjpSZW1vdmVQb2ludGVyPFQ+OjpUeXBlOjpkZWNvZGUoZGVjb2RlciwgdCk7 Ci19Ci0KLX0KLQogY2xhc3MgQXJndW1lbnREZWNvZGVyIHsKIHB1YmxpYzoKICAgICBBcmd1bWVu dERlY29kZXIoY29uc3QgdWludDhfdCogYnVmZmVyLCBzaXplX3QgYnVmZmVyU2l6ZSk7CkBAIC02 Nyw3ICs1NSw3IEBAIHB1YmxpYzoKICAgICAvLyBHZW5lcmljIHR5cGUgZGVjb2RlIGZ1bmN0aW9u LgogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IGJvb2wgZGVjb2RlKFQmIHQpCiAgICAgewotICAg ICAgICByZXR1cm4gQXJndW1lbnRDb2RlcnM6OmRlY29kZTxUPigqdGhpcywgdCk7CisgICAgICAg IHJldHVybiBBcmd1bWVudENvZGVyPFQ+OjpkZWNvZGUodGhpcywgdCk7CiAgICAgfQogCiAgICAg Ly8gVGhpcyBvdmVybG9hZCBleGlzdHMgc28gd2UgY2FuIHBhc3MgdGVtcG9yYXJpZXMgdG8gZGVj b2RlLiBJbiB0aGUgU3RhciBUcmVrIGZ1dHVyZSwgaXQgCkluZGV4OiBXZWJLaXQyL1NoYXJlZC9X ZWJDb3JlVHlwZUFyZ3VtZW50TWFyc2hhbGxpbmcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1No YXJlZC9XZWJDb3JlVHlwZUFyZ3VtZW50TWFyc2hhbGxpbmcuaAkocmV2aXNpb24gNjE2MzQpCisr KyBXZWJLaXQyL1NoYXJlZC9XZWJDb3JlVHlwZUFyZ3VtZW50TWFyc2hhbGxpbmcuaAkod29ya2lu ZyBjb3B5KQpAQCAtNDAsNiArNDAsMTggQEAgdGVtcGxhdGU8PiBzdHJ1Y3QgQXJndW1lbnRDb2Rl cjxXZWJDb3JlOgogICAgIHsKICAgICAgICAgZW5jb2Rlci0+ZW5jb2RlKENvcmVJUEM6OkluKHAu eCgpLCBwLnkoKSkpOwogICAgIH07CisKKyAgICBzdGF0aWMgYm9vbCBkZWNvZGUoQXJndW1lbnRE ZWNvZGVyKiBkZWNvZGVyLCBXZWJDb3JlOjpJbnRQb2ludCYgcCkKKyAgICB7CisgICAgICAgIGlu dCB4OworICAgICAgICBpbnQgeTsKKyAgICAgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUoQ29yZUlQ Qzo6T3V0KHgsIHkpKSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgCisgICAg ICAgIHAuc2V0WCh4KTsKKyAgICAgICAgcC5zZXRZKHkpOworICAgICAgICByZXR1cm4gdHJ1ZTsK KyAgICB9CiB9OwogCiB0ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1bWVudENvZGVyPFdlYkNvcmU6Oklu dFNpemU+IHsKQEAgLTQ3LDYgKzU5LDE5IEBAIHRlbXBsYXRlPD4gc3RydWN0IEFyZ3VtZW50Q29k ZXI8V2ViQ29yZToKICAgICB7CiAgICAgICAgIGVuY29kZXItPmVuY29kZShDb3JlSVBDOjpJbihz LndpZHRoKCksIHMuaGVpZ2h0KCkpKTsKICAgICB9OworICAgIAorICAgIHN0YXRpYyBib29sIGRl Y29kZShBcmd1bWVudERlY29kZXIqIGRlY29kZXIsIFdlYkNvcmU6OkludFNpemUmIHMpCisgICAg eworICAgICAgICBpbnQgd2lkdGg7CisgICAgICAgIGludCBoZWlnaHQ7CisgICAgICAgIGlmICgh ZGVjb2Rlci0+ZGVjb2RlKENvcmVJUEM6Ok91dCh3aWR0aCwgaGVpZ2h0KSkpCisgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CisgICAgICAgIAorICAgICAgICBzLnNldFdpZHRoKHdpZHRoKTsKKyAg ICAgICAgcy5zZXRIZWlnaHQoaGVpZ2h0KTsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQor CiB9OwogCiB0ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1bWVudENvZGVyPFdlYkNvcmU6OkludFJlY3Q+ IHsKQEAgLTU0LDYgKzc5LDE4IEBAIHRlbXBsYXRlPD4gc3RydWN0IEFyZ3VtZW50Q29kZXI8V2Vi Q29yZToKICAgICB7CiAgICAgICAgIGVuY29kZXItPmVuY29kZShDb3JlSVBDOjpJbihyLmxvY2F0 aW9uKCksIHIuc2l6ZSgpKSk7CiAgICAgfTsKKyAgICAKKyAgICBzdGF0aWMgYm9vbCBkZWNvZGUo QXJndW1lbnREZWNvZGVyKiBkZWNvZGVyLCBXZWJDb3JlOjpJbnRSZWN0JiByKQorICAgIHsKKyAg ICAgICAgV2ViQ29yZTo6SW50UG9pbnQgbG9jYXRpb247CisgICAgICAgIFdlYkNvcmU6OkludFNp emUgc2l6ZTsKKyAgICAgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUoQ29yZUlQQzo6T3V0KGxvY2F0 aW9uLCBzaXplKSkpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIAorICAgICAg ICByLnNldExvY2F0aW9uKGxvY2F0aW9uKTsKKyAgICAgICAgci5zZXRTaXplKHNpemUpOworICAg ICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CiB9OwogCiB0ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1bWVu dENvZGVyPFdlYkNvcmU6OlN0cmluZz4gewpAQCAtNjMsMTA4ICsxMDAsMjMgQEAgdGVtcGxhdGU8 PiBzdHJ1Y3QgQXJndW1lbnRDb2RlcjxXZWJDb3JlOgogICAgICAgICBlbmNvZGVyLT5lbmNvZGUo bGVuZ3RoKTsKICAgICAgICAgZW5jb2Rlci0+ZW5jb2RlQnl0ZXMocmVpbnRlcnByZXRfY2FzdDxj b25zdCB1aW50OF90Kj4oc3RyaW5nLmNoYXJhY3RlcnMoKSksIGxlbmd0aCAqIHNpemVvZihVQ2hh cikpOwogICAgIH0KLX07Ci0KLW5hbWVzcGFjZSBBcmd1bWVudENvZGVycyB7Ci0KLS8vIEZJWE1F OiBJbnRQb2ludC9JbnRTaXplL0ludFJlY3QvRmxvYXRQb2ludC9GbG9hdFNpemUvRmxvYXRSZWN0 IHNob3VsZCBhbGwKLS8vIGJlIGFibGUgdG8gYmUgdHJlYXRlZCBhcyBQT0QtbGlrZSB0eXBlcyBh bmQgdGh1cyBtZW1jcHktYWJsZS4gIAotCi0vLyBXZWJDb3JlOjpJbnRQb2ludAotdGVtcGxhdGU8 PiBpbmxpbmUgYm9vbCBkZWNvZGUoQXJndW1lbnREZWNvZGVyJiBkZWNvZGVyLCBXZWJDb3JlOjpJ bnRQb2ludCYgcCkKLXsKLSAgICBpbnQgeDsKLSAgICBpbnQgeTsKLSAgICBpZiAoIWRlY29kZXIu ZGVjb2RlKENvcmVJUEM6Ok91dCh4LCB5KSkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAK LSAgICBwLnNldFgoeCk7Ci0gICAgcC5zZXRZKHkpOwotICAgIHJldHVybiB0cnVlOwotfQotCi0v LyBXZWJDb3JlOjpJbnRTaXplCi10ZW1wbGF0ZTw+IGlubGluZSBib29sIGRlY29kZShBcmd1bWVu dERlY29kZXImIGRlY29kZXIsIFdlYkNvcmU6OkludFNpemUmIHMpCi17Ci0gICAgaW50IHdpZHRo OwotICAgIGludCBoZWlnaHQ7Ci0gICAgaWYgKCFkZWNvZGVyLmRlY29kZShDb3JlSVBDOjpPdXQo d2lkdGgsIGhlaWdodCkpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgCi0gICAgcy5zZXRX aWR0aCh3aWR0aCk7Ci0gICAgcy5zZXRIZWlnaHQoaGVpZ2h0KTsKLSAgICByZXR1cm4gdHJ1ZTsK LX0KLQotLy8gV2ViQ29yZTo6SW50UmVjdAotdGVtcGxhdGU8PiBpbmxpbmUgYm9vbCBkZWNvZGUo QXJndW1lbnREZWNvZGVyJiBkZWNvZGVyLCBXZWJDb3JlOjpJbnRSZWN0JiByKQotewotICAgIFdl YkNvcmU6OkludFBvaW50IGxvY2F0aW9uOwotICAgIFdlYkNvcmU6OkludFNpemUgc2l6ZTsKLSAg ICBpZiAoIWRlY29kZXIuZGVjb2RlKENvcmVJUEM6Ok91dChsb2NhdGlvbiwgc2l6ZSkpKQotICAg ICAgICByZXR1cm4gZmFsc2U7Ci0gICAgCi0gICAgci5zZXRMb2NhdGlvbihsb2NhdGlvbik7Ci0g ICAgci5zZXRTaXplKHNpemUpOwotICAgIHJldHVybiB0cnVlOwotfQotCi0vLyBXZWJDb3JlOjpG bG9hdFBvaW50Ci10ZW1wbGF0ZTw+IGlubGluZSBib29sIGRlY29kZShBcmd1bWVudERlY29kZXIm IGRlY29kZXIsIFdlYkNvcmU6OkZsb2F0UG9pbnQmIHApCi17Ci0gICAgZmxvYXQgeDsKLSAgICBm bG9hdCB5OwotICAgIGlmICghZGVjb2Rlci5kZWNvZGUoQ29yZUlQQzo6T3V0KHgsIHkpKSkKLSAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgIAotICAgIHAuc2V0WCh4KTsKLSAgICBwLnNldFkoeSk7 Ci0gICAgcmV0dXJuIHRydWU7Ci19Ci0KLS8vIFdlYkNvcmU6OkZsb2F0U2l6ZQotdGVtcGxhdGU8 PiBpbmxpbmUgYm9vbCBkZWNvZGUoQXJndW1lbnREZWNvZGVyJiBkZWNvZGVyLCBXZWJDb3JlOjpG bG9hdFNpemUmIHMpCi17Ci0gICAgZmxvYXQgd2lkdGg7Ci0gICAgZmxvYXQgaGVpZ2h0OwotICAg IGlmICghZGVjb2Rlci5kZWNvZGUoQ29yZUlQQzo6T3V0KHdpZHRoLCBoZWlnaHQpKSkKLSAgICAg ICAgcmV0dXJuIGZhbHNlOwotICAgIAotICAgIHMuc2V0V2lkdGgod2lkdGgpOwotICAgIHMuc2V0 SGVpZ2h0KGhlaWdodCk7Ci0gICAgcmV0dXJuIHRydWU7Ci19Ci0KLS8vIFdlYkNvcmU6OkZsb2F0 UmVjdAotdGVtcGxhdGU8PiBpbmxpbmUgYm9vbCBkZWNvZGUoQXJndW1lbnREZWNvZGVyJiBkZWNv ZGVyLCBXZWJDb3JlOjpGbG9hdFJlY3QmIHIpCi17Ci0gICAgV2ViQ29yZTo6RmxvYXRQb2ludCBs b2NhdGlvbjsKLSAgICBXZWJDb3JlOjpGbG9hdFNpemUgc2l6ZTsKLSAgICBpZiAoIWRlY29kZXIu ZGVjb2RlKENvcmVJUEM6Ok91dChsb2NhdGlvbiwgc2l6ZSkpKQotICAgICAgICByZXR1cm4gZmFs c2U7Ci0gICAgCi0gICAgci5zZXRMb2NhdGlvbihsb2NhdGlvbik7Ci0gICAgci5zZXRTaXplKHNp emUpOwotICAgIHJldHVybiB0cnVlOwotfQotCi0vLyBXZWJDb3JlOjpTdHJpbmcKLXRlbXBsYXRl PD4gaW5saW5lIGJvb2wgZGVjb2RlKEFyZ3VtZW50RGVjb2RlciYgZGVjb2RlciwgV2ViQ29yZTo6 U3RyaW5nJiBzKQotewotICAgIHVpbnQzMl90IGxlbmd0aDsKLSAgICBpZiAoIWRlY29kZXIuZGVj b2RlKGxlbmd0aCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIFVDaGFyKiBidWZmZXI7 Ci0gICAgV2ViQ29yZTo6U3RyaW5nIHN0cmluZyA9IFdlYkNvcmU6OlN0cmluZzo6Y3JlYXRlVW5p bml0aWFsaXplZChsZW5ndGgsIGJ1ZmZlcik7Ci0gICAgaWYgKCFkZWNvZGVyLmRlY29kZUJ5dGVz KHJlaW50ZXJwcmV0X2Nhc3Q8dWludDhfdCo+KGJ1ZmZlciksIGxlbmd0aCAqIHNpemVvZihVQ2hh cikpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBzID0gc3RyaW5nOwotICAgIHJldHVy biB0cnVlOwotfQorICAgIHN0YXRpYyBib29sIGRlY29kZShBcmd1bWVudERlY29kZXIqIGRlY29k ZXIsIFdlYkNvcmU6OlN0cmluZyYgcykKKyAgICB7CisgICAgICAgIHVpbnQzMl90IGxlbmd0aDsK KyAgICAgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUobGVuZ3RoKSkKKyAgICAgICAgICAgIHJldHVy biBmYWxzZTsKKyAgICAgICAgCisgICAgICAgIFVDaGFyKiBidWZmZXI7CisgICAgICAgIFdlYkNv cmU6OlN0cmluZyBzdHJpbmcgPSBXZWJDb3JlOjpTdHJpbmc6OmNyZWF0ZVVuaW5pdGlhbGl6ZWQo bGVuZ3RoLCBidWZmZXIpOworICAgICAgICBpZiAoIWRlY29kZXItPmRlY29kZUJ5dGVzKHJlaW50 ZXJwcmV0X2Nhc3Q8dWludDhfdCo+KGJ1ZmZlciksIGxlbmd0aCAqIHNpemVvZihVQ2hhcikpKQor ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAKKyAgICAgICAgcyA9IHN0cmluZzsK KyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorfTsKIAotfSAvLyBuYW1lc3BhY2UgQXJndW1l bnRDb2RlcnMKIH0gLy8gbmFtZXNwYWNlIENvcmVJUEMKIAogI2VuZGlmIC8vIFdlYkNvcmVUeXBl QXJndW1lbnRNYXJzaGFsbGluZ19oCg==