124540 2013-11-18 14:53:12 -0800 APIEntryShims need some love 2014-04-29 15:27:25 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED INVALID P2 Normal --- 124616 123195 1 mhahnenberg mhahnenberg commit-queue oldest_to_newest 951814 0 mhahnenberg 2013-11-18 14:53:12 -0800 We're missing them in key places which some other hacking revealed. 951815 1 217239 mhahnenberg 2013-11-18 14:56:46 -0800 Created attachment 217239 Patch 951820 2 mhahnenberg 2013-11-18 15:04:55 -0800 Committed r159459: <http://trac.webkit.org/changeset/159459> 952300 3 commit-queue 2013-11-19 16:25:23 -0800 Re-opened since this is blocked by bug 124616 1005171 4 mhahnenberg 2014-04-29 15:27:25 -0700 APIEntryShim was replaced with JSLockHolder, which has since been put in most of the places APIEntryShim was missing. 217239 2013-11-18 14:56:46 -0800 2013-11-18 14:58:35 -0800 Patch bug-124540-20131118145633.patch text/plain 7259 mhahnenberg SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTU5NDU4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBA CisyMDEzLTExLTE4ICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CisK KyAgICAgICAgQVBJRW50cnlTaGltcyBuZWVkIHNvbWUgbG92ZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI0NTQwCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Ugd2VyZSBtaXNzaW5nIHRoZW0gaW4ga2V5 IHBsYWNlcyB3aGljaCBzb21lIG90aGVyIGhhY2tpbmcgcmV2ZWFsZWQuIFRoZXNlIGNvdWxkIGhh dmUgbWFuaWZlc3RlZCBhcworICAgICAgICByYWNlIGNvbmRpdGlvbnMgZm9yIFZNcyBiZWluZyB1 c2VkIGluIG11bHRpdGhyZWFkZWQgZW52aXJvbm1lbnRzLgorCisgICAgICAgICogQVBJL0pTQ29u dGV4dC5tbToKKyAgICAgICAgKC1bSlNDb250ZXh0IHNldEV4Y2VwdGlvbjpdKToKKyAgICAgICAg KC1bSlNDb250ZXh0IHdyYXBwZXJGb3JPYmpDT2JqZWN0Ol0pOgorICAgICAgICAoLVtKU0NvbnRl eHQgd3JhcHBlckZvckpTT2JqZWN0Ol0pOgorICAgICAgICAqIEFQSS9KU0NvbnRleHRSZWYuY3Bw OgorICAgICAgICAoSlNDb250ZXh0R3JvdXBSZWxlYXNlKToKKyAgICAgICAgKEpTR2xvYmFsQ29u dGV4dFJlbGVhc2UpOgorICAgICAgICAqIEFQSS9KU01hbmFnZWRWYWx1ZS5tbToKKyAgICAgICAg KC1bSlNNYW5hZ2VkVmFsdWUgaW5pdFdpdGhWYWx1ZTpdKToKKyAgICAgICAgKC1bSlNNYW5hZ2Vk VmFsdWUgdmFsdWVdKToKKyAgICAgICAgKiBBUEkvSlNPYmplY3RSZWYuY3BwOgorICAgICAgICAo SlNPYmplY3RJc0Z1bmN0aW9uKToKKyAgICAgICAgKEpTT2JqZWN0Q29weVByb3BlcnR5TmFtZXMp OgorICAgICAgICAqIEFQSS9KU1ZhbHVlLm1tOgorICAgICAgICAoY29udGFpbmVyVmFsdWVUb09i amVjdCk6CisgICAgICAgICogQVBJL0pTV3JhcHBlck1hcC5tbToKKyAgICAgICAgKHRyeVVud3Jh cE9iamNPYmplY3QpOgorCiAyMDEzLTExLTE4ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5j b20+CiAKICAgICAgICAgQWxsb3cgdGhlIEZUTCBkZWJ1ZyBkdW1wcyB0byBpbmNsdWRlIHRoZSBu ZXcgc2l6ZSBmaWVsZApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU0NvbnRleHQu bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU0NvbnRleHQubW0J KHJldmlzaW9uIDE1OTQzNCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNDb250ZXh0 Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xMDIsNiArMTAyLDcgQEAgLSAoSlNWYWx1ZSAqKWV2YWx1 YXRlU2NyaXB0OihOU1N0cmluZyAqKQogCiAtICh2b2lkKXNldEV4Y2VwdGlvbjooSlNWYWx1ZSAq KXZhbHVlCiB7CisgICAgSlNDOjpBUElFbnRyeVNoaW0gZW50cnlTaGltKHRvSlMobV9jb250ZXh0 KSk7CiAgICAgaWYgKHZhbHVlKQogICAgICAgICBtX2V4Y2VwdGlvbi5zZXQodG9KUyhtX2NvbnRl eHQpLT52bSgpLCB0b0pTKEpTVmFsdWVUb09iamVjdChtX2NvbnRleHQsIHZhbHVlSW50ZXJuYWxW YWx1ZSh2YWx1ZSksIDApKSk7CiAgICAgZWxzZQpAQCAtMjQ0LDE0ICsyNDUsMTMgQEAgLSAodm9p ZCllbmRDYWxsYmFja1dpdGhEYXRhOihDYWxsYmFja0RhdAogCiAtIChKU1ZhbHVlICopd3JhcHBl ckZvck9iakNPYmplY3Q6KGlkKW9iamVjdAogewotICAgIC8vIExvY2sgYWNjZXNzIHRvIG1fd3Jh cHBlck1hcAotICAgIEpTQzo6SlNMb2NrSG9sZGVyIGxvY2sodG9KUyhtX2NvbnRleHQpKTsKKyAg ICBKU0M6OkFQSUVudHJ5U2hpbSBlbnRyeVNoaW0odG9KUyhtX2NvbnRleHQpKTsKICAgICByZXR1 cm4gW21fd3JhcHBlck1hcCBqc1dyYXBwZXJGb3JPYmplY3Q6b2JqZWN0XTsKIH0KIAogLSAoSlNW YWx1ZSAqKXdyYXBwZXJGb3JKU09iamVjdDooSlNWYWx1ZVJlZil2YWx1ZQogewotICAgIEpTQzo6 SlNMb2NrSG9sZGVyIGxvY2sodG9KUyhtX2NvbnRleHQpKTsKKyAgICBKU0M6OkFQSUVudHJ5U2hp bSBlbnRyeVNoaW0odG9KUyhtX2NvbnRleHQpKTsKICAgICByZXR1cm4gW21fd3JhcHBlck1hcCBv YmpjV3JhcHBlckZvckpTVmFsdWVSZWY6dmFsdWVdOwogfQogCkluZGV4OiBTb3VyY2UvSmF2YVNj cmlwdENvcmUvQVBJL0pTQ29udGV4dFJlZi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL0FQSS9KU0NvbnRleHRSZWYuY3BwCShyZXZpc2lvbiAxNTk0MzQpCisrKyBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTQ29udGV4dFJlZi5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTY4LDE2ICs2OCw5IEBAIEpTQ29udGV4dEdyb3VwUmVmIEpTQ29udGV4dEdyb3VwUmV0YWluKEoK IAogdm9pZCBKU0NvbnRleHRHcm91cFJlbGVhc2UoSlNDb250ZXh0R3JvdXBSZWYgZ3JvdXApCiB7 Ci0gICAgSWRlbnRpZmllclRhYmxlKiBzYXZlZElkZW50aWZpZXJUYWJsZTsKICAgICBWTSYgdm0g PSAqdG9KUyhncm91cCk7Ci0KLSAgICB7Ci0gICAgICAgIEpTTG9ja0hvbGRlciBsb2NrKHZtKTsK LSAgICAgICAgc2F2ZWRJZGVudGlmaWVyVGFibGUgPSB3dGZUaHJlYWREYXRhKCkuc2V0Q3VycmVu dElkZW50aWZpZXJUYWJsZSh2bS5pZGVudGlmaWVyVGFibGUpOwotICAgICAgICB2bS5kZXJlZigp OwotICAgIH0KLQotICAgIHd0ZlRocmVhZERhdGEoKS5zZXRDdXJyZW50SWRlbnRpZmllclRhYmxl KHNhdmVkSWRlbnRpZmllclRhYmxlKTsKKyAgICBBUElFbnRyeVNoaW0gZW50cnlTaGltKCZ2bSk7 CisgICAgdm0uZGVyZWYoKTsKIH0KIAogc3RhdGljIGJvb2wgaW50ZXJuYWxTY3JpcHRUaW1lb3V0 Q2FsbGJhY2soRXhlY1N0YXRlKiBleGVjLCB2b2lkKiBjYWxsYmFja1B0ciwgdm9pZCogY2FsbGJh Y2tEYXRhKQpAQCAtMTY1LDcgKzE1OCw3IEBAIHZvaWQgSlNHbG9iYWxDb250ZXh0UmVsZWFzZShK U0dsb2JhbENvbnQKICAgICBJZGVudGlmaWVyVGFibGUqIHNhdmVkSWRlbnRpZmllclRhYmxlOwog ICAgIEV4ZWNTdGF0ZSogZXhlYyA9IHRvSlMoY3R4KTsKICAgICB7Ci0gICAgICAgIEpTTG9ja0hv bGRlciBsb2NrKGV4ZWMpOworICAgICAgICBBUElFbnRyeVNoaW0gZW50cnlTaGltKGV4ZWMpOwog CiAgICAgICAgIFZNJiB2bSA9IGV4ZWMtPnZtKCk7CiAgICAgICAgIHNhdmVkSWRlbnRpZmllclRh YmxlID0gd3RmVGhyZWFkRGF0YSgpLnNldEN1cnJlbnRJZGVudGlmaWVyVGFibGUodm0uaWRlbnRp ZmllclRhYmxlKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNNYW5hZ2VkVmFs dWUubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU01hbmFnZWRW YWx1ZS5tbQkocmV2aXNpb24gMTU5NDM0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9K U01hbmFnZWRWYWx1ZS5tbQkod29ya2luZyBjb3B5KQpAQCAtMzAsNiArMzAsNyBAQAogI2lmIEpT Q19PQkpDX0FQSV9FTkFCTEVECiAKICNpbXBvcnQgIkFQSUNhc3QuaCIKKyNpbXBvcnQgIkFQSVNo aW1zLmgiCiAjaW1wb3J0ICJIZWFwLmgiCiAjaW1wb3J0ICJKU0NvbnRleHRJbnRlcm5hbC5oIgog I2ltcG9ydCAiSlNWYWx1ZUludGVybmFsLmgiCkBAIC0xOTEsNiArMTkyLDcgQEAgLSAoaWQpaW5p dFdpdGhWYWx1ZTooSlNWYWx1ZSAqKXZhbHVlCiAgICAgICAgIHJldHVybiBzZWxmOwogCiAgICAg SlNDOjpFeGVjU3RhdGUqIGV4ZWMgPSB0b0pTKFt2YWx1ZS5jb250ZXh0IEpTR2xvYmFsQ29udGV4 dFJlZl0pOworICAgIEpTQzo6QVBJRW50cnlTaGltIGVudHJ5U2hpbShleGVjKTsKICAgICBKU0M6 OkpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QgPSBleGVjLT5sZXhpY2FsR2xvYmFsT2JqZWN0 KCk7CiAgICAgSlNDOjpXZWFrPEpTQzo6SlNHbG9iYWxPYmplY3Q+IHdlYWsoZ2xvYmFsT2JqZWN0 LCBtYW5hZ2VkVmFsdWVIYW5kbGVPd25lcigpLCBzZWxmKTsKICAgICBtX2dsb2JhbE9iamVjdC5z d2FwKHdlYWspOwpAQCAtMjEyLDYgKzIxNCw3IEBAIC0gKEpTVmFsdWUgKil2YWx1ZQogICAgIGlm IChtX3dlYWtWYWx1ZS5pc0NsZWFyKCkpCiAgICAgICAgIHJldHVybiBuaWw7CiAgICAgSlNDOjpF eGVjU3RhdGUqIGV4ZWMgPSBtX2dsb2JhbE9iamVjdC0+Z2xvYmFsRXhlYygpOworICAgIEpTQzo6 QVBJRW50cnlTaGltIGVudHJ5U2hpbShleGVjKTsKICAgICBKU0NvbnRleHQgKmNvbnRleHQgPSBb SlNDb250ZXh0IGNvbnRleHRXaXRoSlNHbG9iYWxDb250ZXh0UmVmOnRvR2xvYmFsUmVmKGV4ZWMp XTsKICAgICBKU0M6OkpTVmFsdWUgdmFsdWU7CiAgICAgaWYgKG1fd2Vha1ZhbHVlLmlzUHJpbWl0 aXZlKCkpCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTT2JqZWN0UmVmLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTT2JqZWN0UmVmLmNwcAko cmV2aXNpb24gMTU5NDM0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU09iamVjdFJl Zi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUwNiwxMCArNTA2LDExIEBAIGJvb2wgSlNPYmplY3RE ZWxldGVQcml2YXRlUHJvcGVydHkoSlNDb24KICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLWJvb2wg SlNPYmplY3RJc0Z1bmN0aW9uKEpTQ29udGV4dFJlZiwgSlNPYmplY3RSZWYgb2JqZWN0KQorYm9v bCBKU09iamVjdElzRnVuY3Rpb24oSlNDb250ZXh0UmVmIGN0eCwgSlNPYmplY3RSZWYgb2JqZWN0 KQogewogICAgIGlmICghb2JqZWN0KQogICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgQVBJRW50 cnlTaGltIGVudHJ5U2hpbSh0b0pTKGN0eCkpOwogICAgIENhbGxEYXRhIGNhbGxEYXRhOwogICAg IEpTQ2VsbCogY2VsbCA9IHRvSlMob2JqZWN0KTsKICAgICByZXR1cm4gY2VsbC0+bWV0aG9kVGFi bGUoKS0+Z2V0Q2FsbERhdGEoY2VsbCwgY2FsbERhdGEpICE9IENhbGxUeXBlTm9uZTsKQEAgLTYw NSwxMiArNjA2LDEyIEBAIEpTUHJvcGVydHlOYW1lQXJyYXlSZWYgSlNPYmplY3RDb3B5UHJvcGUK ICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIHJldHVybiAwOwogICAgIH0K LSAgICBKU09iamVjdCoganNPYmplY3QgPSB0b0pTKG9iamVjdCk7CiAgICAgRXhlY1N0YXRlKiBl eGVjID0gdG9KUyhjdHgpOwogICAgIEFQSUVudHJ5U2hpbSBlbnRyeVNoaW0oZXhlYyk7CiAKICAg ICBWTSogdm0gPSAmZXhlYy0+dm0oKTsKIAorICAgIEpTT2JqZWN0KiBqc09iamVjdCA9IHRvSlMo b2JqZWN0KTsKICAgICBKU1Byb3BlcnR5TmFtZUFycmF5UmVmIHByb3BlcnR5TmFtZXMgPSBuZXcg T3BhcXVlSlNQcm9wZXJ0eU5hbWVBcnJheSh2bSk7CiAgICAgUHJvcGVydHlOYW1lQXJyYXkgYXJy YXkodm0pOwogICAgIGpzT2JqZWN0LT5tZXRob2RUYWJsZSgpLT5nZXRQcm9wZXJ0eU5hbWVzKGpz T2JqZWN0LCBleGVjLCBhcnJheSwgRXhjbHVkZURvbnRFbnVtUHJvcGVydGllcyk7CkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTVmFsdWUubW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL0FQSS9KU1ZhbHVlLm1tCShyZXZpc2lvbiAxNTk0MzQpCisrKyBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTVmFsdWUubW0JKHdvcmtpbmcgY29weSkKQEAgLTY5Miw2 ICs2OTIsOCBAQCBzdGF0aWMgaWQgY29udGFpbmVyVmFsdWVUb09iamVjdChKU0dsb2JhCiAgICAg ICAgICAgICBBU1NFUlQoW2N1cnJlbnQub2JqYyBpc0tpbmRPZkNsYXNzOltOU011dGFibGVEaWN0 aW9uYXJ5IGNsYXNzXV0pOwogICAgICAgICAgICAgTlNNdXRhYmxlRGljdGlvbmFyeSAqZGljdGlv bmFyeSA9IChOU011dGFibGVEaWN0aW9uYXJ5ICopY3VycmVudC5vYmpjOwogCisgICAgICAgICAg ICBKU0M6OkFQSUVudHJ5U2hpbSBlbnRyeVNoaW0odG9KUyhjb250ZXh0KSk7CisKICAgICAgICAg ICAgIEpTUHJvcGVydHlOYW1lQXJyYXlSZWYgcHJvcGVydHlOYW1lQXJyYXkgPSBKU09iamVjdENv cHlQcm9wZXJ0eU5hbWVzKGNvbnRleHQsIGpzKTsKICAgICAgICAgICAgIHNpemVfdCBsZW5ndGgg PSBKU1Byb3BlcnR5TmFtZUFycmF5R2V0Q291bnQocHJvcGVydHlOYW1lQXJyYXkpOwogCkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTV3JhcHBlck1hcC5tbQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTV3JhcHBlck1hcC5tbQkocmV2aXNpb24gMTU5 NDM0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU1dyYXBwZXJNYXAubW0JKHdvcmtp bmcgY29weSkKQEAgLTYwMyw2ICs2MDMsNyBAQCBpZCB0cnlVbndyYXBPYmpjT2JqZWN0KEpTR2xv YmFsQ29udGV4dFJlCiAgICAgSlNWYWx1ZVJlZiBleGNlcHRpb24gPSAwOwogICAgIEpTT2JqZWN0 UmVmIG9iamVjdCA9IEpTVmFsdWVUb09iamVjdChjb250ZXh0LCB2YWx1ZSwgJmV4Y2VwdGlvbik7 CiAgICAgQVNTRVJUKCFleGNlcHRpb24pOworICAgIEpTQzo6QVBJRW50cnlTaGltIGVudHJ5U2hp bSh0b0pTKGNvbnRleHQpKTsKICAgICBpZiAodG9KUyhvYmplY3QpLT5pbmhlcml0cyhKU0M6OkpT Q2FsbGJhY2tPYmplY3Q8SlNDOjpKU0FQSVdyYXBwZXJPYmplY3Q+OjppbmZvKCkpKQogICAgICAg ICByZXR1cm4gKGlkKUpTQzo6anNDYXN0PEpTQzo6SlNBUElXcmFwcGVyT2JqZWN0Kj4odG9KUyhv YmplY3QpKS0+d3JhcHBlZE9iamVjdCgpOwogICAgIGlmIChpZCB0YXJnZXQgPSB0cnlVbndyYXBD b25zdHJ1Y3RvcihvYmplY3QpKQo=