Title: [161886] trunk/Source/WTF
- Revision
- 161886
- Author
- [email protected]
- Date
- 2014-01-13 09:46:17 -0800 (Mon, 13 Jan 2014)
Log Message
Move another deprecated symbol to DeprecatedSymbolsUsedBySafari.mm
https://bugs.webkit.org/show_bug.cgi?id=126909
Reviewed by Ryosuke Niwa.
* wtf/MainThread.cpp:
* wtf/MainThread.h:
* wtf/mac/DeprecatedSymbolsUsedBySafari.mm:
(WTF::callOnMainThread):
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (161885 => 161886)
--- trunk/Source/WTF/ChangeLog 2014-01-13 17:34:47 UTC (rev 161885)
+++ trunk/Source/WTF/ChangeLog 2014-01-13 17:46:17 UTC (rev 161886)
@@ -1,5 +1,17 @@
2014-01-13 Anders Carlsson <[email protected]>
+ Move another deprecated symbol to DeprecatedSymbolsUsedBySafari.mm
+ https://bugs.webkit.org/show_bug.cgi?id=126909
+
+ Reviewed by Ryosuke Niwa.
+
+ * wtf/MainThread.cpp:
+ * wtf/MainThread.h:
+ * wtf/mac/DeprecatedSymbolsUsedBySafari.mm:
+ (WTF::callOnMainThread):
+
+2014-01-13 Anders Carlsson <[email protected]>
+
Fix Windows build.
* wtf/ThreadingWin.cpp:
Modified: trunk/Source/WTF/wtf/MainThread.cpp (161885 => 161886)
--- trunk/Source/WTF/wtf/MainThread.cpp 2014-01-13 17:34:47 UTC (rev 161885)
+++ trunk/Source/WTF/wtf/MainThread.cpp 2014-01-13 17:46:17 UTC (rev 161886)
@@ -241,11 +241,6 @@
callOnMainThread(callFunctionObject, std::make_unique<std::function<void ()>>(std::move(function)).release());
}
-void callOnMainThread(const Function<void ()>& function)
-{
- callOnMainThread(std::function<void ()>(function));
-}
-
void setMainThreadCallbacksPaused(bool paused)
{
ASSERT(isMainThread());
Modified: trunk/Source/WTF/wtf/MainThread.h (161885 => 161886)
--- trunk/Source/WTF/wtf/MainThread.h 2014-01-13 17:34:47 UTC (rev 161885)
+++ trunk/Source/WTF/wtf/MainThread.h 2014-01-13 17:46:17 UTC (rev 161886)
@@ -47,10 +47,6 @@
WTF_EXPORT_PRIVATE void callOnMainThread(std::function<void ()>);
-// FIXME: This symbol is used by Safari and should be removed once Safari is no longer using it.
-template<typename> class Function;
-WTF_EXPORT_PRIVATE void callOnMainThread(const Function<void ()>&);
-
WTF_EXPORT_PRIVATE void setMainThreadCallbacksPaused(bool paused);
WTF_EXPORT_PRIVATE bool isMainThread();
Modified: trunk/Source/WTF/wtf/mac/DeprecatedSymbolsUsedBySafari.mm (161885 => 161886)
--- trunk/Source/WTF/wtf/mac/DeprecatedSymbolsUsedBySafari.mm 2014-01-13 17:34:47 UTC (rev 161885)
+++ trunk/Source/WTF/wtf/mac/DeprecatedSymbolsUsedBySafari.mm 2014-01-13 17:46:17 UTC (rev 161886)
@@ -25,6 +25,8 @@
#include "config.h"
+#include "Functional.h"
+#include "MainThread.h"
#include "StdLibExtras.h"
#include <mutex>
@@ -33,9 +35,15 @@
namespace WTF {
-WTF_EXPORT void lockAtomicallyInitializedStaticMutex();
-WTF_EXPORT void unlockAtomicallyInitializedStaticMutex();
+WTF_EXPORT_PRIVATE void callOnMainThread(const Function<void ()>&);
+WTF_EXPORT_PRIVATE void lockAtomicallyInitializedStaticMutex();
+WTF_EXPORT_PRIVATE void unlockAtomicallyInitializedStaticMutex();
+void callOnMainThread(const Function<void ()>& function)
+{
+ callOnMainThread(std::function<void ()>(function));
+}
+
static std::mutex& atomicallyInitializedStaticMutex()
{
static std::once_flag onceFlag;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
