119644 2013-08-09 17:02:47 -0700 [iOS] isMainThread implementation with USE(WEB_THREAD) 2013-08-12 10:47:02 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joepeck webkit-unassigned benjamin cmarcelo commit-queue dbates ddkilzer joepeck oldest_to_newest 915993 0 joepeck 2013-08-09 17:02:47 -0700 At the 2013 WebKit Contributors Meeting this year one of the discussions was upstreaming iOS WebKit: <https://docs.google.com/document/d/1jsqXPcwOkBo4L8taB_rmSY8oAZFCaGJ1CU20PI6p0kQ/edit?pli=1> Discussion: What do we do about ASSERT(isMainThread())? DECISION: Leave it named isMainThread()… On iOS isMainThread() means that the current thread is either the MainThread or WebThread and the current thread has the WebThreadLock. 915994 1 208463 joepeck 2013-08-09 17:05:21 -0700 Created attachment 208463 [PATCH] Proposed Fix 915996 2 commit-queue 2013-08-09 17:08:24 -0700 Attachment 208463 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WTF/ChangeLog', u'Source/WTF/wtf/ios/WebCoreThread.cpp', u'Source/WTF/wtf/ios/WebCoreThread.h', u'Source/WTF/wtf/mac/MainThreadMac.mm']" exit_code: 1 Source/WTF/wtf/ios/WebCoreThread.h:28: #ifndef header guard has wrong style, please use: WTF_WebCoreThread_h [build/header_guard] [5] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 916337 3 joepeck 2013-08-12 10:47:02 -0700 Committed <http://trac.webkit.org/changeset/153950>. 208463 2013-08-09 17:05:21 -0700 2013-08-09 18:06:13 -0700 [PATCH] Proposed Fix proposed-fix.patch text/plain 5975 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggNTZiOGZkMC4uNmFmMDAyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dURi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMy0wOC0wOSAg Sm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIGlz TWFpblRocmVhZCBpbXBsZW1lbnRhdGlvbiB3aXRoIFVTRShXRUJfVEhSRUFEKQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5NjQ0CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgT24gaU9TIGlzTWFpblRocmVh ZCgpIG1lYW5zIHRoYXQgdGhlIGN1cnJlbnQgdGhyZWFkIGlzIGVpdGhlciB0aGUKKyAgICAgICAg TWFpblRocmVhZCBvciBXZWJUaHJlYWQgYW5kIHRoZSBjdXJyZW50IHRocmVhZCBoYXMgdGhlIFdl YlRocmVhZExvY2suCisKKyAgICAgICAgKiB3dGYvaW9zL1dlYkNvcmVUaHJlYWQuY3BwOiBBZGRl ZC4KKyAgICAgICAgKiB3dGYvaW9zL1dlYkNvcmVUaHJlYWQuaDogQWRkZWQuCisgICAgICAgICog d3RmL21hYy9NYWluVGhyZWFkTWFjLm1tOgorICAgICAgICAoV1RGOjppc01haW5UaHJlYWQpOgor CiAyMDEzLTA4LTA5ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2guZHVtZXpAc2lzYS5zYW1zdW5nLmNv bT4KIAogICAgICAgICBNYWtlIGF0b2IoKSB0aHJvdyBhbiBJbnZhbGlkQ2hhcmFjdGVyRXJyb3Ig b24gZXhjZXNzIHBhZGRpbmcgY2hhcmFjdGVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYv aW9zL1dlYkNvcmVUaHJlYWQuY3BwIGIvU291cmNlL1dURi93dGYvaW9zL1dlYkNvcmVUaHJlYWQu Y3BwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmRlMjNmNzUKLS0tIC9kZXYv bnVsbAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9pb3MvV2ViQ29yZVRocmVhZC5jcHAKQEAgLTAsMCAr MSwzMCBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMCBBcHBsZSBJbmMuIEFsbCByaWdodHMg cmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJp bmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0 ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6Cisg KgorICogMS4gIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUg YWJvdmUgY29weXJpZ2h0CisgKiAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBh bmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLiAKKyAqIDIuICBSZWRpc3RyaWJ1dGlvbnMgaW4g YmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgIG5v dGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1l ciBpbiB0aGUKKyAqICAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJv dmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLiAKKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBS T1ZJREVEIEJZIEFQUExFIEFORCBJVFMgQ09OVFJJQlVUT1JTICJBUyBJUyIgQU5EIEFOWQorICog RVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVE IFRPLCBUSEUgSU1QTElFRAorICogV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJ VE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRQorICogRElTQ0xBSU1FRC4gSU4gTk8g RVZFTlQgU0hBTEwgQVBQTEUgT1IgSVRTIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWQor ICogRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBD T05TRVFVRU5USUFMIERBTUFHRVMKKyAqIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywg UFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsKKyAqIExPU1MgT0Yg VVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIg Q0FVU0VEIEFORAorICogT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09O VFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5D RSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRgorICog VEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNI IERBTUFHRS4KKyAqLworCisKKyNpbmNsdWRlICJjb25maWcuaCIKKyNpbmNsdWRlICJXZWJDb3Jl VGhyZWFkLmgiCisKK1dURl9FWFBPUlRfUFJJVkFURSBib29sICgqV2ViQ29yZVdlYlRocmVhZElz TG9ja2VkT3JEaXNhYmxlZCkodm9pZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9pb3Mv V2ViQ29yZVRocmVhZC5oIGIvU291cmNlL1dURi93dGYvaW9zL1dlYkNvcmVUaHJlYWQuaApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mMzk3ZGZjCi0tLSAvZGV2L251bGwKKysr IGIvU291cmNlL1dURi93dGYvaW9zL1dlYkNvcmVUaHJlYWQuaApAQCAtMCwwICsxLDQxIEBACisv KgorICogQ29weXJpZ2h0IChDKSAyMDEwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K KyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqCisgKiAxLiAg UmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5 cmlnaHQKKyAqICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9s bG93aW5nIGRpc2NsYWltZXIuIAorICogMi4gIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9y bSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICAgbm90aWNlLCB0aGlz IGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQor ICogICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRo IHRoZSBkaXN0cmlidXRpb24uIAorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkg QVBQTEUgQU5EIElUUyBDT05UUklCVVRPUlMgIkFTIElTIiBBTkQgQU5ZCisgKiBFWFBSRVNTIE9S IElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRSBJ TVBMSUVECisgKiBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1Ig QSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFCisgKiBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFM TCBBUFBMRSBPUiBJVFMgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZCisgKiBESVJFQ1Qs IElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJ QUwgREFNQUdFUworICogKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVO VCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOworICogTE9TUyBPRiBVU0UsIERBVEEs IE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5E CisgKiBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RS SUNUIExJQUJJTElUWSwgT1IgVE9SVAorICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVS V0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GCisgKiBUSElTIFNPRlRX QVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgor ICovCisKKy8vIFNpbmNlIHRoaXMgaXMgYSBzaGFyZWQgaGVhZGVyLCB3aXRoIHRoZSBzYW1lIGZp bGUgbmFtZSBhcyBhIGZpbGUgaW4KKy8vIFdlYkNvcmUgd2UgcHJlZml4IHRoaXMgd2l0aCBKYXZh U2NyaXB0Q29yZSB0byBtYWtlIGl0IHVuaXF1ZS4KKyNpZm5kZWYgSmF2YVNjcmlwdENvcmVfV2Vi Q29yZVRocmVhZF9oCisjZGVmaW5lIEphdmFTY3JpcHRDb3JlX1dlYkNvcmVUaHJlYWRfaAorCisj aWZkZWYgX19jcGx1c3BsdXMKK2V4dGVybiAiQyIgeworI2VuZGlmCisKK2V4dGVybiBib29sICgq V2ViQ29yZVdlYlRocmVhZElzTG9ja2VkT3JEaXNhYmxlZCkodm9pZCk7CisKKyNpZmRlZiBfX2Nw bHVzcGx1cworfQorI2VuZGlmCisKKyNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYv bWFjL01haW5UaHJlYWRNYWMubW0gYi9Tb3VyY2UvV1RGL3d0Zi9tYWMvTWFpblRocmVhZE1hYy5t bQppbmRleCBlZmY5NjkxLi5iN2RlNzU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9tYWMv TWFpblRocmVhZE1hYy5tbQorKysgYi9Tb3VyY2UvV1RGL3d0Zi9tYWMvTWFpblRocmVhZE1hYy5t bQpAQCAtMzYsNiArMzYsMTAgQEAKICNpbXBvcnQgPHd0Zi9IYXNoU2V0Lmg+CiAjaW1wb3J0IDx3 dGYvVGhyZWFkaW5nLmg+CiAKKyNpZiBVU0UoV0VCX1RIUkVBRCkKKyNpbmNsdWRlIDx3dGYvaW9z L1dlYkNvcmVUaHJlYWQuaD4KKyNlbmRpZgorCiBAaW50ZXJmYWNlIEpTV1RGTWFpblRocmVhZENh bGxlciA6IE5TT2JqZWN0IHsKIH0KIC0gKHZvaWQpY2FsbDsKQEAgLTEyNCwxOCArMTI4LDEzIEBA IHZvaWQgc2NoZWR1bGVEaXNwYXRjaEZ1bmN0aW9uc09uTWFpblRocmVhZCgpCiAgICAgW3N0YXRp Y01haW5UaHJlYWRDYWxsZXIgcGVyZm9ybVNlbGVjdG9yOkBzZWxlY3RvcihjYWxsKSBvblRocmVh ZDptYWluVGhyZWFkTlNUaHJlYWQgd2l0aE9iamVjdDpuaWwgd2FpdFVudGlsRG9uZTpOT107CiB9 CiAKKyNpZiBVU0UoV0VCX1RIUkVBRCkKIGJvb2wgaXNNYWluVGhyZWFkKCkKIHsKLSAgICBpZiAo bWFpblRocmVhZEVzdGFibGlzaGVkQXNQdGhyZWFkTWFpbikgewotICAgICAgICBBU1NFUlQoIW1h aW5UaHJlYWRQdGhyZWFkKTsKLSAgICAgICAgcmV0dXJuIHB0aHJlYWRfbWFpbl9ucCgpOwotICAg IH0KLQotICAgIEFTU0VSVChtYWluVGhyZWFkUHRocmVhZCk7Ci0gICAgcmV0dXJuIHB0aHJlYWRf ZXF1YWwocHRocmVhZF9zZWxmKCksIG1haW5UaHJlYWRQdGhyZWFkKTsKKyAgICBBU1NFUlQoIW1h aW5UaHJlYWRFc3RhYmxpc2hlZEFzUHRocmVhZE1haW4pOworICAgIHJldHVybiAoaXNXZWJUaHJl YWQoKSB8fCBwdGhyZWFkX21haW5fbnAoKSkgJiYgV2ViQ29yZVdlYlRocmVhZElzTG9ja2VkT3JE aXNhYmxlZCgpOwogfQogCi0jaWYgVVNFKFdFQl9USFJFQUQpCiBib29sIGlzVUlUaHJlYWQoKQog ewogICAgIHJldHVybiBwdGhyZWFkX21haW5fbnAoKTsKQEAgLTE0NSw2ICsxNDQsMTcgQEAgYm9v bCBpc1dlYlRocmVhZCgpCiB7CiAgICAgcmV0dXJuIHB0aHJlYWRfZXF1YWwocHRocmVhZF9zZWxm KCksIG1haW5UaHJlYWRQdGhyZWFkKTsKIH0KKyNlbHNlCitib29sIGlzTWFpblRocmVhZCgpCit7 CisgICAgaWYgKG1haW5UaHJlYWRFc3RhYmxpc2hlZEFzUHRocmVhZE1haW4pIHsKKyAgICAgICAg QVNTRVJUKCFtYWluVGhyZWFkUHRocmVhZCk7CisgICAgICAgIHJldHVybiBwdGhyZWFkX21haW5f bnAoKTsKKyAgICB9CisKKyAgICBBU1NFUlQobWFpblRocmVhZFB0aHJlYWQpOworICAgIHJldHVy biBwdGhyZWFkX2VxdWFsKHB0aHJlYWRfc2VsZigpLCBtYWluVGhyZWFkUHRocmVhZCk7Cit9CiAj ZW5kaWYgLy8gVVNFKFdFQl9USFJFQUQpCiAKIH0gLy8gbmFtZXNwYWNlIFdURgo=