Title: [189713] releases/WebKitGTK/webkit-2.10/Source/WebKit2
- Revision
- 189713
- Author
- carlo...@webkit.org
- Date
- 2015-09-14 05:28:32 -0700 (Mon, 14 Sep 2015)
Log Message
Merge r189010 - [ThreadedCompositor] Use WTF::Condition together with WTF::Lock
https://bugs.webkit.org/show_bug.cgi?id=148493
Patch by Emanuele Aina <emanuele.a...@collabora.com> on 2015-08-26
Reviewed by Gyuyoung Kim.
* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
Replace ThreadCondition::signal() calls with Condition::notifyOne().
* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h:
Replace ThreadCondition usage with Condition.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog (189712 => 189713)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog 2015-09-14 12:27:53 UTC (rev 189712)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog 2015-09-14 12:28:32 UTC (rev 189713)
@@ -1,3 +1,15 @@
+2015-08-26 Emanuele Aina <emanuele.a...@collabora.com>
+
+ [ThreadedCompositor] Use WTF::Condition together with WTF::Lock
+ https://bugs.webkit.org/show_bug.cgi?id=148493
+
+ Reviewed by Gyuyoung Kim.
+
+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
+ Replace ThreadCondition::signal() calls with Condition::notifyOne().
+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h:
+ Replace ThreadCondition usage with Condition.
+
2015-08-22 Antti Koivisto <an...@apple.com>
Decode data URLs in web process
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp (189712 => 189713)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp 2015-09-14 12:27:53 UTC (rev 189712)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp 2015-09-14 12:28:32 UTC (rev 189713)
@@ -312,7 +312,7 @@
m_scene = adoptRef(new CoordinatedGraphicsScene(this));
m_viewportController = std::make_unique<SimpleViewportController>(this);
- m_initializeRunLoopCondition.signal();
+ m_initializeRunLoopCondition.notifyOne();
}
m_compositingRunLoop->runLoop().run();
@@ -324,7 +324,7 @@
LockHolder locker(m_terminateRunLoopConditionMutex);
m_compositingRunLoop = nullptr;
m_context = nullptr;
- m_terminateRunLoopCondition.signal();
+ m_terminateRunLoopCondition.notifyOne();
}
detachThread(m_threadIdentifier);
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h (189712 => 189713)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h 2015-09-14 12:27:53 UTC (rev 189712)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h 2015-09-14 12:28:32 UTC (rev 189713)
@@ -33,6 +33,7 @@
#include <WebCore/GLContext.h>
#include <WebCore/IntSize.h>
#include <WebCore/TransformationMatrix.h>
+#include <wtf/Condition.h>
#include <wtf/FastMalloc.h>
#include <wtf/Noncopyable.h>
#include <wtf/ThreadSafeRefCounted.h>
@@ -110,9 +111,9 @@
std::unique_ptr<CompositingRunLoop> m_compositingRunLoop;
ThreadIdentifier m_threadIdentifier;
- ThreadCondition m_initializeRunLoopCondition;
+ Condition m_initializeRunLoopCondition;
Lock m_initializeRunLoopConditionMutex;
- ThreadCondition m_terminateRunLoopCondition;
+ Condition m_terminateRunLoopCondition;
Lock m_terminateRunLoopConditionMutex;
};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
