127678 2014-01-27 01:59:42 -0800 Buildfix for !ENABLE(COMPARE_AND_SWAP) platforms after r162774 2014-01-27 03:08:49 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ossy ossy commit-queue ossy rgabor zherczeg oldest_to_newest 972366 0 ossy 2014-01-27 01:59:42 -0800 After http://trac.webkit.org/changeset/162774 we should use std::mutex and std::atomic instead of WTF threading primitives. This change broke !ENABLE(COMPARE_AND_SWAP) builds, for example the ARM traditional build: /home/webkitbuildbot/slaves/efl-ARMv7-traditional-build/buildslave/efl-armv7-traditional-build/build/Source/WebCore/platform/text/TextBreakIterator.cpp: In function 'bool WebCore::compareAndSwapNonSharedCharacterBreakIterator(WebCore::TextBreakIterator*, WebCore::TextBreakIterator*)': /home/webkitbuildbot/slaves/efl-ARMv7-traditional-build/buildslave/efl-armv7-traditional-build/build/Source/WebCore/platform/text/TextBreakIterator.cpp:279:12: error: 'Mutex' does not name a type /home/webkitbuildbot/slaves/efl-ARMv7-traditional-build/buildslave/efl-armv7-traditional-build/build/Source/WebCore/platform/text/TextBreakIterator.cpp:280:5: error: 'MutexLocker' was not declared in this scope /home/webkitbuildbot/slaves/efl-ARMv7-traditional-build/buildslave/efl-armv7-traditional-build/build/Source/WebCore/platform/text/TextBreakIterator.cpp:280:17: error: expected ';' before 'locker' 972367 1 222312 ossy 2014-01-27 02:02:34 -0800 Created attachment 222312 Patch 972374 2 222312 zherczeg 2014-01-27 02:40:31 -0800 Comment on attachment 222312 Patch rs=me 972381 3 222312 commit-queue 2014-01-27 03:08:46 -0800 Comment on attachment 222312 Patch Clearing flags on attachment: 222312 Committed r162833: <http://trac.webkit.org/changeset/162833> 972382 4 commit-queue 2014-01-27 03:08:49 -0800 All reviewed patches have been landed. Closing bug. 222312 2014-01-27 02:02:34 -0800 2014-01-27 03:08:46 -0800 Patch bug-127678-20140127110438.patch text/plain 2081 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyODMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTA0NWM1ZjQ2MjY3MmRl YWY0N2UwY2RlNTQ2MzE4YTg1ZjE4MmQ2Ny4uYjFkZGIwNGUxZjg2MTc3ZjE1MWY4N2Y0ZTFlZWRk Yjg2NTI2MDcyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE0LTAxLTI3ICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisKKyAgICAgICAgQnVpbGRmaXggZm9y ICFFTkFCTEUoQ09NUEFSRV9BTkRfU1dBUCkgcGxhdGZvcm1zIGFmdGVyIHIxNjI3NzQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzY3OAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vdGV4 dC9UZXh0QnJlYWtJdGVyYXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb21wYXJlQW5kU3dh cE5vblNoYXJlZENoYXJhY3RlckJyZWFrSXRlcmF0b3IpOgorICAgICAgICBVc2Ugc3RkOjptdXRl eCBpbnN0ZWFkIG9mIE11dGV4IGFuZCBzdGQ6OmxvY2tfZ3VhcmQgaW5zdGVhZCBvZiBNdXRleExv Y2tlci4KKwogMjAxNC0wMS0yNiAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNv bT4KIAogICAgICAgICBGaXggdGhlIGlPUyBidWlsZCAoZmFpbGVkIHRvIGNvcnJlY3RseSByZXZl cnQgc29tZSBicm9rZW4gY2hhbmdlcyBpbiB0aGUgbGFzdCBwYXRjaCkuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L1RleHRCcmVha0l0ZXJhdG9yLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvVGV4dEJyZWFrSXRlcmF0b3IuY3BwCmluZGV4IGIwZWY5 MTcwYzRkZjA4YjUxNzljNDQ2NzFlNzVkM2FkZjk0YzA5MWQuLjlkOTQwNjZiNGQzMmQwYzViY2Fl MjdhZmQ0YzQzNTgzNGIwZGQzYmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L3RleHQvVGV4dEJyZWFrSXRlcmF0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L3RleHQvVGV4dEJyZWFrSXRlcmF0b3IuY3BwCkBAIC0yNSw2ICsyNSw3IEBACiAjaW5jbHVkZSAi TGluZUJyZWFrSXRlcmF0b3JQb29sSUNVLmgiCiAjaW5jbHVkZSAiVVRleHRQcm92aWRlckxhdGlu MS5oIgogI2luY2x1ZGUgIlVUZXh0UHJvdmlkZXJVVEYxNi5oIgorI2luY2x1ZGUgPG11dGV4Pgog I2luY2x1ZGUgPHd0Zi9BdG9taWNzLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nVmlldy5o PgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgpAQCAtMjc2LDggKzI3Nyw4IEBAIHN0 YXRpYyBpbmxpbmUgYm9vbCBjb21wYXJlQW5kU3dhcE5vblNoYXJlZENoYXJhY3RlckJyZWFrSXRl cmF0b3IoVGV4dEJyZWFrSXRlcmF0CiAjaWYgRU5BQkxFKENPTVBBUkVfQU5EX1NXQVApCiAgICAg cmV0dXJuIFdURjo6d2Vha0NvbXBhcmVBbmRTd2FwKHJlaW50ZXJwcmV0X2Nhc3Q8dm9pZCoqPigm bm9uU2hhcmVkQ2hhcmFjdGVyQnJlYWtJdGVyYXRvciksIGV4cGVjdGVkLCBuZXdWYWx1ZSk7CiAj ZWxzZQotICAgIERFRklORV9TVEFUSUNfTE9DQUwoTXV0ZXgsIG5vblNoYXJlZENoYXJhY3RlckJy ZWFrSXRlcmF0b3JNdXRleCwgKCkpOwotICAgIE11dGV4TG9ja2VyIGxvY2tlcihub25TaGFyZWRD aGFyYWN0ZXJCcmVha0l0ZXJhdG9yTXV0ZXgpOworICAgIERFRklORV9TVEFUSUNfTE9DQUwoc3Rk OjptdXRleCwgbm9uU2hhcmVkQ2hhcmFjdGVyQnJlYWtJdGVyYXRvck11dGV4LCAoKSk7CisgICAg c3RkOjpsb2NrX2d1YXJkPHN0ZDo6bXV0ZXg+IGxvY2tlcihub25TaGFyZWRDaGFyYWN0ZXJCcmVh a0l0ZXJhdG9yTXV0ZXgpOwogICAgIGlmIChub25TaGFyZWRDaGFyYWN0ZXJCcmVha0l0ZXJhdG9y ICE9IGV4cGVjdGVkKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgbm9uU2hhcmVkQ2hhcmFj dGVyQnJlYWtJdGVyYXRvciA9IG5ld1ZhbHVlOwo=