59374 2011-04-25 16:07:15 -0700 Page*.cpp and objc_runtime.mm should play nice with strict OwnPtrs 2011-04-25 16:08:47 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth abarth darin oldest_to_newest 391992 0 abarth 2011-04-25 16:07:15 -0700 Page*.cpp and objc_runtime.mm should play nice with strict OwnPtrs 391995 1 90979 abarth 2011-04-25 16:07:36 -0700 Created attachment 90979 Patch 392000 2 abarth 2011-04-25 16:08:47 -0700 Committed r84822: <http://trac.webkit.org/changeset/84822> 90979 2011-04-25 16:07:36 -0700 2011-04-25 16:08:11 -0700 Patch bug-59374-20110425160734.patch text/plain 4950 abarth SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg0ODIxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDQtMjUgIEFkYW0gQmFy dGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBQYWdlKi5jcHAgYW5kIG9iamNfcnVudGltZS5tbSBzaG91bGQgcGxh eSBuaWNlIHdpdGggc3RyaWN0IE93blB0cnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTU5Mzc0CisKKyAgICAgICAgKiBicmlkZ2Uvb2JqYy9vYmpjX3J1 bnRpbWUubW06CisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpjYWxsT2JqQ0ZhbGxiYWNrT2JqZWN0 KToKKyAgICAgICAgKiBwYWdlL1BhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6UGFn ZSk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjppbml0R3JvdXApOgorICAgICAgICAqIHBhZ2Uv UGFnZUdyb3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VHcm91cDo6YWRkVXNlclNjcmlw dFRvV29ybGQpOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUdyb3VwOjphZGRVc2VyU3R5bGVTaGVl dFRvV29ybGQpOgorICAgICAgICAqIHBhZ2UvbWFjL1BhZ2VNYWMuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UGFnZTo6YWRkU2NoZWR1bGVQYWlyKToKKwogMjAxMS0wNC0yNSAgR2VvZmZyZXkgR2Fy ZW4gIDxnZ2FyZW5AYXBwbGUuY29tPgogCiAgICAgICAgIEJ1aWxkIGZpeDogVGhpcyB0aW1lIGZv ciBzdXJlIQpJbmRleDogU291cmNlL1dlYkNvcmUvYnJpZGdlL29iamMvb2JqY19ydW50aW1lLm1t Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JyaWRnZS9vYmpjL29iamNfcnVudGltZS5t bQkocmV2aXNpb24gODQ4MDUpCisrKyBTb3VyY2UvV2ViQ29yZS9icmlkZ2Uvb2JqYy9vYmpjX3J1 bnRpbWUubW0JKHdvcmtpbmcgY29weSkKQEAgLTIzNiw3ICsyMzYsNyBAQCBzdGF0aWMgRW5jb2Rl ZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBjYWxsCiAgICAgCiAgICAgaWYgKFt0YXJnZXRPYmplY3Qg cmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihpbnZva2VVbmRlZmluZWRNZXRob2RGcm9tV2Vi U2NyaXB0OndpdGhBcmd1bWVudHM6KV0pewogICAgICAgICBPYmpjQ2xhc3MqIG9iamNDbGFzcyA9 IHN0YXRpY19jYXN0PE9iamNDbGFzcyo+KG9iamNJbnN0YW5jZS0+Z2V0Q2xhc3MoKSk7Ci0gICAg ICAgIE93blB0cjxPYmpjTWV0aG9kPiBmYWxsYmFja01ldGhvZChuZXcgT2JqY01ldGhvZChvYmpj Q2xhc3MtPmlzYSgpLCBAc2VsZWN0b3IoaW52b2tlVW5kZWZpbmVkTWV0aG9kRnJvbVdlYlNjcmlw dDp3aXRoQXJndW1lbnRzOikpKTsKKyAgICAgICAgT3duUHRyPE9iamNNZXRob2Q+IGZhbGxiYWNr TWV0aG9kKGFkb3B0UHRyKG5ldyBPYmpjTWV0aG9kKG9iamNDbGFzcy0+aXNhKCksIEBzZWxlY3Rv cihpbnZva2VVbmRlZmluZWRNZXRob2RGcm9tV2ViU2NyaXB0OndpdGhBcmd1bWVudHM6KSkpKTsK ICAgICAgICAgY29uc3QgSWRlbnRpZmllciYgbmFtZUlkZW50aWZpZXIgPSBzdGF0aWNfY2FzdDxP YmpjRmFsbGJhY2tPYmplY3RJbXAqPihleGVjLT5jYWxsZWUoKSktPnByb3BlcnR5TmFtZSgpOwog ICAgICAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IG5hbWUoQWRvcHRDRiwgQ0ZTdHJpbmdDcmVh dGVXaXRoQ2hhcmFjdGVycygwLCBuYW1lSWRlbnRpZmllci5jaGFyYWN0ZXJzKCksIG5hbWVJZGVu dGlmaWVyLmxlbmd0aCgpKSk7CiAgICAgICAgIGZhbGxiYWNrTWV0aG9kLT5zZXRKYXZhU2NyaXB0 TmFtZShuYW1lLmdldCgpKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAkocmV2aXNpb24gODQ4MDUp CisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNzMs NyArMTczLDcgQEAgUGFnZTo6UGFnZShjb25zdCBQYWdlQ2xpZW50cyYgcGFnZUNsaWVudAogICAg IGFsbFBhZ2VzLT5hZGQodGhpcyk7CiAKICAgICBpZiAocGFnZUNsaWVudHMucGx1Z2luSGFsdGVy Q2xpZW50KSB7Ci0gICAgICAgIG1fcGx1Z2luSGFsdGVyLnNldChuZXcgUGx1Z2luSGFsdGVyKHBh Z2VDbGllbnRzLnBsdWdpbkhhbHRlckNsaWVudCkpOworICAgICAgICBtX3BsdWdpbkhhbHRlciA9 IGFkb3B0UHRyKG5ldyBQbHVnaW5IYWx0ZXIocGFnZUNsaWVudHMucGx1Z2luSGFsdGVyQ2xpZW50 KSk7CiAgICAgICAgIG1fcGx1Z2luSGFsdGVyLT5zZXRQbHVnaW5BbGxvd2VkUnVuVGltZShtX3Nl dHRpbmdzLT5wbHVnaW5BbGxvd2VkUnVuVGltZSgpKTsKICAgICB9CiAKQEAgLTM3Niw3ICszNzYs NyBAQCB2b2lkIFBhZ2U6OmluaXRHcm91cCgpCiB7CiAgICAgQVNTRVJUKCFtX3NpbmdsZVBhZ2VH cm91cCk7CiAgICAgQVNTRVJUKCFtX2dyb3VwKTsKLSAgICBtX3NpbmdsZVBhZ2VHcm91cC5zZXQo bmV3IFBhZ2VHcm91cCh0aGlzKSk7CisgICAgbV9zaW5nbGVQYWdlR3JvdXAgPSBhZG9wdFB0cihu ZXcgUGFnZUdyb3VwKHRoaXMpKTsKICAgICBtX2dyb3VwID0gbV9zaW5nbGVQYWdlR3JvdXAuZ2V0 KCk7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUdyb3VwLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VHcm91cC5jcHAJKHJldmlzaW9uIDg0ODA1 KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlR3JvdXAuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0yODIsOSArMjgyLDkgQEAgdm9pZCBQYWdlR3JvdXA6OmFkZFVzZXJTY3JpcHRUb1dvcmxkKERP TQogewogICAgIEFTU0VSVF9BUkcod29ybGQsIHdvcmxkKTsKIAotICAgIE93blB0cjxVc2VyU2Ny aXB0PiB1c2VyU2NyaXB0KG5ldyBVc2VyU2NyaXB0KHNvdXJjZSwgdXJsLCB3aGl0ZWxpc3QsIGJs YWNrbGlzdCwgaW5qZWN0aW9uVGltZSwgaW5qZWN0ZWRGcmFtZXMpKTsKKyAgICBPd25QdHI8VXNl clNjcmlwdD4gdXNlclNjcmlwdCA9IGFkb3B0UHRyKG5ldyBVc2VyU2NyaXB0KHNvdXJjZSwgdXJs LCB3aGl0ZWxpc3QsIGJsYWNrbGlzdCwgaW5qZWN0aW9uVGltZSwgaW5qZWN0ZWRGcmFtZXMpKTsK ICAgICBpZiAoIW1fdXNlclNjcmlwdHMpCi0gICAgICAgIG1fdXNlclNjcmlwdHMuc2V0KG5ldyBV c2VyU2NyaXB0TWFwKTsKKyAgICAgICAgbV91c2VyU2NyaXB0cyA9IGFkb3B0UHRyKG5ldyBVc2Vy U2NyaXB0TWFwKTsKICAgICBVc2VyU2NyaXB0VmVjdG9yKiYgc2NyaXB0c0luV29ybGQgPSBtX3Vz ZXJTY3JpcHRzLT5hZGQod29ybGQsIDApLmZpcnN0LT5zZWNvbmQ7CiAgICAgaWYgKCFzY3JpcHRz SW5Xb3JsZCkKICAgICAgICAgc2NyaXB0c0luV29ybGQgPSBuZXcgVXNlclNjcmlwdFZlY3RvcjsK QEAgLTI5OSw5ICsyOTksOSBAQCB2b2lkIFBhZ2VHcm91cDo6YWRkVXNlclN0eWxlU2hlZXRUb1dv cmxkCiB7CiAgICAgQVNTRVJUX0FSRyh3b3JsZCwgd29ybGQpOwogCi0gICAgT3duUHRyPFVzZXJT dHlsZVNoZWV0PiB1c2VyU3R5bGVTaGVldChuZXcgVXNlclN0eWxlU2hlZXQoc291cmNlLCB1cmws IHdoaXRlbGlzdCwgYmxhY2tsaXN0LCBpbmplY3RlZEZyYW1lcywgbGV2ZWwpKTsKKyAgICBPd25Q dHI8VXNlclN0eWxlU2hlZXQ+IHVzZXJTdHlsZVNoZWV0ID0gYWRvcHRQdHIobmV3IFVzZXJTdHls ZVNoZWV0KHNvdXJjZSwgdXJsLCB3aGl0ZWxpc3QsIGJsYWNrbGlzdCwgaW5qZWN0ZWRGcmFtZXMs IGxldmVsKSk7CiAgICAgaWYgKCFtX3VzZXJTdHlsZVNoZWV0cykKLSAgICAgICAgbV91c2VyU3R5 bGVTaGVldHMuc2V0KG5ldyBVc2VyU3R5bGVTaGVldE1hcCk7CisgICAgICAgIG1fdXNlclN0eWxl U2hlZXRzID0gYWRvcHRQdHIobmV3IFVzZXJTdHlsZVNoZWV0TWFwKTsKICAgICBVc2VyU3R5bGVT aGVldFZlY3RvciomIHN0eWxlU2hlZXRzSW5Xb3JsZCA9IG1fdXNlclN0eWxlU2hlZXRzLT5hZGQo d29ybGQsIDApLmZpcnN0LT5zZWNvbmQ7CiAgICAgaWYgKCFzdHlsZVNoZWV0c0luV29ybGQpCiAg ICAgICAgIHN0eWxlU2hlZXRzSW5Xb3JsZCA9IG5ldyBVc2VyU3R5bGVTaGVldFZlY3RvcjsKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL1BhZ2VNYWMuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BhZ2UvbWFjL1BhZ2VNYWMuY3BwCShyZXZpc2lvbiA4NDgwNSkKKysrIFNv dXJjZS9XZWJDb3JlL3BhZ2UvbWFjL1BhZ2VNYWMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MCw3 ICs0MCw3IEBAIHZvaWQgUGFnZTo6YWRkU2NoZWR1bGVQYWlyKFBhc3NSZWZQdHI8U2MKICAgICBS ZWZQdHI8U2NoZWR1bGVQYWlyPiBwYWlyID0gcHJwUGFpcjsKIAogICAgIGlmICghbV9zY2hlZHVs ZWRSdW5Mb29wUGFpcnMpCi0gICAgICAgIG1fc2NoZWR1bGVkUnVuTG9vcFBhaXJzLnNldChuZXcg U2NoZWR1bGVQYWlySGFzaFNldCk7CisgICAgICAgIG1fc2NoZWR1bGVkUnVuTG9vcFBhaXJzID0g YWRvcHRQdHIobmV3IFNjaGVkdWxlUGFpckhhc2hTZXQpOwogICAgIG1fc2NoZWR1bGVkUnVuTG9v cFBhaXJzLT5hZGQocGFpcik7CiAKICNpZm5kZWYgQlVJTERJTkdfT05fVElHRVIK