<!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>[161971] trunk/Source</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/161971">161971</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-01-14 08:29:51 -0800 (Tue, 14 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove deprecated DeferrableOneShotTimer constructor.
<https://webkit.org/b/126984>
Source/WebCore:
Remove the deprecated constructor for callback functions that take
the timer by pointer instead of by reference.
This shrinks DeferrableOneShotTimer by 8 bytes.
Reviewed by Anders Carlsson.
* platform/Timer.h:
(WebCore::DeferrableOneShotTimer::DeferrableOneShotTimer):
Source/WebKit2:
Reviewed by Anders Carlsson.
* WebProcess/Plugins/PluginView.h:
* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::pluginSnapshotTimerFired):
Take the timer by reference so we can use the new constructor.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformTimerh">trunk/Source/WebCore/platform/Timer.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161970 => 161971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-14 16:21:44 UTC (rev 161970)
+++ trunk/Source/WebCore/ChangeLog 2014-01-14 16:29:51 UTC (rev 161971)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-01-14 Andreas Kling <akling@apple.com>
+
+ Remove deprecated DeferrableOneShotTimer constructor.
+ <https://webkit.org/b/126984>
+
+ Remove the deprecated constructor for callback functions that take
+ the timer by pointer instead of by reference.
+
+ This shrinks DeferrableOneShotTimer by 8 bytes.
+
+ Reviewed by Anders Carlsson.
+
+ * platform/Timer.h:
+ (WebCore::DeferrableOneShotTimer::DeferrableOneShotTimer):
+
</ins><span class="cx"> 2014-01-14 Dirk Schulze <krit@webkit.org>
</span><span class="cx">
</span><span class="cx"> Make CachedSVGDocument independent of CSS Filters
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformTimerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Timer.h (161970 => 161971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Timer.h 2014-01-14 16:21:44 UTC (rev 161970)
+++ trunk/Source/WebCore/platform/Timer.h 2014-01-14 16:29:51 UTC (rev 161971)
</span><span class="lines">@@ -153,26 +153,15 @@
</span><span class="cx"> template <typename TimerFiredClass> class DeferrableOneShotTimer : protected TimerBase {
</span><span class="cx"> public:
</span><span class="cx"> typedef void (TimerFiredClass::*TimerFiredFunction)(DeferrableOneShotTimer&);
</span><del>- typedef void (TimerFiredClass::*DeprecatedTimerFiredFunction)(DeferrableOneShotTimer*);
</del><span class="cx">
</span><span class="cx"> DeferrableOneShotTimer(TimerFiredClass* object, TimerFiredFunction function, double delay)
</span><span class="cx"> : m_object(object)
</span><span class="cx"> , m_function(function)
</span><del>- , m_deprecatedFunction(nullptr)
</del><span class="cx"> , m_delay(delay)
</span><span class="cx"> , m_shouldRestartWhenTimerFires(false)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- DeferrableOneShotTimer(TimerFiredClass* object, DeprecatedTimerFiredFunction function, double delay)
- : m_object(object)
- , m_function(nullptr)
- , m_deprecatedFunction(function)
- , m_delay(delay)
- , m_shouldRestartWhenTimerFires(false)
- {
- }
-
</del><span class="cx"> void restart()
</span><span class="cx"> {
</span><span class="cx"> // Setting this boolean is much more efficient than calling startOneShot
</span><span class="lines">@@ -203,17 +192,11 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_deprecatedFunction) {
- (m_object->*m_deprecatedFunction)(this);
- return;
- }
-
</del><span class="cx"> (m_object->*m_function)(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TimerFiredClass* m_object;
</span><span class="cx"> TimerFiredFunction m_function;
</span><del>- DeprecatedTimerFiredFunction m_deprecatedFunction;
</del><span class="cx">
</span><span class="cx"> double m_delay;
</span><span class="cx"> bool m_shouldRestartWhenTimerFires;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161970 => 161971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-14 16:21:44 UTC (rev 161970)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-14 16:29:51 UTC (rev 161971)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-01-14 Andreas Kling <akling@apple.com>
+
+ Remove deprecated DeferrableOneShotTimer constructor.
+ <https://webkit.org/b/126984>
+
+ Reviewed by Anders Carlsson.
+
+ * WebProcess/Plugins/PluginView.h:
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::pluginSnapshotTimerFired):
+
+ Take the timer by reference so we can use the new constructor.
+
</ins><span class="cx"> 2014-01-13 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> iOS WebKit2 build fixes, part 1
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (161970 => 161971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-01-14 16:21:44 UTC (rev 161970)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-01-14 16:29:51 UTC (rev 161971)
</span><span class="lines">@@ -1673,7 +1673,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void PluginView::pluginSnapshotTimerFired(DeferrableOneShotTimer<PluginView>*)
</del><ins>+void PluginView::pluginSnapshotTimerFired(DeferrableOneShotTimer<PluginView>&)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_plugin);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h (161970 => 161971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2014-01-14 16:21:44 UTC (rev 161970)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2014-01-14 16:29:51 UTC (rev 161971)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx">
</span><span class="cx"> void redeliverManualStream();
</span><span class="cx">
</span><del>- void pluginSnapshotTimerFired(WebCore::DeferrableOneShotTimer<PluginView>*);
</del><ins>+ void pluginSnapshotTimerFired(WebCore::DeferrableOneShotTimer<PluginView>&);
</ins><span class="cx"> void pluginDidReceiveUserInteraction();
</span><span class="cx">
</span><span class="cx"> bool shouldCreateTransientPaintingSnapshot() const;
</span></span></pre>
</div>
</div>
</body>
</html>