<!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>[166254] trunk/Source/WebCore</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/166254">166254</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-03-25 14:26:17 -0700 (Tue, 25 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Further unreviewed build fix after <a href="http://trac.webkit.org/projects/webkit/changeset/166247">r166247</a>. Add DisplaySleepDisabler to the windows project file and
move the definition of DisplaySleepDisabler's constructor and destructor into the cpp file.
* WebCore.vcxproj/WebCore.vcxproj:
* platform/DisplaySleepDisabler.cpp:
(WebCore::DisplaySleepDisabler::DisplaySleepDisabler):
(WebCore::DisplaySleepDisabler::~DisplaySleepDisabler):
* platform/DisplaySleepDisabler.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformDisplaySleepDisablercpp">trunk/Source/WebCore/platform/DisplaySleepDisabler.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformDisplaySleepDisablerh">trunk/Source/WebCore/platform/DisplaySleepDisabler.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166253 => 166254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-25 21:18:20 UTC (rev 166253)
+++ trunk/Source/WebCore/ChangeLog 2014-03-25 21:26:17 UTC (rev 166254)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2014-03-25 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><ins>+ Further unreviewed build fix after r166247. Add DisplaySleepDisabler to the windows project file and
+ move the definition of DisplaySleepDisabler's constructor and destructor into the cpp file.
+
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * platform/DisplaySleepDisabler.cpp:
+ (WebCore::DisplaySleepDisabler::DisplaySleepDisabler):
+ (WebCore::DisplaySleepDisabler::~DisplaySleepDisabler):
+ * platform/DisplaySleepDisabler.h:
+
+2014-03-25 Jer Noble <jer.noble@apple.com>
+
</ins><span class="cx"> Unreviewed build fix after r166247. Un-platform-protect the declaration of HTMLMediaElement::shouldDisableSleep()
</span><span class="cx"> and make WebVideoFullscreenController's _displaySleepDisabler a std::unique_ptr.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (166253 => 166254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-03-25 21:18:20 UTC (rev 166253)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-03-25 21:26:17 UTC (rev 166254)
</span><span class="lines">@@ -7190,6 +7190,7 @@
</span><span class="cx"> <ClCompile Include="..\platform\DatabaseStrategy.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\DateComponents.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\Decimal.cpp" />
</span><ins>+ <ClCompile Include="..\platform\DisplaySleepDisabler.cpp" />
</ins><span class="cx"> <ClCompile Include="..\platform\DragData.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\DragImage.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\FileChooser.cpp" />
</span><span class="lines">@@ -19089,6 +19090,7 @@
</span><span class="cx"> <ClInclude Include="..\platform\DatabaseStrategy.h" />
</span><span class="cx"> <ClInclude Include="..\platform\DateComponents.h" />
</span><span class="cx"> <ClInclude Include="..\platform\Decimal.h" />
</span><ins>+ <ClInclude Include="..\platform\DisplaySleepDisabler.h" />
</ins><span class="cx"> <ClInclude Include="..\platform\DragData.h" />
</span><span class="cx"> <ClInclude Include="..\platform\DragImage.h" />
</span><span class="cx"> <ClInclude Include="..\platform\EventLoop.h" />
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (166253 => 166254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-03-25 21:18:20 UTC (rev 166253)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-03-25 21:26:17 UTC (rev 166254)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #include "ContentSecurityPolicy.h"
</span><span class="cx"> #include "ContentType.h"
</span><span class="cx"> #include "DiagnosticLoggingKeys.h"
</span><ins>+#include "DisplaySleepDisabler.h"
</ins><span class="cx"> #include "DocumentLoader.h"
</span><span class="cx"> #include "ElementIterator.h"
</span><span class="cx"> #include "EventNames.h"
</span><span class="lines">@@ -112,10 +113,6 @@
</span><span class="cx"> #include "WebKitPlaybackTargetAvailabilityEvent.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(COCOA)
-#include "DisplaySleepDisabler.h"
-#endif
-
</del><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> #include "DOMWindow.h"
</span><span class="cx"> #include "MediaSource.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformDisplaySleepDisablercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/DisplaySleepDisabler.cpp (166253 => 166254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/DisplaySleepDisabler.cpp 2014-03-25 21:18:20 UTC (rev 166253)
+++ trunk/Source/WebCore/platform/DisplaySleepDisabler.cpp 2014-03-25 21:26:17 UTC (rev 166254)
</span><span class="lines">@@ -35,4 +35,12 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // !PLATFORM(COCOA)
</span><span class="cx">
</span><ins>+DisplaySleepDisabler::DisplaySleepDisabler(const char*)
+{
</ins><span class="cx"> }
</span><ins>+
+DisplaySleepDisabler::~DisplaySleepDisabler()
+{
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformDisplaySleepDisablerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/DisplaySleepDisabler.h (166253 => 166254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/DisplaySleepDisabler.h 2014-03-25 21:18:20 UTC (rev 166253)
+++ trunk/Source/WebCore/platform/DisplaySleepDisabler.h 2014-03-25 21:26:17 UTC (rev 166254)
</span><span class="lines">@@ -31,10 +31,10 @@
</span><span class="cx"> class DisplaySleepDisabler {
</span><span class="cx"> public:
</span><span class="cx"> static std::unique_ptr<DisplaySleepDisabler> create(const char*);
</span><del>- virtual ~DisplaySleepDisabler() { }
</del><ins>+ virtual ~DisplaySleepDisabler();
</ins><span class="cx">
</span><span class="cx"> protected:
</span><del>- DisplaySleepDisabler(const char*) { }
</del><ins>+ DisplaySleepDisabler(const char*);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>