<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[202611] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/202611">202611</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-28 21:49:27 -0700 (Tue, 28 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/202580">r202580</a>.
https://bugs.webkit.org/show_bug.cgi?id=159245
Caused all WKTR tests to fail on GuardMalloc and Production
only for unknown reasons, investigating offline. (Requested by
brrian on #webkit).
Reverted changeset:
"RunLoop::Timer should use constructor templates instead of
class templates"
https://bugs.webkit.org/show_bug.cgi?id=159153
http://trac.webkit.org/changeset/202580</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorHeapAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfRunLooph">trunk/Source/WTF/wtf/RunLoop.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasessionWebMediaSessionManagercpp">trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasessionWebMediaSessionManagerh">trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h</a></li>
<li><a href="#trunkSourceWebCorepageWheelEventTestTriggercpp">trunk/Source/WebCore/page/WheelEventTestTrigger.cpp</a></li>
<li><a href="#trunkSourceWebCorepageWheelEventTestTriggerh">trunk/Source/WebCore/page/WheelEventTestTrigger.h</a></li>
<li><a href="#trunkSourceWebCorepagemacTextIndicatorWindowh">trunk/Source/WebCore/page/mac/TextIndicatorWindow.h</a></li>
<li><a href="#trunkSourceWebCorepagemacTextIndicatorWindowmm">trunk/Source/WebCore/page/mac/TextIndicatorWindow.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformMainThreadSharedTimerh">trunk/Source/WebCore/platform/MainThreadSharedTimer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaScrollControllerh">trunk/Source/WebCore/platform/cocoa/ScrollController.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaScrollControllermm">trunk/Source/WebCore/platform/cocoa/ScrollController.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformglibMainThreadSharedTimerGLibcpp">trunk/Source/WebCore/platform/glib/MainThreadSharedTimerGLib.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlaybackTargetPickercpp">trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlaybackTargetPickerh">trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBaseh">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerVideoSinkGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperPlatformLayerProxycpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperPlatformLayerProxyh">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMediaPlaybackTargetPickerMockcpp">trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMediaPlaybackTargetPickerMockh">trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMockRealtimeVideoSourcecpp">trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMockRealtimeVideoSourceh">trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleInternalh">trunk/Source/WebCore/platform/network/ResourceHandleInternal.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadssoupDownloadSoupcpp">trunk/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCmacConnectionMacmm">trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessPluginControllerProxycpp">trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessPluginControllerProxyh">trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessPluginProcesscpp">trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessPluginProcessh">trunk/Source/WebKit2/PluginProcess/PluginProcess.h</a></li>
<li><a href="#trunkSourceWebKit2SharedChildProcesscpp">trunk/Source/WebKit2/Shared/ChildProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedChildProcessh">trunk/Source/WebKit2/Shared/ChildProcess.h</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorCompositingRunLooph">trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaAPISerializedScriptValueCocoamm">trunk/Source/WebKit2/UIProcess/API/Cocoa/APISerializedScriptValueCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxycpp">trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxyh">trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxyImplcpp">trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxyImplh">trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsgtkPluginInfoCachecpp">trunk/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsgtkPluginInfoCacheh">trunk/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessProcessThrottlercpp">trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessProcessThrottlerh">trunk/Source/WebKit2/UIProcess/ProcessThrottler.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessResponsivenessTimercpp">trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessResponsivenessTimerh">trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessViewGestureControllercpp">trunk/Source/WebKit2/UIProcess/ViewGestureController.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessVisitedLinkStorecpp">trunk/Source/WebKit2/UIProcess/VisitedLinkStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessVisitedLinkStoreh">trunk/Source/WebKit2/UIProcess/VisitedLinkStore.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebInspectorProxycpp">trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebInspectorProxyh">trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolh">trunk/Source/WebKit2/UIProcess/WebProcessPool.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkGestureControllercpp">trunk/Source/WebKit2/UIProcess/gtk/GestureController.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkGestureControllerh">trunk/Source/WebKit2/UIProcess/gtk/GestureController.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebPopupMenuProxyGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebPopupMenuProxyGtkh">trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacViewGestureControllerh">trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebLoaderStrategycpp">trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebLoaderStrategyh">trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNPRuntimeObjectMapcpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNPRuntimeObjectMaph">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePlugincpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePluginh">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePluginStreamcpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePluginStreamh">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewcpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewh">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedDrawingAreacpp">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsThreadedCoordinatedLayerTreeHostcpp">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsThreadedCoordinatedLayerTreeHosth">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreaImplcpp">trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreaImplh">trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkcpp">trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkh">trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFRunLoopcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/RunLoop.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleTestRunnercpp">trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleTestRunnerh">trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-06-28 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r202580.
+ https://bugs.webkit.org/show_bug.cgi?id=159245
+
+ Caused all WKTR tests to fail on GuardMalloc and Production
+ only for unknown reasons, investigating offline. (Requested by
+ brrian on #webkit).
+
+ Reverted changeset:
+
+ "RunLoop::Timer should use constructor templates instead of
+ class templates"
+ https://bugs.webkit.org/show_bug.cgi?id=159153
+ http://trac.webkit.org/changeset/202580
+
</ins><span class="cx"> 2016-06-28 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> We should not crash there is a finally inside a for-in loop
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorHeapAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -55,13 +55,13 @@
</span><span class="cx">
</span><span class="cx"> HeapFrontendDispatcher& m_frontendDispatcher;
</span><span class="cx"> Vector<GarbageCollectionData> m_collections;
</span><del>- RunLoop::Timer m_timer;
</del><ins>+ RunLoop::Timer<SendGarbageCollectionEventsTask> m_timer;
</ins><span class="cx"> Lock m_mutex;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> SendGarbageCollectionEventsTask::SendGarbageCollectionEventsTask(HeapFrontendDispatcher& frontendDispatcher)
</span><span class="cx"> : m_frontendDispatcher(frontendDispatcher)
</span><del>- , m_timer(RunLoop::current(), *this, &SendGarbageCollectionEventsTask::timerFired)
</del><ins>+ , m_timer(RunLoop::current(), this, &SendGarbageCollectionEventsTask::timerFired)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WTF/ChangeLog 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-06-28 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r202580.
+ https://bugs.webkit.org/show_bug.cgi?id=159245
+
+ Caused all WKTR tests to fail on GuardMalloc and Production
+ only for unknown reasons, investigating offline. (Requested by
+ brrian on #webkit).
+
+ Reverted changeset:
+
+ "RunLoop::Timer should use constructor templates instead of
+ class templates"
+ https://bugs.webkit.org/show_bug.cgi?id=159153
+ http://trac.webkit.org/changeset/202580
+
</ins><span class="cx"> 2016-06-28 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> RunLoop::Timer should use constructor templates instead of class templates
</span></span></pre></div>
<a id="trunkSourceWTFwtfRunLooph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RunLoop.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RunLoop.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WTF/wtf/RunLoop.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010, 2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
</span><span class="cx"> * Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="lines">@@ -128,25 +128,23 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ template <typename TimerFiredClass>
</ins><span class="cx"> class Timer : public TimerBase {
</span><span class="cx"> public:
</span><del>- template <typename TimerFiredClass, typename TimerFiredBaseClass>
- Timer(RunLoop& runLoop, TimerFiredClass& object, void (TimerFiredBaseClass::*function)())
- : TimerBase(runLoop)
- , m_function(std::bind(function, &object))
- {
- }
</del><ins>+ typedef void (TimerFiredClass::*TimerFiredFunction)();
</ins><span class="cx">
</span><del>- Timer(RunLoop& runLoop, std::function<void ()> function)
</del><ins>+ Timer(RunLoop& runLoop, TimerFiredClass* o, TimerFiredFunction f)
</ins><span class="cx"> : TimerBase(runLoop)
</span><del>- , m_function(WTFMove(function))
</del><ins>+ , m_object(o)
+ , m_function(f)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual void fired() { m_function(); }
</del><ins>+ virtual void fired() { (m_object->*m_function)(); }
</ins><span class="cx">
</span><del>- std::function<void ()> m_function;
</del><ins>+ TimerFiredClass* m_object;
+ TimerFiredFunction m_function;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class Holder;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebCore/ChangeLog 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-06-28 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r202580.
+ https://bugs.webkit.org/show_bug.cgi?id=159245
+
+ Caused all WKTR tests to fail on GuardMalloc and Production
+ only for unknown reasons, investigating offline. (Requested by
+ brrian on #webkit).
+
+ Reverted changeset:
+
+ "RunLoop::Timer should use constructor templates instead of
+ class templates"
+ https://bugs.webkit.org/show_bug.cgi?id=159153
+ http://trac.webkit.org/changeset/202580
+
</ins><span class="cx"> 2016-06-28 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> Rename ChildrenAffectedByActive to StyleAffectedByActive
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionWebMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -127,8 +127,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebMediaSessionManager::WebMediaSessionManager()
</span><del>- : m_taskTimer(RunLoop::current(), *this, &WebMediaSessionManager::taskTimerFired)
- , m_watchdogTimer(RunLoop::current(), *this, &WebMediaSessionManager::watchdogTimerFired)
</del><ins>+ : m_taskTimer(RunLoop::current(), this, &WebMediaSessionManager::taskTimerFired)
+ , m_watchdogTimer(RunLoop::current(), this, &WebMediaSessionManager::watchdogTimerFired)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionWebMediaSessionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -96,8 +96,8 @@
</span><span class="cx">
</span><span class="cx"> void watchdogTimerFired();
</span><span class="cx">
</span><del>- RunLoop::Timer m_taskTimer;
- RunLoop::Timer m_watchdogTimer;
</del><ins>+ RunLoop::Timer<WebMediaSessionManager> m_taskTimer;
+ RunLoop::Timer<WebMediaSessionManager> m_watchdogTimer;
</ins><span class="cx">
</span><span class="cx"> Vector<std::unique_ptr<ClientState>> m_clientState;
</span><span class="cx"> RefPtr<MediaPlaybackTarget> m_playbackTarget;
</span></span></pre></div>
<a id="trunkSourceWebCorepageWheelEventTestTriggercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/WheelEventTestTrigger.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/WheelEventTestTrigger.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebCore/page/WheelEventTestTrigger.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> WheelEventTestTrigger::WheelEventTestTrigger()
</span><del>- : m_testTriggerTimer(RunLoop::current(), *this, &WheelEventTestTrigger::triggerTestTimerFired)
</del><ins>+ : m_testTriggerTimer(RunLoop::current(), this, &WheelEventTestTrigger::triggerTestTimerFired)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageWheelEventTestTriggerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/WheelEventTestTrigger.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/WheelEventTestTrigger.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebCore/page/WheelEventTestTrigger.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> std::function<void()> m_testNotificationCallback;
</span><del>- RunLoop::Timer m_testTriggerTimer;
</del><ins>+ RunLoop::Timer<WheelEventTestTrigger> m_testTriggerTimer;
</ins><span class="cx"> mutable Lock m_testTriggerMutex;
</span><span class="cx"> WTF::HashMap<ScrollableAreaIdentifier, std::set<DeferTestTriggerReason>> m_deferTestTriggerReasons;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacTextIndicatorWindowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/TextIndicatorWindow.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/TextIndicatorWindow.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebCore/page/mac/TextIndicatorWindow.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> RetainPtr<NSWindow> m_textIndicatorWindow;
</span><span class="cx"> RetainPtr<WebTextIndicatorView> m_textIndicatorView;
</span><span class="cx">
</span><del>- RunLoop::Timer m_temporaryTextIndicatorTimer;
</del><ins>+ RunLoop::Timer<TextIndicatorWindow> m_temporaryTextIndicatorTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacTextIndicatorWindowmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/TextIndicatorWindow.mm (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/TextIndicatorWindow.mm 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebCore/page/mac/TextIndicatorWindow.mm 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -404,7 +404,7 @@
</span><span class="cx">
</span><span class="cx"> TextIndicatorWindow::TextIndicatorWindow(NSView *targetView)
</span><span class="cx"> : m_targetView(targetView)
</span><del>- , m_temporaryTextIndicatorTimer(RunLoop::main(), *this, &TextIndicatorWindow::startFadeOut)
</del><ins>+ , m_temporaryTextIndicatorTimer(RunLoop::main(), this, &TextIndicatorWindow::startFadeOut)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMainThreadSharedTimerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MainThreadSharedTimer.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MainThreadSharedTimer.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebCore/platform/MainThreadSharedTimer.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx">
</span><span class="cx"> std::function<void()> m_firedFunction;
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>- RunLoop::Timer m_timer;
</del><ins>+ RunLoop::Timer<MainThreadSharedTimer> m_timer;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaScrollControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/ScrollController.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/ScrollController.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebCore/platform/cocoa/ScrollController.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> CFTimeInterval m_startTime { 0 };
</span><span class="cx"> FloatSize m_startStretch;
</span><span class="cx"> FloatSize m_origVelocity;
</span><del>- RunLoop::Timer m_snapRubberbandTimer;
</del><ins>+ RunLoop::Timer<ScrollController> m_snapRubberbandTimer;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> std::unique_ptr<ScrollSnapAnimatorState> m_verticalScrollSnapState;
</span><span class="cx"> std::unique_ptr<ScrollSnapAnimationCurveState> m_scrollSnapCurveState;
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- RunLoop::Timer m_scrollSnapTimer;
</del><ins>+ RunLoop::Timer<ScrollController> m_scrollSnapTimer;
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaScrollControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/ScrollController.mm (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/ScrollController.mm 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebCore/platform/cocoa/ScrollController.mm 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -121,10 +121,10 @@
</span><span class="cx"> ScrollController::ScrollController(ScrollControllerClient& client)
</span><span class="cx"> : m_client(client)
</span><span class="cx"> #if ENABLE(RUBBER_BANDING)
</span><del>- , m_snapRubberbandTimer(RunLoop::current(), *this, &ScrollController::snapRubberBandTimerFired)
</del><ins>+ , m_snapRubberbandTimer(RunLoop::current(), this, &ScrollController::snapRubberBandTimerFired)
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP) && PLATFORM(MAC)
</span><del>- , m_scrollSnapTimer(RunLoop::current(), *this, &ScrollController::scrollSnapTimerFired)
</del><ins>+ , m_scrollSnapTimer(RunLoop::current(), this, &ScrollController::scrollSnapTimerFired)
</ins><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformglibMainThreadSharedTimerGLibcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/glib/MainThreadSharedTimerGLib.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/glib/MainThreadSharedTimerGLib.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebCore/platform/glib/MainThreadSharedTimerGLib.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> MainThreadSharedTimer::MainThreadSharedTimer()
</span><del>- : m_timer(RunLoop::main(), *this, &MainThreadSharedTimer::fired)
</del><ins>+ : m_timer(RunLoop::main(), this, &MainThreadSharedTimer::fired)
</ins><span class="cx"> {
</span><span class="cx"> // This is GDK_PRIORITY_REDRAW, but we don't want to depend on GDK here just to use a constant.
</span><span class="cx"> m_timer.setPriority(G_PRIORITY_HIGH_IDLE + 20);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlaybackTargetPickercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> MediaPlaybackTargetPicker::MediaPlaybackTargetPicker(Client& client)
</span><span class="cx"> : m_client(&client)
</span><del>- , m_pendingActionTimer(RunLoop::main(), *this, &MediaPlaybackTargetPicker::pendingActionTimerFired)
</del><ins>+ , m_pendingActionTimer(RunLoop::main(), this, &MediaPlaybackTargetPicker::pendingActionTimerFired)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlaybackTargetPickerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx">
</span><span class="cx"> PendingActionFlags m_pendingActionFlags { 0 };
</span><span class="cx"> Client* m_client;
</span><del>- RunLoop::Timer m_pendingActionTimer;
</del><ins>+ RunLoop::Timer<MediaPlaybackTargetPicker> m_pendingActionTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> , m_volumeAndMuteInitialized(false)
</span><span class="cx"> , m_hasVideo(false)
</span><span class="cx"> , m_hasAudio(false)
</span><del>- , m_readyTimerHandler(RunLoop::main(), *this, &MediaPlayerPrivateGStreamer::readyTimerFired)
</del><ins>+ , m_readyTimerHandler(RunLoop::main(), this, &MediaPlayerPrivateGStreamer::readyTimerFired)
</ins><span class="cx"> , m_totalBytes(0)
</span><span class="cx"> , m_preservesPitch(false)
</span><span class="cx"> #if ENABLE(WEB_AUDIO)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> bool m_volumeAndMuteInitialized;
</span><span class="cx"> bool m_hasVideo;
</span><span class="cx"> bool m_hasAudio;
</span><del>- RunLoop::Timer m_readyTimerHandler;
</del><ins>+ RunLoop::Timer<MediaPlayerPrivateGStreamer> m_readyTimerHandler;
</ins><span class="cx"> mutable unsigned long long m_totalBytes;
</span><span class="cx"> URL m_url;
</span><span class="cx"> bool m_preservesPitch;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> , m_readyState(MediaPlayer::HaveNothing)
</span><span class="cx"> , m_networkState(MediaPlayer::Empty)
</span><span class="cx"> #if USE(GSTREAMER_GL)
</span><del>- , m_drawTimer(RunLoop::main(), *this, &MediaPlayerPrivateGStreamerBase::repaint)
</del><ins>+ , m_drawTimer(RunLoop::main(), this, &MediaPlayerPrivateGStreamerBase::repaint)
</ins><span class="cx"> #endif
</span><span class="cx"> , m_usingFallbackVideoSink(false)
</span><span class="cx"> , m_videoSourceRotation(NoVideoSourceRotation)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> mutable GMutex m_sampleMutex;
</span><span class="cx"> GRefPtr<GstSample> m_sample;
</span><span class="cx"> #if USE(GSTREAMER_GL)
</span><del>- RunLoop::Timer m_drawTimer;
</del><ins>+ RunLoop::Timer<MediaPlayerPrivateGStreamerBase> m_drawTimer;
</ins><span class="cx"> #endif
</span><span class="cx"> mutable FloatSize m_videoSize;
</span><span class="cx"> bool m_usingFallbackVideoSink;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerVideoSinkGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> public:
</span><span class="cx"> VideoRenderRequestScheduler()
</span><span class="cx"> #if !USE(COORDINATED_GRAPHICS_THREADED)
</span><del>- : m_timer(RunLoop::main(), *this, &VideoRenderRequestScheduler::render)
</del><ins>+ : m_timer(RunLoop::main(), this, &VideoRenderRequestScheduler::render)
</ins><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(GTK) && !USE(COORDINATED_GRAPHICS_THREADED)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> GRefPtr<GstSample> m_sample;
</span><span class="cx">
</span><span class="cx"> #if !USE(COORDINATED_GRAPHICS_THREADED)
</span><del>- RunLoop::Timer m_timer;
</del><ins>+ RunLoop::Timer<VideoRenderRequestScheduler> m_timer;
</ins><span class="cx"> Condition m_dataCondition;
</span><span class="cx"> GRefPtr<WebKitVideoSink> m_sink;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperPlatformLayerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> TextureMapperPlatformLayerProxy::TextureMapperPlatformLayerProxy()
</span><span class="cx"> : m_compositor(nullptr)
</span><span class="cx"> , m_targetLayer(nullptr)
</span><del>- , m_releaseUnusedBuffersTimer(RunLoop::current(), *this, &TextureMapperPlatformLayerProxy::releaseUnusedBuffersTimerFired)
</del><ins>+ , m_releaseUnusedBuffersTimer(RunLoop::current(), this, &TextureMapperPlatformLayerProxy::releaseUnusedBuffersTimerFired)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> if (m_targetLayer && m_currentBuffer)
</span><span class="cx"> m_targetLayer->setContentsLayer(m_currentBuffer.get());
</span><span class="cx">
</span><del>- m_compositorThreadUpdateTimer = std::make_unique<RunLoop::Timer>(RunLoop::current(), *this, &TextureMapperPlatformLayerProxy::compositorThreadUpdateTimerFired);
</del><ins>+ m_compositorThreadUpdateTimer = std::make_unique<RunLoop::Timer<TextureMapperPlatformLayerProxy>>(RunLoop::current(), this, &TextureMapperPlatformLayerProxy::compositorThreadUpdateTimerFired);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextureMapperPlatformLayerProxy::invalidate()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperPlatformLayerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -93,13 +93,13 @@
</span><span class="cx">
</span><span class="cx"> Vector<std::unique_ptr<TextureMapperPlatformLayerBuffer>> m_usedBuffers;
</span><span class="cx">
</span><del>- RunLoop::Timer m_releaseUnusedBuffersTimer;
</del><ins>+ RunLoop::Timer<TextureMapperPlatformLayerProxy> m_releaseUnusedBuffersTimer;
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> ThreadIdentifier m_compositorThreadID { 0 };
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void compositorThreadUpdateTimerFired();
</span><del>- std::unique_ptr<RunLoop::Timer> m_compositorThreadUpdateTimer;
</del><ins>+ std::unique_ptr<RunLoop::Timer<TextureMapperPlatformLayerProxy>> m_compositorThreadUpdateTimer;
</ins><span class="cx"> std::function<void()> m_compositorThreadUpdateFunction;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMediaPlaybackTargetPickerMockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> MediaPlaybackTargetPickerMock::MediaPlaybackTargetPickerMock(MediaPlaybackTargetPicker::Client& client)
</span><span class="cx"> : MediaPlaybackTargetPicker(client)
</span><del>- , m_timer(RunLoop::main(), *this, &MediaPlaybackTargetPickerMock::timerFired)
</del><ins>+ , m_timer(RunLoop::main(), this, &MediaPlaybackTargetPickerMock::timerFired)
</ins><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaPlaybackTargetPickerMock::MediaPlaybackTargetPickerMock");
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMediaPlaybackTargetPickerMockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> void timerFired();
</span><span class="cx">
</span><span class="cx"> String m_deviceName;
</span><del>- RunLoop::Timer m_timer;
</del><ins>+ RunLoop::Timer<MediaPlaybackTargetPickerMock> m_timer;
</ins><span class="cx"> MediaPlaybackTargetContext::State m_state { MediaPlaybackTargetContext::Unknown };
</span><span class="cx"> bool m_showingMenu { false };
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMockRealtimeVideoSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> MockRealtimeVideoSource::MockRealtimeVideoSource(const String& name)
</span><span class="cx"> : MockRealtimeMediaSource(createCanonicalUUIDString(), RealtimeMediaSource::Video, name)
</span><del>- , m_timer(RunLoop::current(), *this, &MockRealtimeVideoSource::generateFrame)
</del><ins>+ , m_timer(RunLoop::current(), this, &MockRealtimeVideoSource::generateFrame)
</ins><span class="cx"> {
</span><span class="cx"> m_dashWidths.reserveInitialCapacity(2);
</span><span class="cx"> m_dashWidths.uncheckedAppend(6);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMockRealtimeVideoSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> unsigned m_frameRate { 30 };
</span><span class="cx"> unsigned m_frameNumber { 0 };
</span><span class="cx">
</span><del>- RunLoop::Timer m_timer;
</del><ins>+ RunLoop::Timer<MockRealtimeVideoSource> m_timer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandleInternal.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if USE(SOUP)
</span><span class="cx"> , m_cancelled(false)
</span><del>- , m_timeoutSource(RunLoop::main(), *loader, &ResourceHandle::timeoutFired)
</del><ins>+ , m_timeoutSource(RunLoop::main(), loader, &ResourceHandle::timeoutFired)
</ins><span class="cx"> , m_bodySize(0)
</span><span class="cx"> , m_bodyDataSent(0)
</span><span class="cx"> , m_redirectCount(0)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> GRefPtr<SoupMultipartInputStream> m_multipartInputStream;
</span><span class="cx"> GRefPtr<GCancellable> m_cancellable;
</span><span class="cx"> GRefPtr<GAsyncResult> m_deferredResult;
</span><del>- RunLoop::Timer m_timeoutSource;
</del><ins>+ RunLoop::Timer<ResourceHandle> m_timeoutSource;
</ins><span class="cx"> GUniquePtr<SoupBuffer> m_soupBuffer;
</span><span class="cx"> unsigned long m_bodySize;
</span><span class="cx"> unsigned long m_bodyDataSent;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2016-06-28 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><ins>+ Unreviewed, rolling out r202580.
+ https://bugs.webkit.org/show_bug.cgi?id=159245
+
+ Caused all WKTR tests to fail on GuardMalloc and Production
+ only for unknown reasons, investigating offline. (Requested by
+ brrian on #webkit).
+
+ Reverted changeset:
+
+ "RunLoop::Timer should use constructor templates instead of
+ class templates"
+ https://bugs.webkit.org/show_bug.cgi?id=159153
+ http://trac.webkit.org/changeset/202580
+
+2016-06-28 Commit Queue <commit-queue@webkit.org>
+
</ins><span class="cx"> Unreviewed, rolling out r202598.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=159244
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadssoupDownloadSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoup.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoup.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoup.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> public:
</span><span class="cx"> DownloadClient(Download& download)
</span><span class="cx"> : m_download(download)
</span><del>- , m_handleResponseLater(RunLoop::main(), *this, &DownloadClient::handleResponse)
</del><ins>+ , m_handleResponseLater(RunLoop::main(), this, &DownloadClient::handleResponse)
</ins><span class="cx"> , m_allowOverwrite(false)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> GRefPtr<GFile> m_destinationFile;
</span><span class="cx"> GRefPtr<GFile> m_intermediateFile;
</span><span class="cx"> ResourceResponse m_delayedResponse;
</span><del>- RunLoop::Timer m_handleResponseLater;
</del><ins>+ RunLoop::Timer<DownloadClient> m_handleResponseLater;
</ins><span class="cx"> bool m_allowOverwrite;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCmacConnectionMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> private:
</span><span class="cx"> ConnectionTerminationWatchdog(OSObjectPtr<xpc_connection_t>& xpcConnection, double intervalInSeconds)
</span><span class="cx"> : m_xpcConnection(xpcConnection)
</span><del>- , m_watchdogTimer(RunLoop::main(), *this, &ConnectionTerminationWatchdog::watchdogTimerFired)
</del><ins>+ , m_watchdogTimer(RunLoop::main(), this, &ConnectionTerminationWatchdog::watchdogTimerFired)
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> , m_assertion(std::make_unique<WebKit::ProcessAndUIAssertion>(xpc_connection_get_pid(m_xpcConnection.get()), WebKit::AssertionState::Background))
</span><span class="cx"> #endif
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> OSObjectPtr<xpc_connection_t> m_xpcConnection;
</span><del>- RunLoop::Timer m_watchdogTimer;
</del><ins>+ RunLoop::Timer<ConnectionTerminationWatchdog> m_watchdogTimer;
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> std::unique_ptr<WebKit::ProcessAndUIAssertion> m_assertion;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginControllerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -65,9 +65,9 @@
</span><span class="cx"> , m_isInitializing(false)
</span><span class="cx"> , m_isVisible(false)
</span><span class="cx"> , m_isWindowVisible(false)
</span><del>- , m_paintTimer(RunLoop::main(), *this, &PluginControllerProxy::paint)
</del><ins>+ , m_paintTimer(RunLoop::main(), this, &PluginControllerProxy::paint)
</ins><span class="cx"> , m_pluginDestructionProtectCount(0)
</span><del>- , m_pluginDestroyTimer(RunLoop::main(), *this, &PluginControllerProxy::destroy)
</del><ins>+ , m_pluginDestroyTimer(RunLoop::main(), this, &PluginControllerProxy::destroy)
</ins><span class="cx"> , m_waitingForDidUpdate(false)
</span><span class="cx"> , m_pluginCanceledManualStreamLoad(false)
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginControllerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> WebCore::IntRect m_dirtyRect;
</span><span class="cx">
</span><span class="cx"> // The paint timer, used for coalescing painting.
</span><del>- RunLoop::Timer m_paintTimer;
</del><ins>+ RunLoop::Timer<PluginControllerProxy> m_paintTimer;
</ins><span class="cx">
</span><span class="cx"> // A counter used to prevent the plug-in from being destroyed.
</span><span class="cx"> unsigned m_pluginDestructionProtectCount;
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx">
</span><span class="cx"> // A timer that we use to prevent destruction of the plug-in while plug-in
</span><span class="cx"> // code is on the stack.
</span><del>- RunLoop::Timer m_pluginDestroyTimer;
</del><ins>+ RunLoop::Timer<PluginControllerProxy> m_pluginDestroyTimer;
</ins><span class="cx">
</span><span class="cx"> // Whether we're waiting for the plug-in proxy in the web process to draw the contents of its
</span><span class="cx"> // backing store into the web process backing store.
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> PluginProcess::PluginProcess()
</span><span class="cx"> : m_supportsAsynchronousPluginInitialization(false)
</span><del>- , m_minimumLifetimeTimer(RunLoop::main(), *this, &PluginProcess::minimumLifetimeTimerFired)
</del><ins>+ , m_minimumLifetimeTimer(RunLoop::main(), this, &PluginProcess::minimumLifetimeTimerFired)
</ins><span class="cx"> , m_connectionActivity("PluginProcess connection activity.")
</span><span class="cx"> {
</span><span class="cx"> NetscapePlugin::setSetExceptionFunction(WebProcessConnection::setGlobalException);
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginProcess.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx">
</span><span class="cx"> bool m_supportsAsynchronousPluginInitialization;
</span><span class="cx">
</span><del>- RunLoop::Timer m_minimumLifetimeTimer;
</del><ins>+ RunLoop::Timer<PluginProcess> m_minimumLifetimeTimer;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> // The Mach port used for accelerated compositing.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedChildProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ChildProcess.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ChildProcess.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/Shared/ChildProcess.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> ChildProcess::ChildProcess()
</span><span class="cx"> : m_terminationTimeout(0)
</span><span class="cx"> , m_terminationCounter(0)
</span><del>- , m_terminationTimer(RunLoop::main(), *this, &ChildProcess::terminationTimerFired)
</del><ins>+ , m_terminationTimer(RunLoop::main(), this, &ChildProcess::terminationTimerFired)
</ins><span class="cx"> , m_processSuppressionDisabled("Process Suppression Disabled by UIProcess")
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedChildProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ChildProcess.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ChildProcess.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/Shared/ChildProcess.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> // after a given period of time.
</span><span class="cx"> unsigned m_terminationCounter;
</span><span class="cx">
</span><del>- RunLoop::Timer m_terminationTimer;
</del><ins>+ RunLoop::Timer<ChildProcess> m_terminationTimer;
</ins><span class="cx">
</span><span class="cx"> RefPtr<IPC::Connection> m_connection;
</span><span class="cx"> IPC::MessageReceiverMap m_messageReceiverMap;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorCompositingRunLooph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> void updateTimerFired();
</span><span class="cx">
</span><span class="cx"> RunLoop& m_runLoop;
</span><del>- RunLoop::Timer m_updateTimer;
</del><ins>+ RunLoop::Timer<CompositingRunLoop> m_updateTimer;
</ins><span class="cx"> std::function<void ()> m_updateFunction;
</span><span class="cx"> Lock m_dispatchSyncConditionMutex;
</span><span class="cx"> Condition m_dispatchSyncCondition;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaAPISerializedScriptValueCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/APISerializedScriptValueCocoa.mm (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/APISerializedScriptValueCocoa.mm 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/APISerializedScriptValueCocoa.mm 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> class SharedJSContext {
</span><span class="cx"> public:
</span><span class="cx"> SharedJSContext()
</span><del>- : m_timer(RunLoop::main(), *this, &SharedJSContext::releaseContext)
</del><ins>+ : m_timer(RunLoop::main(), this, &SharedJSContext::releaseContext)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> RetainPtr<JSContext> m_context;
</span><del>- RunLoop::Timer m_timer;
</del><ins>+ RunLoop::Timer<SharedJSContext> m_timer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> id SerializedScriptValue::deserialize(WebCore::SerializedScriptValue& serializedScriptValue, JSValueRef* exception)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -150,9 +150,9 @@
</span><span class="cx">
</span><span class="cx"> struct _WebKitWebViewBasePrivate {
</span><span class="cx"> _WebKitWebViewBasePrivate()
</span><del>- : updateViewStateTimer(RunLoop::main(), *this, &_WebKitWebViewBasePrivate::updateViewStateTimerFired)
</del><ins>+ : updateViewStateTimer(RunLoop::main(), this, &_WebKitWebViewBasePrivate::updateViewStateTimerFired)
</ins><span class="cx"> #if USE(REDIRECTED_XCOMPOSITE_WINDOW)
</span><del>- , clearRedirectedWindowSoonTimer(RunLoop::main(), *this, &_WebKitWebViewBasePrivate::clearRedirectedWindowSoonTimerFired)
</del><ins>+ , clearRedirectedWindowSoonTimer(RunLoop::main(), this, &_WebKitWebViewBasePrivate::clearRedirectedWindowSoonTimerFired)
</ins><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> // View State.
</span><span class="cx"> ViewState::Flags viewState;
</span><span class="cx"> ViewState::Flags viewStateFlagsToUpdate;
</span><del>- RunLoop::Timer updateViewStateTimer;
</del><ins>+ RunLoop::Timer<WebKitWebViewBasePrivate> updateViewStateTimer;
</ins><span class="cx">
</span><span class="cx"> WebKitWebViewBaseDownloadRequestHandler downloadHandler;
</span><span class="cx">
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(REDIRECTED_XCOMPOSITE_WINDOW)
</span><span class="cx"> std::unique_ptr<RedirectedXCompositeWindow> redirectedWindow;
</span><del>- RunLoop::Timer clearRedirectedWindowSoonTimer;
</del><ins>+ RunLoop::Timer<WebKitWebViewBasePrivate> clearRedirectedWindowSoonTimer;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> , m_webPageProxy(webPageProxy)
</span><span class="cx"> , m_size(webPageProxy.viewSize())
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- , m_viewExposedRectChangedTimer(RunLoop::main(), *this, &DrawingAreaProxy::viewExposedRectChangedTimerFired)
</del><ins>+ , m_viewExposedRectChangedTimer(RunLoop::main(), this, &DrawingAreaProxy::viewExposedRectChangedTimerFired)
</ins><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> m_webPageProxy.process().addMessageReceiver(Messages::DrawingAreaProxy::messageReceiverName(), m_webPageProxy.pageID(), *this);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> virtual void intrinsicContentSizeDidChange(const WebCore::IntSize&) { }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- RunLoop::Timer m_viewExposedRectChangedTimer;
</del><ins>+ RunLoop::Timer<DrawingAreaProxy> m_viewExposedRectChangedTimer;
</ins><span class="cx"> Optional<WebCore::FloatRect> m_viewExposedRect;
</span><span class="cx"> Optional<WebCore::FloatRect> m_lastSentViewExposedRect;
</span><span class="cx"> #endif // PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxyImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> , m_isWaitingForDidUpdateBackingStoreState(false)
</span><span class="cx"> , m_hasReceivedFirstUpdate(false)
</span><span class="cx"> , m_isBackingStoreDiscardable(true)
</span><del>- , m_discardBackingStoreTimer(RunLoop::current(), *this, &DrawingAreaProxyImpl::discardBackingStore)
</del><ins>+ , m_discardBackingStoreTimer(RunLoop::current(), this, &DrawingAreaProxyImpl::discardBackingStore)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxyImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> bool m_isBackingStoreDiscardable;
</span><span class="cx"> std::unique_ptr<BackingStore> m_backingStore;
</span><span class="cx">
</span><del>- RunLoop::Timer m_discardBackingStoreTimer;
</del><ins>+ RunLoop::Timer<DrawingAreaProxyImpl> m_discardBackingStoreTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsgtkPluginInfoCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> PluginInfoCache::PluginInfoCache()
</span><span class="cx"> : m_cacheFile(g_key_file_new())
</span><del>- , m_saveToFileIdle(RunLoop::main(), *this, &PluginInfoCache::saveToFile)
</del><ins>+ , m_saveToFileIdle(RunLoop::main(), this, &PluginInfoCache::saveToFile)
</ins><span class="cx"> , m_readOnlyMode(false)
</span><span class="cx"> {
</span><span class="cx"> m_saveToFileIdle.setPriority(G_PRIORITY_DEFAULT_IDLE);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsgtkPluginInfoCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> GUniquePtr<GKeyFile> m_cacheFile;
</span><span class="cx"> GUniquePtr<char> m_cachePath;
</span><del>- RunLoop::Timer m_saveToFileIdle;
</del><ins>+ RunLoop::Timer<PluginInfoCache> m_saveToFileIdle;
</ins><span class="cx"> bool m_readOnlyMode;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessProcessThrottlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> ProcessThrottler::ProcessThrottler(ProcessThrottlerClient& process)
</span><span class="cx"> : m_process(process)
</span><del>- , m_suspendTimer(RunLoop::main(), *this, &ProcessThrottler::suspendTimerFired)
</del><ins>+ , m_suspendTimer(RunLoop::main(), this, &ProcessThrottler::suspendTimerFired)
</ins><span class="cx"> , m_foregroundCounter([this](RefCounterEvent) { updateAssertion(); })
</span><span class="cx"> , m_backgroundCounter([this](RefCounterEvent) { updateAssertion(); })
</span><span class="cx"> , m_suspendMessageCount(0)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessProcessThrottlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ProcessThrottler.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ProcessThrottler.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/UIProcess/ProcessThrottler.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx">
</span><span class="cx"> ProcessThrottlerClient& m_process;
</span><span class="cx"> std::unique_ptr<ProcessAndUIAssertion> m_assertion;
</span><del>- RunLoop::Timer m_suspendTimer;
</del><ins>+ RunLoop::Timer<ProcessThrottler> m_suspendTimer;
</ins><span class="cx"> ForegroundActivityCounter m_foregroundCounter;
</span><span class="cx"> BackgroundActivityCounter m_backgroundCounter;
</span><span class="cx"> int m_suspendMessageCount;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessResponsivenessTimercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> ResponsivenessTimer::ResponsivenessTimer(ResponsivenessTimer::Client& client)
</span><span class="cx"> : m_client(client)
</span><span class="cx"> , m_isResponsive(true)
</span><del>- , m_timer(RunLoop::main(), *this, &ResponsivenessTimer::timerFired)
</del><ins>+ , m_timer(RunLoop::main(), this, &ResponsivenessTimer::timerFired)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessResponsivenessTimerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> ResponsivenessTimer::Client& m_client;
</span><span class="cx"> bool m_isResponsive;
</span><span class="cx">
</span><del>- RunLoop::Timer m_timer;
</del><ins>+ RunLoop::Timer<ResponsivenessTimer> m_timer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessViewGestureControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ViewGestureController.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ViewGestureController.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/UIProcess/ViewGestureController.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> ViewGestureController::ViewGestureController(WebPageProxy& webPageProxy)
</span><span class="cx"> : m_webPageProxy(webPageProxy)
</span><del>- , m_swipeActiveLoadMonitoringTimer(RunLoop::main(), *this, &ViewGestureController::checkForActiveLoads)
</del><ins>+ , m_swipeActiveLoadMonitoringTimer(RunLoop::main(), this, &ViewGestureController::checkForActiveLoads)
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> , m_pendingSwipeTracker(webPageProxy, std::bind(&ViewGestureController::trackSwipeGesture, this, std::placeholders::_1, std::placeholders::_2))
</span><span class="cx"> #endif
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ViewGestureController::SnapshotRemovalTracker::SnapshotRemovalTracker()
</span><del>- : m_watchdogTimer(RunLoop::main(), *this, &SnapshotRemovalTracker::watchdogTimerFired)
</del><ins>+ : m_watchdogTimer(RunLoop::main(), this, &SnapshotRemovalTracker::watchdogTimerFired)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessVisitedLinkStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/VisitedLinkStore.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/VisitedLinkStore.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/UIProcess/VisitedLinkStore.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> : m_identifier(generateIdentifier())
</span><span class="cx"> , m_keyCount(0)
</span><span class="cx"> , m_tableSize(0)
</span><del>- , m_pendingVisitedLinksTimer(RunLoop::main(), *this, &VisitedLinkStore::pendingVisitedLinksTimerFired)
</del><ins>+ , m_pendingVisitedLinksTimer(RunLoop::main(), this, &VisitedLinkStore::pendingVisitedLinksTimerFired)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessVisitedLinkStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/VisitedLinkStore.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/VisitedLinkStore.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/UIProcess/VisitedLinkStore.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> VisitedLinkTable m_table;
</span><span class="cx">
</span><span class="cx"> HashSet<WebCore::LinkHash, WebCore::LinkHashHash> m_pendingVisitedLinks;
</span><del>- RunLoop::Timer m_pendingVisitedLinksTimer;
</del><ins>+ RunLoop::Timer<VisitedLinkStore> m_pendingVisitedLinksTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> WebInspectorProxy::WebInspectorProxy(WebPageProxy* inspectedPage)
</span><span class="cx"> : m_inspectedPage(inspectedPage)
</span><span class="cx"> #if PLATFORM(MAC) && WK_API_ENABLED
</span><del>- , m_closeTimer(RunLoop::main(), *this, &WebInspectorProxy::closeTimerFired)
</del><ins>+ , m_closeTimer(RunLoop::main(), this, &WebInspectorProxy::closeTimerFired)
</ins><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> m_inspectedPage->process().addMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_inspectedPage->pageID(), *this);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx"> RetainPtr<NSWindow> m_inspectorWindow;
</span><span class="cx"> RetainPtr<WKWebInspectorProxyObjCAdapter> m_inspectorProxyObjCAdapter;
</span><span class="cx"> HashMap<String, RetainPtr<NSURL>> m_suggestedToActualURLMap;
</span><del>- RunLoop::Timer m_closeTimer;
</del><ins>+ RunLoop::Timer<WebInspectorProxy> m_closeTimer;
</ins><span class="cx"> String m_urlString;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> WebInspectorClientGtk m_client;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> , m_userObservablePageCounter([this](RefCounterEvent) { updateProcessSuppressionState(); })
</span><span class="cx"> , m_processSuppressionDisabledForPageCounter([this](RefCounterEvent) { updateProcessSuppressionState(); })
</span><span class="cx"> , m_hiddenPageThrottlingAutoIncreasesCounter([this](RefCounterEvent) { m_hiddenPageThrottlingTimer.startOneShot(0); })
</span><del>- , m_hiddenPageThrottlingTimer(RunLoop::main(), *this, &WebProcessPool::updateHiddenPageThrottlingAutoIncreaseLimit)
</del><ins>+ , m_hiddenPageThrottlingTimer(RunLoop::main(), this, &WebProcessPool::updateHiddenPageThrottlingAutoIncreaseLimit)
</ins><span class="cx"> {
</span><span class="cx"> for (auto& scheme : m_configuration->alwaysRevalidatedURLSchemes())
</span><span class="cx"> m_schemesToRegisterAsAlwaysRevalidated.add(scheme);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -525,7 +525,7 @@
</span><span class="cx"> UserObservablePageCounter m_userObservablePageCounter;
</span><span class="cx"> ProcessSuppressionDisabledCounter m_processSuppressionDisabledForPageCounter;
</span><span class="cx"> HiddenPageThrottlingAutoIncreasesCounter m_hiddenPageThrottlingAutoIncreasesCounter;
</span><del>- RunLoop::Timer m_hiddenPageThrottlingTimer;
</del><ins>+ RunLoop::Timer<WebProcessPool> m_hiddenPageThrottlingTimer;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> RetainPtr<NSMutableDictionary> m_bundleParameters;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkGestureControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/GestureController.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/GestureController.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/UIProcess/gtk/GestureController.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx">
</span><span class="cx"> GestureController::DragGesture::DragGesture(WebPageProxy& page)
</span><span class="cx"> : Gesture(gtk_gesture_drag_new(page.viewWidget()), page)
</span><del>- , m_longPressTimeout(RunLoop::main(), *this, &GestureController::DragGesture::longPressFired)
</del><ins>+ , m_longPressTimeout(RunLoop::main(), this, &GestureController::DragGesture::longPressFired)
</ins><span class="cx"> , m_inDrag(false)
</span><span class="cx"> {
</span><span class="cx"> gtk_gesture_single_set_touch_only(GTK_GESTURE_SINGLE(m_gesture.get()), TRUE);
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> : Gesture(gtk_gesture_zoom_new(page.viewWidget()), page)
</span><span class="cx"> , m_initialScale(0)
</span><span class="cx"> , m_scale(0)
</span><del>- , m_idle(RunLoop::main(), *this, &GestureController::ZoomGesture::handleZoom)
</del><ins>+ , m_idle(RunLoop::main(), this, &GestureController::ZoomGesture::handleZoom)
</ins><span class="cx"> {
</span><span class="cx"> g_signal_connect_swapped(m_gesture.get(), "begin", G_CALLBACK(begin), this);
</span><span class="cx"> g_signal_connect_swapped(m_gesture.get(), "scale-changed", G_CALLBACK(scaleChanged), this);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkGestureControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/GestureController.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/GestureController.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/UIProcess/gtk/GestureController.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx">
</span><span class="cx"> WebCore::FloatPoint m_start;
</span><span class="cx"> WebCore::FloatPoint m_offset;
</span><del>- RunLoop::Timer m_longPressTimeout;
</del><ins>+ RunLoop::Timer<DragGesture> m_longPressTimeout;
</ins><span class="cx"> GRefPtr<GtkGesture> m_longPress;
</span><span class="cx"> bool m_inDrag;
</span><span class="cx"> };
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> gdouble m_scale;
</span><span class="cx"> WebCore::IntPoint m_initialPoint;
</span><span class="cx"> WebCore::IntPoint m_viewPoint;
</span><del>- RunLoop::Timer m_idle;
</del><ins>+ RunLoop::Timer<ZoomGesture> m_idle;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> DragGesture m_dragGesture;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebPopupMenuProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> : WebPopupMenuProxy(client)
</span><span class="cx"> , m_webView(webView)
</span><span class="cx"> , m_popup(gtk_menu_new())
</span><del>- , m_dismissMenuTimer(RunLoop::main(), *this, &WebPopupMenuProxyGtk::dismissMenuTimerFired)
</del><ins>+ , m_dismissMenuTimer(RunLoop::main(), this, &WebPopupMenuProxyGtk::dismissMenuTimerFired)
</ins><span class="cx"> {
</span><span class="cx"> g_signal_connect(m_popup, "key-press-event", G_CALLBACK(keyPressEventCallback), this);
</span><span class="cx"> g_signal_connect(m_popup, "unmap", G_CALLBACK(menuUnmappedCallback), this);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebPopupMenuProxyGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> GtkWidget* m_webView { nullptr };
</span><span class="cx"> GtkWidget* m_popup { nullptr };
</span><span class="cx">
</span><del>- RunLoop::Timer m_dismissMenuTimer;
</del><ins>+ RunLoop::Timer<WebPopupMenuProxyGtk> m_dismissMenuTimer;
</ins><span class="cx">
</span><span class="cx"> // Typeahead find.
</span><span class="cx"> unsigned m_previousKeyEventCharacter { 0 };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> std::function<void()> m_removalCallback;
</span><span class="cx"> std::chrono::steady_clock::time_point m_startTime;
</span><span class="cx">
</span><del>- RunLoop::Timer m_watchdogTimer;
</del><ins>+ RunLoop::Timer<SnapshotRemovalTracker> m_watchdogTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx"> WebPageProxy& m_webPageProxy;
</span><span class="cx"> ViewGestureType m_activeGestureType { ViewGestureType::None };
</span><span class="cx">
</span><del>- RunLoop::Timer m_swipeActiveLoadMonitoringTimer;
</del><ins>+ RunLoop::Timer<ViewGestureController> m_swipeActiveLoadMonitoringTimer;
</ins><span class="cx">
</span><span class="cx"> WebCore::Color m_backgroundColorForCurrentSnapshot;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebLoaderStrategycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> WebLoaderStrategy::WebLoaderStrategy()
</span><del>- : m_internallyFailedLoadTimer(RunLoop::main(), *this, &WebLoaderStrategy::internallyFailedLoadTimerFired)
</del><ins>+ : m_internallyFailedLoadTimer(RunLoop::main(), this, &WebLoaderStrategy::internallyFailedLoadTimerFired)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebLoaderStrategyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> void startLocalLoad(WebCore::ResourceLoader&);
</span><span class="cx">
</span><span class="cx"> HashSet<RefPtr<WebCore::ResourceLoader>> m_internallyFailedResourceLoaders;
</span><del>- RunLoop::Timer m_internallyFailedLoadTimer;
</del><ins>+ RunLoop::Timer<WebLoaderStrategy> m_internallyFailedLoadTimer;
</ins><span class="cx">
</span><span class="cx"> HashMap<unsigned long, RefPtr<WebResourceLoader>> m_webResourceLoaders;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNPRuntimeObjectMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> NPRuntimeObjectMap::NPRuntimeObjectMap(PluginView* pluginView)
</span><span class="cx"> : m_pluginView(pluginView)
</span><del>- , m_finalizationTimer(RunLoop::main(), *this, &NPRuntimeObjectMap::invalidateQueuedObjects)
</del><ins>+ , m_finalizationTimer(RunLoop::main(), this, &NPRuntimeObjectMap::invalidateQueuedObjects)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNPRuntimeObjectMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> HashMap<JSC::JSObject*, NPJSObject*> m_npJSObjects;
</span><span class="cx"> HashMap<NPObject*, JSC::Weak<JSNPObject>> m_jsNPObjects;
</span><span class="cx"> Vector<NPObject*> m_npObjectsToFinalize;
</span><del>- RunLoop::Timer m_finalizationTimer;
</del><ins>+ RunLoop::Timer<NPRuntimeObjectMap> m_finalizationTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePlugincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> , m_hasHandledAKeyDownEvent(false)
</span><span class="cx"> , m_ignoreNextKeyUpEventCounter(0)
</span><span class="cx"> #ifndef NP_NO_CARBON
</span><del>- , m_nullEventTimer(RunLoop::main(), *this, &NetscapePlugin::nullEventTimerFired)
</del><ins>+ , m_nullEventTimer(RunLoop::main(), this, &NetscapePlugin::nullEventTimerFired)
</ins><span class="cx"> , m_npCGContext()
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx"> , m_interval(interval)
</span><span class="cx"> , m_repeat(repeat)
</span><span class="cx"> , m_timerFunc(timerFunc)
</span><del>- , m_timer(RunLoop::main(), *this, &Timer::timerFired)
</del><ins>+ , m_timer(RunLoop::main(), this, &Timer::timerFired)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePluginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -338,7 +338,7 @@
</span><span class="cx"> bool m_repeat;
</span><span class="cx"> TimerFunc m_timerFunc;
</span><span class="cx">
</span><del>- RunLoop::Timer m_timer;
</del><ins>+ RunLoop::Timer<Timer> m_timer;
</ins><span class="cx"> };
</span><span class="cx"> typedef HashMap<unsigned, std::unique_ptr<Timer>> TimerMap;
</span><span class="cx"> TimerMap m_timers;
</span><span class="lines">@@ -383,7 +383,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: It's a bit wasteful to have one null event timer per plug-in.
</span><span class="cx"> // We should investigate having one per window.
</span><del>- RunLoop::Timer m_nullEventTimer;
</del><ins>+ RunLoop::Timer<NetscapePlugin> m_nullEventTimer;
</ins><span class="cx"> NP_CGContext m_npCGContext;
</span><span class="cx"> #endif
</span><span class="cx"> #elif PLUGIN_ARCHITECTURE(X11)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePluginStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> , m_urlNotifyHasBeenCalled(false)
</span><span class="cx"> #endif
</span><del>- , m_deliveryDataTimer(RunLoop::main(), *this, &NetscapePluginStream::deliverDataToPlugin)
</del><ins>+ , m_deliveryDataTimer(RunLoop::main(), this, &NetscapePluginStream::deliverDataToPlugin)
</ins><span class="cx"> , m_stopStreamWhenDoneDelivering(false)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePluginStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> CString m_mimeType;
</span><span class="cx"> CString m_headers;
</span><span class="cx">
</span><del>- RunLoop::Timer m_deliveryDataTimer;
</del><ins>+ RunLoop::Timer<NetscapePluginStream> m_deliveryDataTimer;
</ins><span class="cx"> std::unique_ptr<Vector<uint8_t>> m_deliveryData;
</span><span class="cx"> bool m_stopStreamWhenDoneDelivering;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx"> #if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
</span><span class="cx"> , m_didPlugInStartOffScreen(false)
</span><span class="cx"> #endif
</span><del>- , m_pendingURLRequestsTimer(RunLoop::main(), *this, &PluginView::pendingURLRequestsTimerFired)
</del><ins>+ , m_pendingURLRequestsTimer(RunLoop::main(), this, &PluginView::pendingURLRequestsTimerFired)
</ins><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> , m_npRuntimeObjectMap(this)
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx">
</span><span class="cx"> // Pending URLRequests that the plug-in has made.
</span><span class="cx"> Deque<RefPtr<URLRequest>> m_pendingURLRequests;
</span><del>- RunLoop::Timer m_pendingURLRequestsTimer;
</del><ins>+ RunLoop::Timer<PluginView> m_pendingURLRequestsTimer;
</ins><span class="cx">
</span><span class="cx"> // Pending frame loads that the plug-in has made.
</span><span class="cx"> typedef HashMap<RefPtr<WebFrame>, RefPtr<URLRequest>> FrameLoadMap;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedDrawingAreacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> , m_layerTreeStateIsFrozen(false)
</span><span class="cx"> , m_wantsToExitAcceleratedCompositingMode(false)
</span><span class="cx"> , m_isPaintingSuspended(false)
</span><del>- , m_exitCompositingTimer(RunLoop::main(), *this, &CoordinatedDrawingArea::exitAcceleratedCompositingMode)
</del><ins>+ , m_exitCompositingTimer(RunLoop::main(), this, &CoordinatedDrawingArea::exitAcceleratedCompositingMode)
</ins><span class="cx"> {
</span><span class="cx"> // Always use compositing in CoordinatedGraphics
</span><span class="cx"> enterAcceleratedCompositingMode(0);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> // won't paint until painting has resumed again.
</span><span class="cx"> bool m_isPaintingSuspended;
</span><span class="cx">
</span><del>- RunLoop::Timer m_exitCompositingTimer;
</del><ins>+ RunLoop::Timer<CoordinatedDrawingArea> m_exitCompositingTimer;
</ins><span class="cx">
</span><span class="cx"> // The layer tree host that handles accelerated compositing.
</span><span class="cx"> RefPtr<LayerTreeHost> m_layerTreeHost;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsThreadedCoordinatedLayerTreeHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> , m_notifyAfterScheduledLayerFlush(false)
</span><span class="cx"> , m_isSuspended(false)
</span><span class="cx"> , m_isWaitingForRenderer(false)
</span><del>- , m_layerFlushTimer(RunLoop::main(), *this, &ThreadedCoordinatedLayerTreeHost::performScheduledLayerFlush)
</del><ins>+ , m_layerFlushTimer(RunLoop::main(), this, &ThreadedCoordinatedLayerTreeHost::performScheduledLayerFlush)
</ins><span class="cx"> , m_layerFlushSchedulingEnabled(true)
</span><span class="cx"> {
</span><span class="cx"> m_coordinator = std::make_unique<CompositingCoordinator>(m_webPage.corePage(), this);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsThreadedCoordinatedLayerTreeHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> float m_lastScaleFactor;
</span><span class="cx"> WebCore::IntPoint m_lastScrollPosition;
</span><span class="cx">
</span><del>- RunLoop::Timer m_layerFlushTimer;
</del><ins>+ RunLoop::Timer<ThreadedCoordinatedLayerTreeHost> m_layerFlushTimer;
</ins><span class="cx"> bool m_layerFlushSchedulingEnabled;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreaImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -65,8 +65,8 @@
</span><span class="cx"> , m_wantsToExitAcceleratedCompositingMode(false)
</span><span class="cx"> , m_isPaintingSuspended(!(parameters.viewState & ViewState::IsVisible))
</span><span class="cx"> , m_alwaysUseCompositing(false)
</span><del>- , m_displayTimer(RunLoop::main(), *this, &DrawingAreaImpl::displayTimerFired)
- , m_exitCompositingTimer(RunLoop::main(), *this, &DrawingAreaImpl::exitAcceleratedCompositingMode)
</del><ins>+ , m_displayTimer(RunLoop::main(), this, &DrawingAreaImpl::displayTimerFired)
+ , m_exitCompositingTimer(RunLoop::main(), this, &DrawingAreaImpl::exitAcceleratedCompositingMode)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreaImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -131,8 +131,8 @@
</span><span class="cx">
</span><span class="cx"> bool m_forceRepaintAfterBackingStoreStateUpdate { false };
</span><span class="cx">
</span><del>- RunLoop::Timer m_displayTimer;
- RunLoop::Timer m_exitCompositingTimer;
</del><ins>+ RunLoop::Timer<DrawingAreaImpl> m_displayTimer;
+ RunLoop::Timer<DrawingAreaImpl> m_exitCompositingTimer;
</ins><span class="cx">
</span><span class="cx"> // The layer tree host that handles accelerated compositing.
</span><span class="cx"> RefPtr<LayerTreeHost> m_layerTreeHost;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -301,7 +301,7 @@
</span><span class="cx"> , m_readyToFindPrimarySnapshottedPlugin(false)
</span><span class="cx"> , m_didFindPrimarySnapshottedPlugin(false)
</span><span class="cx"> , m_numberOfPrimarySnapshotDetectionAttempts(0)
</span><del>- , m_determinePrimarySnapshottedPlugInTimer(RunLoop::main(), *this, &WebPage::determinePrimarySnapshottedPlugInTimerFired)
</del><ins>+ , m_determinePrimarySnapshottedPlugInTimer(RunLoop::main(), this, &WebPage::determinePrimarySnapshottedPlugInTimerFired)
</ins><span class="cx"> #endif
</span><span class="cx"> , m_layerHostingMode(parameters.layerHostingMode)
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx"> #elif HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
</span><span class="cx"> , m_accessibilityObject(nullptr)
</span><span class="cx"> #endif
</span><del>- , m_setCanStartMediaTimer(RunLoop::main(), *this, &WebPage::setCanStartMediaTimerFired)
</del><ins>+ , m_setCanStartMediaTimer(RunLoop::main(), this, &WebPage::setCanStartMediaTimerFired)
</ins><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx"> , m_contextMenuClient(std::make_unique<API::InjectedBundle::PageContextMenuClient>())
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -1250,7 +1250,7 @@
</span><span class="cx"> String m_primaryPlugInPageOrigin;
</span><span class="cx"> String m_primaryPlugInOrigin;
</span><span class="cx"> String m_primaryPlugInMimeType;
</span><del>- RunLoop::Timer m_determinePrimarySnapshottedPlugInTimer;
</del><ins>+ RunLoop::Timer<WebPage> m_determinePrimarySnapshottedPlugInTimer;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // The layer hosting mode.
</span><span class="lines">@@ -1291,7 +1291,7 @@
</span><span class="cx"> RefPtr<PageBanner> m_footerBanner;
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span><del>- RunLoop::Timer m_setCanStartMediaTimer;
</del><ins>+ RunLoop::Timer<WebPage> m_setCanStartMediaTimer;
</ins><span class="cx"> bool m_mayStartMediaWhenInWindow;
</span><span class="cx">
</span><span class="cx"> HashMap<uint64_t, RefPtr<WebUndoStep>> m_undoStepMap;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">
</span><span class="cx"> LayerTreeHostGtk::RenderFrameScheduler::RenderFrameScheduler(std::function<bool()> renderer)
</span><span class="cx"> : m_renderer(WTFMove(renderer))
</span><del>- , m_timer(RunLoop::main(), *this, &LayerTreeHostGtk::RenderFrameScheduler::renderFrame)
</del><ins>+ , m_timer(RunLoop::main(), this, &LayerTreeHostGtk::RenderFrameScheduler::renderFrame)
</ins><span class="cx"> {
</span><span class="cx"> // We use a RunLoop timer because otherwise GTK+ event handling during dragging can starve WebCore timers, which have a lower priority.
</span><span class="cx"> // Use a higher priority than WebCore timers.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> void nextFrame();
</span><span class="cx">
</span><span class="cx"> std::function<bool()> m_renderer;
</span><del>- RunLoop::Timer m_timer;
</del><ins>+ RunLoop::Timer<RenderFrameScheduler> m_timer;
</ins><span class="cx"> double m_fireTime { 0 };
</span><span class="cx"> double m_lastImmediateFlushTime { 0 };
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx">
</span><span class="cx"> WebCore::TransformationMatrix m_transform;
</span><span class="cx">
</span><del>- RunLoop::Timer m_sendDidUpdateViewStateTimer;
</del><ins>+ RunLoop::Timer<TiledCoreAnimationDrawingArea> m_sendDidUpdateViewStateTimer;
</ins><span class="cx"> Vector<uint64_t> m_nextViewStateChangeCallbackIDs;
</span><span class="cx"> bool m_wantsDidUpdateViewState;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> , m_layerFlushScheduler(this)
</span><span class="cx"> , m_isPaintingSuspended(!(parameters.viewState & ViewState::IsVisible))
</span><span class="cx"> , m_transientZoomScale(1)
</span><del>- , m_sendDidUpdateViewStateTimer(RunLoop::main(), *this, &TiledCoreAnimationDrawingArea::didUpdateViewStateTimerFired)
</del><ins>+ , m_sendDidUpdateViewStateTimer(RunLoop::main(), this, &TiledCoreAnimationDrawingArea::didUpdateViewStateTimerFired)
</ins><span class="cx"> , m_wantsDidUpdateViewState(false)
</span><span class="cx"> , m_viewOverlayRootLayer(nullptr)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Tools/ChangeLog 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-06-28 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r202580.
+ https://bugs.webkit.org/show_bug.cgi?id=159245
+
+ Caused all WKTR tests to fail on GuardMalloc and Production
+ only for unknown reasons, investigating offline. (Requested by
+ brrian on #webkit).
+
+ Reverted changeset:
+
+ "RunLoop::Timer should use constructor templates instead of
+ class templates"
+ https://bugs.webkit.org/show_bug.cgi?id=159153
+ http://trac.webkit.org/changeset/202580
+
</ins><span class="cx"> 2016-06-28 Srinivasan Vijayaraghavan <svijayaraghavan@apple.com>
</span><span class="cx">
</span><span class="cx"> Use a regex to check if a test step is for JavaScriptCore
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFRunLoopcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/RunLoop.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/RunLoop.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/RunLoop.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -75,10 +75,10 @@
</span><span class="cx">
</span><span class="cx"> bool testFinished = false;
</span><span class="cx">
</span><del>- class DerivedTimer : public RunLoop::Timer {
</del><ins>+ class DerivedTimer : public RunLoop::Timer<DerivedTimer> {
</ins><span class="cx"> public:
</span><span class="cx"> DerivedTimer(bool& testFinished)
</span><del>- : RunLoop::Timer(RunLoop::current(), *this, &DerivedTimer::fired)
</del><ins>+ : RunLoop::Timer<DerivedTimer>(RunLoop::current(), this, &DerivedTimer::fired)
</ins><span class="cx"> , m_testFinished(testFinished)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -106,10 +106,10 @@
</span><span class="cx">
</span><span class="cx"> bool testFinished = false;
</span><span class="cx">
</span><del>- class DerivedTimer : public RunLoop::Timer {
</del><ins>+ class DerivedTimer : public RunLoop::Timer<DerivedTimer> {
</ins><span class="cx"> public:
</span><span class="cx"> DerivedTimer(bool& testFinished)
</span><del>- : RunLoop::Timer(RunLoop::current(), *this, &DerivedTimer::fired)
</del><ins>+ : RunLoop::Timer<DerivedTimer>(RunLoop::current(), this, &DerivedTimer::fired)
</ins><span class="cx"> , m_testFinished(testFinished)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleTestRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> , m_userStyleSheetEnabled(false)
</span><span class="cx"> , m_userStyleSheetLocation(adoptWK(WKStringCreateWithUTF8CString("")))
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>- , m_waitToDumpWatchdogTimer(RunLoop::main(), *this, &TestRunner::waitToDumpWatchdogTimerFired)
</del><ins>+ , m_waitToDumpWatchdogTimer(RunLoop::main(), this, &TestRunner::waitToDumpWatchdogTimerFired)
</ins><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> platformInitialize();
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleTestRunnerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (202610 => 202611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2016-06-29 04:31:41 UTC (rev 202610)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2016-06-29 04:49:27 UTC (rev 202611)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx"> namespace WTR {
</span><span class="cx"> class TestRunner;
</span><del>-typedef RunLoop::Timer PlatformTimerRef;
</del><ins>+typedef RunLoop::Timer<TestRunner> PlatformTimerRef;
</ins><span class="cx"> }
</span><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx"> typedef Ecore_Timer* PlatformTimerRef;
</span></span></pre>
</div>
</div>
</body>
</html>