Title: [159195] branches/safari-537.73-branch/Source/WebCore
- Revision
- 159195
- Author
- [email protected]
- Date
- 2013-11-13 08:06:53 -0800 (Wed, 13 Nov 2013)
Log Message
<rdar://problem/15292359>
Fix incorrect merge of r157299 made in r158605.
* platform/graphics/DisplayRefreshMonitor.cpp:
(WebCore::DisplayRefreshMonitor::removeClient): Remember to remove clients
from m_clientsToBeNotified.
* platform/graphics/DisplayRefreshMonitor.h: Might as well make the code
more consistent with ToT while I'm here.
Modified Paths
Diff
Modified: branches/safari-537.73-branch/Source/WebCore/ChangeLog (159194 => 159195)
--- branches/safari-537.73-branch/Source/WebCore/ChangeLog 2013-11-13 15:34:58 UTC (rev 159194)
+++ branches/safari-537.73-branch/Source/WebCore/ChangeLog 2013-11-13 16:06:53 UTC (rev 159195)
@@ -1,3 +1,14 @@
+2013-11-13 Dean Jackson <[email protected]>
+
+ <rdar://problem/15292359>
+ Fix incorrect merge of r157299 made in r158605.
+
+ * platform/graphics/DisplayRefreshMonitor.cpp:
+ (WebCore::DisplayRefreshMonitor::removeClient): Remember to remove clients
+ from m_clientsToBeNotified.
+ * platform/graphics/DisplayRefreshMonitor.h: Might as well make the code
+ more consistent with ToT while I'm here.
+
2013-11-08 Lucas Forschler <[email protected]>
Merge r152867
Modified: branches/safari-537.73-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp (159194 => 159195)
--- branches/safari-537.73-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp 2013-11-13 15:34:58 UTC (rev 159194)
+++ branches/safari-537.73-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp 2013-11-13 16:06:53 UTC (rev 159195)
@@ -81,8 +81,10 @@
bool DisplayRefreshMonitor::removeClient(DisplayRefreshMonitorClient* client)
{
- DisplayRefreshMonitorClientSet::iterator it = m_clients.find(client);
+ HashSet<DisplayRefreshMonitorClient*>::iterator it = m_clients.find(client);
if (it != m_clients.end()) {
+ if (m_clientsToBeNotified)
+ m_clientsToBeNotified->remove(client);
m_clients.remove(it);
return true;
}
Modified: branches/safari-537.73-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitor.h (159194 => 159195)
--- branches/safari-537.73-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitor.h 2013-11-13 15:34:58 UTC (rev 159194)
+++ branches/safari-537.73-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitor.h 2013-11-13 16:06:53 UTC (rev 159195)
@@ -119,9 +119,8 @@
PlatformDisplayID m_displayID;
Mutex m_mutex;
- typedef HashSet<DisplayRefreshMonitorClient*> DisplayRefreshMonitorClientSet;
- DisplayRefreshMonitorClientSet m_clients;
- DisplayRefreshMonitorClientSet* m_clientsToBeNotified;
+ HashSet<DisplayRefreshMonitorClient*> m_clients;
+ HashSet<DisplayRefreshMonitorClient*>* m_clientsToBeNotified;
#if PLATFORM(BLACKBERRY)
public:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
