67062 2011-08-26 13:36:54 -0700 Implement NPN_ScheduleTimer/NPN_UnscheduleTimer 2011-08-26 14:36:47 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 457741 0 andersca 2011-08-26 13:36:54 -0700 Implement NPN_ScheduleTimer/NPN_UnscheduleTimer 457746 1 105402 andersca 2011-08-26 13:41:04 -0700 Created attachment 105402 Patch 457753 2 105402 sam 2011-08-26 13:45:56 -0700 Comment on attachment 105402 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=105402&action=review > Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp:338 > +void NetscapePlugin::Timer::start(bool throttle) > +{ Please remove the parameter. > Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h:256 > + NetscapePlugin* m_netscapePlugin; Please put a comment here explaining the lifetime of this pointer. 457786 3 andersca 2011-08-26 14:36:47 -0700 Committed r93912: <http://trac.webkit.org/changeset/93912> 105402 2011-08-26 13:41:04 -0700 2011-08-26 13:45:56 -0700 Patch bug-67062-20110826134103.patch text/plain 7609 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDkzOTA0KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDIgQEAKKzIwMTEtMDgtMjYgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBJbXBsZW1lbnQgTlBOX1Nj aGVkdWxlVGltZXIvTlBOX1Vuc2NoZWR1bGVUaW1lcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjcwNjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRz Y2FwZUJyb3dzZXJGdW5jcy5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5QTl9TY2hlZHVsZVRpbWVy KToKKyAgICAgICAgQ2FsbCBOZXRzY2FwZVBsdWdpbjo6c2NoZWR1bGVUaW1lci4KKworICAgICAg ICAoV2ViS2l0OjpOUE5fVW5zY2hlZHVsZVRpbWVyKToKKyAgICAgICAgQ2FsbCBOZXRzY2FwZVBs dWdpbjo6dW5zY2hlZHVsZVRpbWVyLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL05l dHNjYXBlL05ldHNjYXBlUGx1Z2luLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVn aW46Ok5ldHNjYXBlUGx1Z2luKToKKyAgICAgICAgSW5pdGlhbGl6ZSBtX25leHRUaW1lcklELgor CisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luOjpUaW1lcjo6c3RhcnQpOgorICAgICAg ICBTdGFydCB0aGUgdGltZXIuCisKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW46OlRp bWVyOjpzdG9wKToKKyAgICAgICAgU3RvcCB0aGUgdGltZXIuCisKKyAgICAgICAgKFdlYktpdDo6 TmV0c2NhcGVQbHVnaW46OlRpbWVyOjp0aW1lckZpcmVkKToKKyAgICAgICAgQ2FsbCB0aGUgcmln aHQgY2FsbGJhY2sgYW5kIHVuc2NoZWR1bGUgdGhlIHRpbWVyIG9iamVjdCBpZiBpdCdzIG5vdCBh IHJlcGVhdGluZyB0aW1lci4KKworICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbjo6c2No ZWR1bGVUaW1lcik6CisgICAgICAgIENyZWF0ZSBhIG5ldyB0aW1lciBhbmQgc3RhcnQgaXQuCisK KyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW46OnVuc2NoZWR1bGVUaW1lcik6CisgICAg ICAgIEdldCB0aGUgdGltZXIgZnJvbSB0aGUgbWFwIGFuZCBkZXN0cm95IGl0LgorICAgICAgICAK KyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW46OmRlc3Ryb3kpOgorICAgICAgICBEZXN0 cm95IGFsbCB0aW1lcnMuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUv TmV0c2NhcGVQbHVnaW4uaDoKKyAgICAgICAgQWRkIFRpbWVyIGNsYXNzLgorCiAyMDExLTA4LTI2 ICBBbGljZSBMaXUgIDxhbGljZS5saXVAYXBwbGUuY29tPgogCiAgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NjgyMwpJbmRleDogU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlQnJvd3NlckZ1bmNzLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0 c2NhcGVCcm93c2VyRnVuY3MuY3BwCShyZXZpc2lvbiA5MzkwNCkKKysrIFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZUJyb3dzZXJGdW5jcy5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTk1MCwxNSArOTUwLDE4IEBAIHN0YXRpYyBOUEVycm9yIE5QTl9HZXRB dXRoZW50aWNhdGlvbkluZm8KICAgICByZXR1cm4gTlBFUlJfTk9fRVJST1I7CiB9CiAKLXN0YXRp YyB1aW50MzJfdCBOUE5fU2NoZWR1bGVUaW1lcihOUFAgaW5zdGFuY2UsIHVpbnQzMl90IGludGVy dmFsLCBOUEJvb2wgcmVwZWF0LCB2b2lkICgqdGltZXJGdW5jKShOUFAgbnBwLCB1aW50MzJfdCB0 aW1lcklEKSkKK3N0YXRpYyB1aW50MzJfdCBOUE5fU2NoZWR1bGVUaW1lcihOUFAgbnBwLCB1aW50 MzJfdCBpbnRlcnZhbCwgTlBCb29sIHJlcGVhdCwgdm9pZCAoKnRpbWVyRnVuYykoTlBQIG5wcCwg dWludDMyX3QgdGltZXJJRCkpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKLSAgICByZXR1cm4g TlBFUlJfR0VORVJJQ19FUlJPUjsKKyAgICBSZWZQdHI8TmV0c2NhcGVQbHVnaW4+IHBsdWdpbiA9 IE5ldHNjYXBlUGx1Z2luOjpmcm9tTlBQKG5wcCk7CisKKyAgICByZXR1cm4gcGx1Z2luLT5zY2hl ZHVsZVRpbWVyKGludGVydmFsLCByZXBlYXQsIHRpbWVyRnVuYyk7CiB9CiAKLXN0YXRpYyB2b2lk IE5QTl9VbnNjaGVkdWxlVGltZXIoTlBQIGluc3RhbmNlLCB1aW50MzJfdCB0aW1lcklEKQorc3Rh dGljIHZvaWQgTlBOX1Vuc2NoZWR1bGVUaW1lcihOUFAgbnBwLCB1aW50MzJfdCB0aW1lcklEKQog ewotICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgUmVmUHRyPE5ldHNjYXBlUGx1Z2luPiBwbHVn aW4gPSBOZXRzY2FwZVBsdWdpbjo6ZnJvbU5QUChucHApOworCisgICAgcGx1Z2luLT51bnNjaGVk dWxlVGltZXIodGltZXJJRCk7CiB9CiAKICNpZiBQTEFURk9STShNQUMpCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9O ZXRzY2FwZVBsdWdpbi5jcHAJKHJldmlzaW9uIDkzOTA0KQorKysgU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNjgsNiArNjgsNyBAQCBOZXRzY2FwZVBsdWdpbjo6TmV0c2NhcGVQbHVnaW4oUGFzc1Jl ZlB0CiAgICAgLCBtX2lzVHJhbnNwYXJlbnQoZmFsc2UpCiAgICAgLCBtX2luTlBQTmV3KGZhbHNl KQogICAgICwgbV9sb2FkTWFudWFsbHkoZmFsc2UpCisgICAgLCBtX25leHRUaW1lcklEKDApCiAj aWYgUExBVEZPUk0oTUFDKQogICAgICwgbV9kcmF3aW5nTW9kZWwoc3RhdGljX2Nhc3Q8TlBEcmF3 aW5nTW9kZWw+KC0xKSkKICAgICAsIG1fZXZlbnRNb2RlbChzdGF0aWNfY2FzdDxOUEV2ZW50TW9k ZWw+KC0xKSkKQEAgLTMxNCw2ICszMTUsNzggQEAgdm9pZCBOZXRzY2FwZVBsdWdpbjo6aGFuZGxl UGx1Z2luVGhyZWFkQQogICAgIGZ1bmN0aW9uKHVzZXJEYXRhKTsKIH0KIAorUGFzc093blB0cjxO ZXRzY2FwZVBsdWdpbjo6VGltZXI+IE5ldHNjYXBlUGx1Z2luOjpUaW1lcjo6Y3JlYXRlKE5ldHNj YXBlUGx1Z2luKiBuZXRzY2FwZVBsdWdpbiwgdW5zaWduZWQgdGltZXJJRCwgdW5zaWduZWQgaW50 ZXJ2YWwsIGJvb2wgcmVwZWF0LCBUaW1lckZ1bmMgdGltZXJGdW5jKQoreworICAgIHJldHVybiBh ZG9wdFB0cihuZXcgVGltZXIobmV0c2NhcGVQbHVnaW4sIHRpbWVySUQsIGludGVydmFsLCByZXBl YXQsIHRpbWVyRnVuYykpOworfQorCitOZXRzY2FwZVBsdWdpbjo6VGltZXI6OlRpbWVyKE5ldHNj YXBlUGx1Z2luKiBuZXRzY2FwZVBsdWdpbiwgdW5zaWduZWQgdGltZXJJRCwgdW5zaWduZWQgaW50 ZXJ2YWwsIGJvb2wgcmVwZWF0LCBUaW1lckZ1bmMgdGltZXJGdW5jKQorICAgIDogbV9uZXRzY2Fw ZVBsdWdpbihuZXRzY2FwZVBsdWdpbikKKyAgICAsIG1fdGltZXJJRCh0aW1lcklEKQorICAgICwg bV9pbnRlcnZhbChpbnRlcnZhbCkKKyAgICAsIG1fcmVwZWF0KHJlcGVhdCkKKyAgICAsIG1fdGlt ZXJGdW5jKHRpbWVyRnVuYykKKyAgICAsIG1fdGltZXIoUnVuTG9vcDo6bWFpbigpLCB0aGlzLCAm VGltZXI6OnRpbWVyRmlyZWQpCit7Cit9CisKK05ldHNjYXBlUGx1Z2luOjpUaW1lcjo6flRpbWVy KCkKK3sKK30KKwordm9pZCBOZXRzY2FwZVBsdWdpbjo6VGltZXI6OnN0YXJ0KGJvb2wgdGhyb3R0 bGUpCit7CisgICAgLy8gRklYTUU6IEFjdHVhbGx5IGhvbm9yIHRoZSB0aHJvdHRsZSBwYXJhbWV0 ZXIuCisgICAgZG91YmxlIHRpbWVJbnRlcnZhbCA9IG1faW50ZXJ2YWwgLyAxMDAwLjA7CisKKyAg ICBpZiAobV9yZXBlYXQpCisgICAgICAgIG1fdGltZXIuc3RhcnRSZXBlYXRpbmcodGltZUludGVy dmFsKTsKKyAgICBlbHNlCisgICAgICAgIG1fdGltZXIuc3RhcnRPbmVTaG90KHRpbWVJbnRlcnZh bCk7Cit9CisKK3ZvaWQgTmV0c2NhcGVQbHVnaW46OlRpbWVyOjpzdG9wKCkKK3sKKyAgICBtX3Rp bWVyLnN0b3AoKTsKK30KKwordm9pZCBOZXRzY2FwZVBsdWdpbjo6VGltZXI6OnRpbWVyRmlyZWQo KQoreworICAgIG1fdGltZXJGdW5jKCZtX25ldHNjYXBlUGx1Z2luLT5tX25wcCwgbV90aW1lcklE KTsKKworICAgIGlmICghbV9yZXBlYXQpCisgICAgICAgIG1fbmV0c2NhcGVQbHVnaW4tPnVuc2No ZWR1bGVUaW1lcihtX3RpbWVySUQpOworfQorCit1aW50MzJfdCBOZXRzY2FwZVBsdWdpbjo6c2No ZWR1bGVUaW1lcih1bnNpZ25lZCBpbnRlcnZhbCwgYm9vbCByZXBlYXQsIHZvaWQgKCp0aW1lckZ1 bmMpKE5QUCwgdW5zaWduZWQgdGltZXJJRCkpCit7CisgICAgaWYgKCF0aW1lckZ1bmMpCisgICAg ICAgIHJldHVybiAwOworCisgICAgLy8gRklYTUU6IEhhbmRsZSB3cmFwcGluZyBhcm91bmQuCisg ICAgdW5zaWduZWQgdGltZXJJRCA9ICsrbV9uZXh0VGltZXJJRDsKKworICAgIE93blB0cjxUaW1l cj4gdGltZXIgPSBUaW1lcjo6Y3JlYXRlKHRoaXMsIHRpbWVySUQsIGludGVydmFsLCByZXBlYXQs IHRpbWVyRnVuYyk7CisgICAgCisgICAgLy8gRklYTUU6IEJhc2VkIG9uIHRoZSBwbHVnLWluIHZp c2liaWxpdHksIGZpZ3VyZSBvdXQgaWYgd2Ugc2hvdWxkIHRocm90dGxlIHRoZSB0aW1lciwgb3Ig aWYgd2Ugc2hvdWxkIHN0YXJ0IGl0IGF0IGFsbC4KKyAgICB0aW1lci0+c3RhcnQoZmFsc2UpOwor ICAgIG1fdGltZXJzLnNldCh0aW1lcklELCB0aW1lci5sZWFrUHRyKCkpOworCisgICAgcmV0dXJu IHRpbWVySUQ7Cit9CisKK3ZvaWQgTmV0c2NhcGVQbHVnaW46OnVuc2NoZWR1bGVUaW1lcih1bnNp Z25lZCB0aW1lcklEKQoreworICAgIFRpbWVyTWFwOjppdGVyYXRvciBpdCA9IG1fdGltZXJzLmZp bmQodGltZXJJRCk7CisgICAgaWYgKGl0ID09IG1fdGltZXJzLmVuZCgpKQorICAgICAgICByZXR1 cm47CisKKyAgICBPd25QdHI8VGltZXI+IHRpbWVyID0gYWRvcHRQdHIoaXQtPnNlY29uZCk7Cisg ICAgbV90aW1lcnMucmVtb3ZlKGl0KTsKKworICAgIHRpbWVyLT5zdG9wKCk7Cit9CisKIFN0cmlu ZyBOZXRzY2FwZVBsdWdpbjo6cHJveGllc0ZvclVSTChjb25zdCBTdHJpbmcmIHVybFN0cmluZykK IHsKICAgICByZXR1cm4gY29udHJvbGxlcigpLT5wcm94aWVzRm9yVVJMKHVybFN0cmluZyk7CkBA IC01NDksNiArNjIyLDkgQEAgdm9pZCBOZXRzY2FwZVBsdWdpbjo6ZGVzdHJveSgpCiAgICAgbV9p c1N0YXJ0ZWQgPSBmYWxzZTsKIAogICAgIHBsYXRmb3JtRGVzdHJveSgpOworCisgICAgZGVsZXRl QWxsVmFsdWVzKG1fdGltZXJzKTsKKyAgICBtX3RpbWVycy5jbGVhcigpOwogfQogICAgIAogdm9p ZCBOZXRzY2FwZVBsdWdpbjo6cGFpbnQoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJ bnRSZWN0JiBkaXJ0eVJlY3QpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdp bnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaAkocmV2aXNpb24g OTM5MDQpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0 c2NhcGVQbHVnaW4uaAkod29ya2luZyBjb3B5KQpAQCAtMTA5LDYgKzEwOSw5IEBAIHB1YmxpYzoK ICAgICAvLyBDYWxsZWQgb24gdGhlIHBsdWctaW4gcnVuIGxvb3AgKHdoaWNoIGlzIGN1cnJlbnRs eSB0aGUgbWFpbiB0aHJlYWQgcnVuIGxvb3ApLgogICAgIHZvaWQgaGFuZGxlUGx1Z2luVGhyZWFk QXN5bmNDYWxsKHZvaWQgKCpmdW5jdGlvbikodm9pZCopLCB2b2lkKiB1c2VyRGF0YSk7CiAKKyAg ICB1bnNpZ25lZCBzY2hlZHVsZVRpbWVyKHVuc2lnbmVkIGludGVydmFsLCBib29sIHJlcGVhdCwg dm9pZCAoKnRpbWVyRnVuYykoTlBQLCB1bnNpZ25lZCB0aW1lcklEKSk7CisgICAgdm9pZCB1bnNj aGVkdWxlVGltZXIodW5zaWduZWQgdGltZXJJRCk7CisKICAgICBTdHJpbmcgcHJveGllc0ZvclVS TChjb25zdCBTdHJpbmcmIHVybFN0cmluZyk7CiAgICAgU3RyaW5nIGNvb2tpZXNGb3JVUkwoY29u c3QgU3RyaW5nJiB1cmxTdHJpbmcpOwogICAgIHZvaWQgc2V0Q29va2llc0ZvclVSTChjb25zdCBT dHJpbmcmIHVybFN0cmluZywgY29uc3QgU3RyaW5nJiBjb29raWVTdHJpbmcpOwpAQCAtMjMzLDYg KzIzNiwzNSBAQCBwcml2YXRlOgogICAgIFJlZlB0cjxOZXRzY2FwZVBsdWdpblN0cmVhbT4gbV9t YW51YWxTdHJlYW07CiAgICAgVmVjdG9yPGJvb2wsIDg+IG1fcG9wdXBFbmFibGVkU3RhdGVzOwog CisgICAgY2xhc3MgVGltZXIgeworICAgICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShUaW1lcik7 CisKKyAgICBwdWJsaWM6CisgICAgICAgIHR5cGVkZWYgdm9pZCAoKlRpbWVyRnVuYykoTlBQLCB1 aW50MzIgdGltZXJJRCk7CisKKyAgICAgICAgc3RhdGljIFBhc3NPd25QdHI8VGltZXI+IGNyZWF0 ZShOZXRzY2FwZVBsdWdpbiosIHVuc2lnbmVkIHRpbWVySUQsIHVuc2lnbmVkIGludGVydmFsLCBi b29sIHJlcGVhdCwgVGltZXJGdW5jKTsKKyAgICAgICAgflRpbWVyKCk7CisKKyAgICAgICAgdm9p ZCBzdGFydChib29sIHRocm90dGxlKTsKKyAgICAgICAgdm9pZCBzdG9wKCk7CisKKyAgICBwcml2 YXRlOgorICAgICAgICBUaW1lcihOZXRzY2FwZVBsdWdpbiosIHVuc2lnbmVkIHRpbWVySUQsIHVu c2lnbmVkIGludGVydmFsLCBib29sIHJlcGVhdCwgVGltZXJGdW5jKTsKKworICAgICAgICB2b2lk IHRpbWVyRmlyZWQoKTsKKworICAgICAgICBOZXRzY2FwZVBsdWdpbiogbV9uZXRzY2FwZVBsdWdp bjsKKyAgICAgICAgdW5zaWduZWQgbV90aW1lcklEOworICAgICAgICB1bnNpZ25lZCBtX2ludGVy dmFsOworICAgICAgICBib29sIG1fcmVwZWF0OworICAgICAgICBUaW1lckZ1bmMgbV90aW1lckZ1 bmM7CisKKyAgICAgICAgUnVuTG9vcDo6VGltZXI8VGltZXI+IG1fdGltZXI7CisgICAgfTsKKyAg ICB0eXBlZGVmIEhhc2hNYXA8dW5zaWduZWQsIFRpbWVyKj4gVGltZXJNYXA7CisgICAgVGltZXJN YXAgbV90aW1lcnM7CisgICAgdW5zaWduZWQgbV9uZXh0VGltZXJJRDsKKwogI2lmIFBMVUdJTl9B UkNISVRFQ1RVUkUoTUFDKQogICAgIE5QRHJhd2luZ01vZGVsIG1fZHJhd2luZ01vZGVsOwogICAg IE5QRXZlbnRNb2RlbCBtX2V2ZW50TW9kZWw7Cg==