54309 2011-02-11 13:53:01 -0800 Add a SyncMessageState class to CoreIPC::Connection 2011-02-11 14:36:40 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca buildbot oldest_to_newest 349990 0 andersca 2011-02-11 13:53:01 -0800 Add a SyncMessageState class to CoreIPC::Connection 349992 1 82168 andersca 2011-02-11 13:56:00 -0800 Created attachment 82168 Patch 349996 2 82168 aroben 2011-02-11 13:59:30 -0800 Comment on attachment 82168 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=82168&action=review > Source/WebKit2/Platform/CoreIPC/Connection.cpp:59 > + RunLoop* m_runLoop; > + > + typedef HashMap<RunLoop*, SyncMessageState*> SyncMessageStateMap; > + static SyncMessageStateMap& syncMessageStateMap() > + { > + DEFINE_STATIC_LOCAL(SyncMessageStateMap, syncMessageStateMap, ()); > + return syncMessageStateMap; > + } > + > + static Mutex& syncMessageStateMapMutex() > + { > + DEFINE_STATIC_LOCAL(Mutex, syncMessageStateMapMutex, ()); > + return syncMessageStateMapMutex; > + } I personally don't like function members to follow data members. > Source/WebKit2/Platform/CoreIPC/Connection.h:263 > + class SyncMessageState; > + friend class SyncMessageState; I didn't think the first declaration was necessary. But maybe it is so that the compiler knows it's a nested class? 350001 3 andersca 2011-02-11 14:03:19 -0800 Committed r78368: <http://trac.webkit.org/changeset/78368> 350047 4 buildbot 2011-02-11 14:36:40 -0800 Attachment 82168 did not build on win: Build output: http://queues.webkit.org/results/7870775 82168 2011-02-11 13:56:00 -0800 2011-02-11 13:59:30 -0800 Patch bug-54309-20110211135559.patch text/plain 4008 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDc4MzY1KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDItMTEgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBTeW5jTWVzc2FnZVN0YXRlIGNsYXNzIHRvIENv cmVJUEM6OkNvbm5lY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTU0MzA5CisKKyAgICAgICAgU3luY01lc3NhZ2VTdGF0ZSBvYmplY3RzIGFyZSBz aGFyZWQgYmV0d2VlbiBhbGwgY29ubmVjdGlvbnMgc2NoZWR1bGVkIG9uCisgICAgICAgIGEgZ2l2 ZW4gcnVuIGxvb3AuIEl0IHdpbGwgYmUgdXNlZCB0byBrZWVwIHRyYWNrIG9mIHN0YXRlIHdoZW4g d2FpdGluZworICAgICAgICBmb3IgcmVwbGllcyBmb3IgYSBzeW5jaHJvbm91cyBtZXNzYWdlLgor CisgICAgICAgICogUGxhdGZvcm0vQ29yZUlQQy9Db25uZWN0aW9uLmNwcDoKKyAgICAgICAgKENv cmVJUEM6OkNvbm5lY3Rpb246OlN5bmNNZXNzYWdlU3RhdGU6OnN5bmNNZXNzYWdlU3RhdGVNYXAp OgorICAgICAgICAoQ29yZUlQQzo6Q29ubmVjdGlvbjo6U3luY01lc3NhZ2VTdGF0ZTo6c3luY01l c3NhZ2VTdGF0ZU1hcE11dGV4KToKKyAgICAgICAgQWRkIGEgZ2xvYmFsIFJ1bkxvb3AgLT4gU3lu Y01lc3NhZ2VTdGF0ZSBtYXAgYW5kIGEgbXV0ZXggZm9yIGxvY2tpbmcuCisKKyAgICAgICAgKENv cmVJUEM6OkNvbm5lY3Rpb246OlN5bmNNZXNzYWdlU3RhdGU6OmdldE9yQ3JlYXRlKToKKyAgICAg ICAgTG9vayBpbiB0aGUgbWFwIGZvciBhbiBleGlzdGluZyBTeW5jTWVzc2FnZVN0YXRlIG9iamVj dCBhbmQgY3JlYXRlIGEgbmV3CisgICAgICAgIG9uZSBpZiBub25lIGlzIGZvdW5kLgorCisgICAg ICAgIChDb3JlSVBDOjpDb25uZWN0aW9uOjpTeW5jTWVzc2FnZVN0YXRlOjpTeW5jTWVzc2FnZVN0 YXRlKToKKyAgICAgICAgSW5pdGlhbGl6ZSBtX3J1bkxvb3AuCisKKyAgICAgICAgKENvcmVJUEM6 OkNvbm5lY3Rpb246OlN5bmNNZXNzYWdlU3RhdGU6On5TeW5jTWVzc2FnZVN0YXRlKToKKyAgICAg ICAgUmVtb3ZlIHRoZSBvYmplY3QgZnJvbSB0aGUgbWFwLgorCiAyMDExLTAyLTExICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4g QWRsZXIuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0Nvbm5lY3Rpb24u Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvQ29ubmVj dGlvbi5jcHAJKHJldmlzaW9uIDc4MzYwKQorKysgU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29y ZUlQQy9Db25uZWN0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzUsNiArMzUsNTcgQEAgdXNp bmcgbmFtZXNwYWNlIHN0ZDsKIAogbmFtZXNwYWNlIENvcmVJUEMgewogCitjbGFzcyBDb25uZWN0 aW9uOjpTeW5jTWVzc2FnZVN0YXRlIDogcHVibGljIFJlZkNvdW50ZWQ8Q29ubmVjdGlvbjo6U3lu Y01lc3NhZ2VTdGF0ZT4geworcHVibGljOgorICAgIHN0YXRpYyBQYXNzUmVmUHRyPFN5bmNNZXNz YWdlU3RhdGU+IGdldE9yQ3JlYXRlKFJ1bkxvb3AqKTsKKyAgICB+U3luY01lc3NhZ2VTdGF0ZSgp OworCitwcml2YXRlOgorICAgIGV4cGxpY2l0IFN5bmNNZXNzYWdlU3RhdGUoUnVuTG9vcCopOwor CisgICAgUnVuTG9vcCogbV9ydW5Mb29wOworCisgICAgdHlwZWRlZiBIYXNoTWFwPFJ1bkxvb3Aq LCBTeW5jTWVzc2FnZVN0YXRlKj4gU3luY01lc3NhZ2VTdGF0ZU1hcDsKKyAgICBzdGF0aWMgU3lu Y01lc3NhZ2VTdGF0ZU1hcCYgc3luY01lc3NhZ2VTdGF0ZU1hcCgpCisgICAgeworICAgICAgICBE RUZJTkVfU1RBVElDX0xPQ0FMKFN5bmNNZXNzYWdlU3RhdGVNYXAsIHN5bmNNZXNzYWdlU3RhdGVN YXAsICgpKTsKKyAgICAgICAgcmV0dXJuIHN5bmNNZXNzYWdlU3RhdGVNYXA7CisgICAgfQorCisg ICAgc3RhdGljIE11dGV4JiBzeW5jTWVzc2FnZVN0YXRlTWFwTXV0ZXgoKQorICAgIHsKKyAgICAg ICAgREVGSU5FX1NUQVRJQ19MT0NBTChNdXRleCwgc3luY01lc3NhZ2VTdGF0ZU1hcE11dGV4LCAo KSk7CisgICAgICAgIHJldHVybiBzeW5jTWVzc2FnZVN0YXRlTWFwTXV0ZXg7CisgICAgfQorfTsK KworUGFzc1JlZlB0cjxDb25uZWN0aW9uOjpTeW5jTWVzc2FnZVN0YXRlPiBDb25uZWN0aW9uOjpT eW5jTWVzc2FnZVN0YXRlOjpnZXRPckNyZWF0ZShSdW5Mb29wKiBydW5Mb29wKQoreworICAgIE11 dGV4TG9ja2VyIGxvY2tlcihzeW5jTWVzc2FnZVN0YXRlTWFwTXV0ZXgoKSk7CisgICAgcGFpcjxT eW5jTWVzc2FnZVN0YXRlTWFwOjppdGVyYXRvciwgYm9vbD4gcmVzdWx0ID0gc3luY01lc3NhZ2VT dGF0ZU1hcCgpLmFkZChydW5Mb29wLCAwKTsKKworICAgIGlmICghcmVzdWx0LnNlY29uZCkKKyAg ICAgICAgcmV0dXJuIHJlc3VsdC5maXJzdC0+c2Vjb25kOworCisgICAgUmVmUHRyPFN5bmNNZXNz YWdlU3RhdGU+IHN5bmNNZXNzYWdlU3RhdGUgPSBhZG9wdFJlZihuZXcgU3luY01lc3NhZ2VTdGF0 ZShydW5Mb29wKSk7CisgICAgcmVzdWx0LmZpcnN0LT5zZWNvbmQgPSBzeW5jTWVzc2FnZVN0YXRl LmdldCgpOworCisgICAgcmV0dXJuIHN5bmNNZXNzYWdlU3RhdGUucmVsZWFzZSgpOworfQorCitD b25uZWN0aW9uOjpTeW5jTWVzc2FnZVN0YXRlOjpTeW5jTWVzc2FnZVN0YXRlKFJ1bkxvb3AqIHJ1 bkxvb3ApCisgICAgOiBtX3J1bkxvb3AocnVuTG9vcCkKK3sKK30KKworQ29ubmVjdGlvbjo6U3lu Y01lc3NhZ2VTdGF0ZTo6flN5bmNNZXNzYWdlU3RhdGUoKQoreworICAgIE11dGV4TG9ja2VyIGxv Y2tlcihzeW5jTWVzc2FnZVN0YXRlTWFwTXV0ZXgoKSk7CisgICAgCisgICAgQVNTRVJUKHN5bmNN ZXNzYWdlU3RhdGVNYXAoKS5jb250YWlucyhtX3J1bkxvb3ApKTsKKyAgICBzeW5jTWVzc2FnZVN0 YXRlTWFwKCkucmVtb3ZlKG1fcnVuTG9vcCk7Cit9CisKIFBhc3NSZWZQdHI8Q29ubmVjdGlvbj4g Q29ubmVjdGlvbjo6Y3JlYXRlU2VydmVyQ29ubmVjdGlvbihJZGVudGlmaWVyIGlkZW50aWZpZXIs IENsaWVudCogY2xpZW50LCBSdW5Mb29wKiBjbGllbnRSdW5Mb29wKQogewogICAgIHJldHVybiBh ZG9wdFJlZihuZXcgQ29ubmVjdGlvbihpZGVudGlmaWVyLCB0cnVlLCBjbGllbnQsIGNsaWVudFJ1 bkxvb3ApKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvQ29ubmVjdGlv bi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvQ29ubmVj dGlvbi5oCShyZXZpc2lvbiA3ODM2MCkKKysrIFNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJ UEMvQ29ubmVjdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNTksNiArMjU5LDEwIEBAIHByaXZh dGU6CiAgICAgCiAgICAgQmluYXJ5U2VtYXBob3JlIG1fd2FpdEZvclN5bmNSZXBseVNlbWFwaG9y ZTsKIAorICAgIGNsYXNzIFN5bmNNZXNzYWdlU3RhdGU7CisgICAgZnJpZW5kIGNsYXNzIFN5bmNN ZXNzYWdlU3RhdGU7CisgICAgUmVmUHRyPFN5bmNNZXNzYWdlU3RhdGU+IG1fc3luY01lc3NhZ2VT dGF0ZTsKKwogICAgIE11dGV4IG1fc3luY1JlcGx5U3RhdGVNdXRleDsKICAgICBib29sIG1fc2hv dWxkV2FpdEZvclN5bmNSZXBsaWVzOwogICAgIFZlY3RvcjxQZW5kaW5nU3luY1JlcGx5PiBtX3Bl bmRpbmdTeW5jUmVwbGllczsK