Title: [162833] trunk/Source/WebCore
- Revision
- 162833
- Author
- o...@webkit.org
- Date
- 2014-01-27 03:13:19 -0800 (Mon, 27 Jan 2014)
Log Message
Buildfix for !ENABLE(COMPARE_AND_SWAP) platforms after r162774
https://bugs.webkit.org/show_bug.cgi?id=127678
Reviewed by Zoltan Herczeg.
* platform/text/TextBreakIterator.cpp:
(WebCore::compareAndSwapNonSharedCharacterBreakIterator):
Use std::mutex instead of Mutex and std::lock_guard instead of MutexLocker.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (162832 => 162833)
--- trunk/Source/WebCore/ChangeLog 2014-01-27 10:46:31 UTC (rev 162832)
+++ trunk/Source/WebCore/ChangeLog 2014-01-27 11:13:19 UTC (rev 162833)
@@ -1,3 +1,14 @@
+2014-01-27 Csaba Osztrogonác <o...@webkit.org>
+
+ Buildfix for !ENABLE(COMPARE_AND_SWAP) platforms after r162774
+ https://bugs.webkit.org/show_bug.cgi?id=127678
+
+ Reviewed by Zoltan Herczeg.
+
+ * platform/text/TextBreakIterator.cpp:
+ (WebCore::compareAndSwapNonSharedCharacterBreakIterator):
+ Use std::mutex instead of Mutex and std::lock_guard instead of MutexLocker.
+
2014-01-26 Tim Horton <timothy_hor...@apple.com>
Fix the iOS build (failed to correctly revert some broken changes in the last patch).
Modified: trunk/Source/WebCore/platform/text/TextBreakIterator.cpp (162832 => 162833)
--- trunk/Source/WebCore/platform/text/TextBreakIterator.cpp 2014-01-27 10:46:31 UTC (rev 162832)
+++ trunk/Source/WebCore/platform/text/TextBreakIterator.cpp 2014-01-27 11:13:19 UTC (rev 162833)
@@ -25,6 +25,7 @@
#include "LineBreakIteratorPoolICU.h"
#include "UTextProviderLatin1.h"
#include "UTextProviderUTF16.h"
+#include <mutex>
#include <wtf/Atomics.h>
#include <wtf/text/StringView.h>
#include <wtf/text/WTFString.h>
@@ -276,8 +277,8 @@
#if ENABLE(COMPARE_AND_SWAP)
return WTF::weakCompareAndSwap(reinterpret_cast<void**>(&nonSharedCharacterBreakIterator), expected, newValue);
#else
- DEFINE_STATIC_LOCAL(Mutex, nonSharedCharacterBreakIteratorMutex, ());
- MutexLocker locker(nonSharedCharacterBreakIteratorMutex);
+ DEFINE_STATIC_LOCAL(std::mutex, nonSharedCharacterBreakIteratorMutex, ());
+ std::lock_guard<std::mutex> locker(nonSharedCharacterBreakIteratorMutex);
if (nonSharedCharacterBreakIterator != expected)
return false;
nonSharedCharacterBreakIterator = newValue;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
