44971 2010-08-31 12:02:05 -0700 Fix ThreadableBlobRegistry methods not to rely on WorkerContext 2010-08-31 13:58:54 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 jianli jianli dimich fishd kinuko levin oldest_to_newest 272259 0 jianli 2010-08-31 12:02:05 -0700 Fix ThreadableBlobRegistry methods not to rely on WorkerContext. This is because WorkerContext could be destructed when we're performing cleanup in ScriptExecutionContext destructor. 272267 1 66082 jianli 2010-08-31 12:10:59 -0700 Created attachment 66082 Proposed Patch 272332 2 levin 2010-08-31 13:46:30 -0700 Mid-air collision -- :) Here's my comments. Please feel free to address and submit. (In other words, r=me also.) > diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog > +2010-08-31 Jian Li <jianli@chromium.org> > + > + Reviewed by NOBODY (OOPS!). > + > + Fix ThreadableBlobRegistry methods not to rely on WorkerContext. > + https://bugs.webkit.org/show_bug.cgi?id=44971 > + > + This could happen when we're performing some blob related cleanup "This" What could happen? > + in ScriptExecutionContext destructor when WorkerContext dies. The fix > + is to use isMainThread and callOnMainThread. > + > diff --git a/WebCore/fileapi/ThreadableBlobRegistry.cpp b/WebCore/fileapi/ThreadableBlobRegistry.cpp > +static void registerBlobURLTask(void* context) > { > - blobRegistry().registerBlobURL(url, blobData); > + OwnPtr<BlobRegistryContext> blobRegistryContext = adoptPtr(static_cast<BlobRegistryContext*>(context)); > + blobRegistry().registerBlobURL(blobRegistryContext->url, blobRegistryContext->blobData.release()); > } > > -void ThreadableBlobRegistry::registerBlobURL(ScriptExecutionContext* scriptExecutionContext, const KURL& url, PassOwnPtr<BlobData> blobData) > +void ThreadableBlobRegistry::registerBlobURL(ScriptExecutionContext*, const KURL& url, PassOwnPtr<BlobData> blobData) > { > - if (scriptExecutionContext->isWorkerContext()) > - postTaskToMainThread(scriptExecutionContext, createCallbackTask(&registerBlobURLTask, url, blobData)); > + if (isMainThread()) > + blobRegistry().registerBlobURL(url, blobData); > else > - registerBlobURLTask(scriptExecutionContext, url, blobData); > + callOnMainThread(&registerBlobURLTask, new BlobRegistryContext(url, blobData)); Please use a create method and a leakPtr (see "[webkit-dev] Naked new considered harmful"). 272345 3 jianli 2010-08-31 13:58:54 -0700 Committed as http://trac.webkit.org/changeset/66528. 66082 2010-08-31 12:10:59 -0700 2010-08-31 13:41:52 -0700 Proposed Patch 44971 text/plain 5611 jianli ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg M2JkNDlkYi4uMDNkMzUxZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0wOC0zMSAgSmlhbiBMaSAgPGpp YW5saUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgRml4IFRocmVhZGFibGVCbG9iUmVnaXN0cnkgbWV0aG9kcyBub3QgdG8gcmVs eSBvbiBXb3JrZXJDb250ZXh0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NDQ5NzEKKworICAgICAgICBUaGlzIGNvdWxkIGhhcHBlbiB3aGVuIHdlJ3Jl IHBlcmZvcm1pbmcgc29tZSBibG9iIHJlbGF0ZWQgY2xlYW51cAorICAgICAgICBpbiBTY3JpcHRF eGVjdXRpb25Db250ZXh0IGRlc3RydWN0b3Igd2hlbiBXb3JrZXJDb250ZXh0IGRpZXMuIFRoZSBm aXgKKyAgICAgICAgaXMgdG8gdXNlIGlzTWFpblRocmVhZCBhbmQgY2FsbE9uTWFpblRocmVhZC4K KworICAgICAgICAqIGZpbGVhcGkvVGhyZWFkYWJsZUJsb2JSZWdpc3RyeS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpCbG9iUmVnaXN0cnlDb250ZXh0OjpCbG9iUmVnaXN0cnlDb250ZXh0KToKKyAg ICAgICAgKFdlYkNvcmU6OnJlZ2lzdGVyQmxvYlVSTFRhc2spOgorICAgICAgICAoV2ViQ29yZTo6 VGhyZWFkYWJsZUJsb2JSZWdpc3RyeTo6cmVnaXN0ZXJCbG9iVVJMKToKKyAgICAgICAgKFdlYkNv cmU6OnJlZ2lzdGVyQmxvYlVSTEZyb21UYXNrKToKKyAgICAgICAgKFdlYkNvcmU6OnVucmVnaXN0 ZXJCbG9iVVJMVGFzayk6CisgICAgICAgIChXZWJDb3JlOjpUaHJlYWRhYmxlQmxvYlJlZ2lzdHJ5 Ojp1bnJlZ2lzdGVyQmxvYlVSTCk6CisKIDIwMTAtMDgtMzAgIElseWEgVGlraG9ub3Zza3kgIDxs b2lzbG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEpvc2VwaCBQZWNvcmFy by4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvZmlsZWFwaS9UaHJlYWRhYmxlQmxvYlJlZ2lzdHJ5LmNw cCBiL1dlYkNvcmUvZmlsZWFwaS9UaHJlYWRhYmxlQmxvYlJlZ2lzdHJ5LmNwcAppbmRleCA4ZDcy MDc2Li44OGFiODI0IDEwMDY0NAotLS0gYS9XZWJDb3JlL2ZpbGVhcGkvVGhyZWFkYWJsZUJsb2JS ZWdpc3RyeS5jcHAKKysrIGIvV2ViQ29yZS9maWxlYXBpL1RocmVhZGFibGVCbG9iUmVnaXN0cnku Y3BwCkBAIC0zNCw2NSArMzQsNzYgQEAKIAogI2luY2x1ZGUgIkJsb2JEYXRhLmgiCiAjaW5jbHVk ZSAiQmxvYlJlZ2lzdHJ5LmgiCi0jaW5jbHVkZSAiQ3Jvc3NUaHJlYWRUYXNrLmgiCi0jaW5jbHVk ZSAiTm90SW1wbGVtZW50ZWQuaCIKICNpbmNsdWRlICJTY3JpcHRFeGVjdXRpb25Db250ZXh0Lmgi Ci0jaW5jbHVkZSAiV29ya2VyQ29udGV4dC5oIgotI2luY2x1ZGUgIldvcmtlckxvYWRlclByb3h5 LmgiCi0jaW5jbHVkZSAiV29ya2VyVGhyZWFkLmgiCisjaW5jbHVkZSA8d3RmL01haW5UaHJlYWQu aD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0jaWYgRU5BQkxFKEJMT0IpCitzdHJ1Y3QgQmxv YlJlZ2lzdHJ5Q29udGV4dCB7CisgICAgQmxvYlJlZ2lzdHJ5Q29udGV4dChjb25zdCBLVVJMJiB1 cmwsIFBhc3NPd25QdHI8QmxvYkRhdGE+IGJsb2JEYXRhKQorICAgICAgICA6IHVybCh1cmwuY29w eSgpKQorICAgICAgICAsIGJsb2JEYXRhKGJsb2JEYXRhKQorICAgIHsKKyAgICB9CisKKyAgICBC bG9iUmVnaXN0cnlDb250ZXh0KGNvbnN0IEtVUkwmIHVybCwgY29uc3QgS1VSTCYgc3JjVVJMKQor ICAgICAgICA6IHVybCh1cmwuY29weSgpKQorICAgICAgICAsIHNyY1VSTChzcmNVUkwuY29weSgp KQorICAgIHsKKyAgICB9CisKKyAgICBCbG9iUmVnaXN0cnlDb250ZXh0KGNvbnN0IEtVUkwmIHVy bCkKKyAgICAgICAgOiB1cmwodXJsLmNvcHkoKSkKKyAgICB7CisgICAgfQorCisgICAgS1VSTCB1 cmw7CisgICAgS1VSTCBzcmNVUkw7CisgICAgT3duUHRyPEJsb2JEYXRhPiBibG9iRGF0YTsKK307 CiAKLXN0YXRpYyB2b2lkIHBvc3RUYXNrVG9NYWluVGhyZWFkKFNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQqIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQsIFBhc3NPd25QdHI8U2NyaXB0RXhlY3V0aW9uQ29u dGV4dDo6VGFzaz4gdGFzaykKLXsKLSNpZiBFTkFCTEUoV09SS0VSUykKLSAgICBBU1NFUlQoc2Ny aXB0RXhlY3V0aW9uQ29udGV4dC0+aXNXb3JrZXJDb250ZXh0KCkpOwotICAgIFdvcmtlckxvYWRl clByb3h5JiBwcm94eSA9IHN0YXRpY19jYXN0PFdvcmtlckNvbnRleHQqPihzY3JpcHRFeGVjdXRp b25Db250ZXh0KS0+dGhyZWFkKCktPndvcmtlckxvYWRlclByb3h5KCk7Ci0gICAgcHJveHkucG9z dFRhc2tUb0xvYWRlcih0YXNrKTsKLSNlbHNlCi0gICAgbm90SW1wbGVtZW50ZWQoKTsKLSNlbmRp ZgotfQorI2lmIEVOQUJMRShCTE9CKQogCi1zdGF0aWMgdm9pZCByZWdpc3RlckJsb2JVUkxUYXNr KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBjb25zdCBLVVJMJiB1cmwsIFBhc3NPd25QdHI8Qmxv YkRhdGE+IGJsb2JEYXRhKQorc3RhdGljIHZvaWQgcmVnaXN0ZXJCbG9iVVJMVGFzayh2b2lkKiBj b250ZXh0KQogewotICAgIGJsb2JSZWdpc3RyeSgpLnJlZ2lzdGVyQmxvYlVSTCh1cmwsIGJsb2JE YXRhKTsKKyAgICBPd25QdHI8QmxvYlJlZ2lzdHJ5Q29udGV4dD4gYmxvYlJlZ2lzdHJ5Q29udGV4 dCA9IGFkb3B0UHRyKHN0YXRpY19jYXN0PEJsb2JSZWdpc3RyeUNvbnRleHQqPihjb250ZXh0KSk7 CisgICAgYmxvYlJlZ2lzdHJ5KCkucmVnaXN0ZXJCbG9iVVJMKGJsb2JSZWdpc3RyeUNvbnRleHQt PnVybCwgYmxvYlJlZ2lzdHJ5Q29udGV4dC0+YmxvYkRhdGEucmVsZWFzZSgpKTsKIH0KIAotdm9p ZCBUaHJlYWRhYmxlQmxvYlJlZ2lzdHJ5OjpyZWdpc3RlckJsb2JVUkwoU2NyaXB0RXhlY3V0aW9u Q29udGV4dCogc2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgY29uc3QgS1VSTCYgdXJsLCBQYXNzT3du UHRyPEJsb2JEYXRhPiBibG9iRGF0YSkKK3ZvaWQgVGhyZWFkYWJsZUJsb2JSZWdpc3RyeTo6cmVn aXN0ZXJCbG9iVVJMKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBjb25zdCBLVVJMJiB1cmwsIFBh c3NPd25QdHI8QmxvYkRhdGE+IGJsb2JEYXRhKQogewotICAgIGlmIChzY3JpcHRFeGVjdXRpb25D b250ZXh0LT5pc1dvcmtlckNvbnRleHQoKSkKLSAgICAgICAgcG9zdFRhc2tUb01haW5UaHJlYWQo c2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgY3JlYXRlQ2FsbGJhY2tUYXNrKCZyZWdpc3RlckJsb2JV UkxUYXNrLCB1cmwsIGJsb2JEYXRhKSk7CisgICAgaWYgKGlzTWFpblRocmVhZCgpKQorICAgICAg ICBibG9iUmVnaXN0cnkoKS5yZWdpc3RlckJsb2JVUkwodXJsLCBibG9iRGF0YSk7CiAgICAgZWxz ZQotICAgICAgICByZWdpc3RlckJsb2JVUkxUYXNrKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQsIHVy bCwgYmxvYkRhdGEpOworICAgICAgICBjYWxsT25NYWluVGhyZWFkKCZyZWdpc3RlckJsb2JVUkxU YXNrLCBuZXcgQmxvYlJlZ2lzdHJ5Q29udGV4dCh1cmwsIGJsb2JEYXRhKSk7CiB9CiAKLXN0YXRp YyB2b2lkIHJlZ2lzdGVyQmxvYlVSTEZyb21UYXNrKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBj b25zdCBLVVJMJiB1cmwsIGNvbnN0IEtVUkwmIHNyY1VSTCkKK3N0YXRpYyB2b2lkIHJlZ2lzdGVy QmxvYlVSTEZyb21UYXNrKHZvaWQqIGNvbnRleHQpCiB7Ci0gICAgYmxvYlJlZ2lzdHJ5KCkucmVn aXN0ZXJCbG9iVVJMKHVybCwgc3JjVVJMKTsKKyAgICBPd25QdHI8QmxvYlJlZ2lzdHJ5Q29udGV4 dD4gYmxvYlJlZ2lzdHJ5Q29udGV4dCA9IGFkb3B0UHRyKHN0YXRpY19jYXN0PEJsb2JSZWdpc3Ry eUNvbnRleHQqPihjb250ZXh0KSk7CisgICAgYmxvYlJlZ2lzdHJ5KCkucmVnaXN0ZXJCbG9iVVJM KGJsb2JSZWdpc3RyeUNvbnRleHQtPnVybCwgYmxvYlJlZ2lzdHJ5Q29udGV4dC0+c3JjVVJMKTsK IH0KIAotdm9pZCBUaHJlYWRhYmxlQmxvYlJlZ2lzdHJ5OjpyZWdpc3RlckJsb2JVUkwoU2NyaXB0 RXhlY3V0aW9uQ29udGV4dCogc2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgY29uc3QgS1VSTCYgdXJs LCBjb25zdCBLVVJMJiBzcmNVUkwpCit2b2lkIFRocmVhZGFibGVCbG9iUmVnaXN0cnk6OnJlZ2lz dGVyQmxvYlVSTChTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgY29uc3QgS1VSTCYgdXJsLCBjb25z dCBLVVJMJiBzcmNVUkwpCiB7Ci0gICAgaWYgKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQtPmlzV29y a2VyQ29udGV4dCgpKQotICAgICAgICBwb3N0VGFza1RvTWFpblRocmVhZChzY3JpcHRFeGVjdXRp b25Db250ZXh0LCBjcmVhdGVDYWxsYmFja1Rhc2soJnJlZ2lzdGVyQmxvYlVSTEZyb21UYXNrLCB1 cmwsIHNyY1VSTCkpOworICAgIGlmIChpc01haW5UaHJlYWQoKSkKKyAgICAgICAgYmxvYlJlZ2lz dHJ5KCkucmVnaXN0ZXJCbG9iVVJMKHVybCwgc3JjVVJMKTsKICAgICBlbHNlCi0gICAgICAgIHJl Z2lzdGVyQmxvYlVSTEZyb21UYXNrKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQsIHVybCwgc3JjVVJM KTsKKyAgICAgICAgY2FsbE9uTWFpblRocmVhZCgmcmVnaXN0ZXJCbG9iVVJMRnJvbVRhc2ssIG5l dyBCbG9iUmVnaXN0cnlDb250ZXh0KHVybCwgc3JjVVJMKSk7CiB9CiAKLXN0YXRpYyB2b2lkIHVu cmVnaXN0ZXJCbG9iVVJMVGFzayhTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgY29uc3QgS1VSTCYg dXJsKQorc3RhdGljIHZvaWQgdW5yZWdpc3RlckJsb2JVUkxUYXNrKHZvaWQqIGNvbnRleHQpCiB7 Ci0gICAgYmxvYlJlZ2lzdHJ5KCkudW5yZWdpc3RlckJsb2JVUkwodXJsKTsKKyAgICBPd25QdHI8 QmxvYlJlZ2lzdHJ5Q29udGV4dD4gYmxvYlJlZ2lzdHJ5Q29udGV4dCA9IGFkb3B0UHRyKHN0YXRp Y19jYXN0PEJsb2JSZWdpc3RyeUNvbnRleHQqPihjb250ZXh0KSk7CisgICAgYmxvYlJlZ2lzdHJ5 KCkudW5yZWdpc3RlckJsb2JVUkwoYmxvYlJlZ2lzdHJ5Q29udGV4dC0+dXJsKTsKIH0KIAotdm9p ZCBUaHJlYWRhYmxlQmxvYlJlZ2lzdHJ5Ojp1bnJlZ2lzdGVyQmxvYlVSTChTY3JpcHRFeGVjdXRp b25Db250ZXh0KiBzY3JpcHRFeGVjdXRpb25Db250ZXh0LCBjb25zdCBLVVJMJiB1cmwpCit2b2lk IFRocmVhZGFibGVCbG9iUmVnaXN0cnk6OnVucmVnaXN0ZXJCbG9iVVJMKFNjcmlwdEV4ZWN1dGlv bkNvbnRleHQqLCBjb25zdCBLVVJMJiB1cmwpCiB7Ci0gICAgaWYgKHNjcmlwdEV4ZWN1dGlvbkNv bnRleHQtPmlzV29ya2VyQ29udGV4dCgpKQotICAgICAgICBwb3N0VGFza1RvTWFpblRocmVhZChz Y3JpcHRFeGVjdXRpb25Db250ZXh0LCBjcmVhdGVDYWxsYmFja1Rhc2soJnVucmVnaXN0ZXJCbG9i VVJMVGFzaywgdXJsKSk7CisgICAgaWYgKGlzTWFpblRocmVhZCgpKQorICAgICAgICBibG9iUmVn aXN0cnkoKS51bnJlZ2lzdGVyQmxvYlVSTCh1cmwpOwogICAgIGVsc2UKLSAgICAgICAgdW5yZWdp c3RlckJsb2JVUkxUYXNrKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQsIHVybCk7CisgICAgICAgIGNh bGxPbk1haW5UaHJlYWQoJnVucmVnaXN0ZXJCbG9iVVJMVGFzaywgbmV3IEJsb2JSZWdpc3RyeUNv bnRleHQodXJsKSk7CiB9CiAKICNlbHNlCg==