Title: [166254] trunk/Source/WebCore
- Revision
- 166254
- Author
- jer.no...@apple.com
- Date
- 2014-03-25 14:26:17 -0700 (Tue, 25 Mar 2014)
Log Message
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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (166253 => 166254)
--- 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)
@@ -1,5 +1,16 @@
2014-03-25 Jer Noble <jer.no...@apple.com>
+ 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.no...@apple.com>
+
Unreviewed build fix after r166247. Un-platform-protect the declaration of HTMLMediaElement::shouldDisableSleep()
and make WebVideoFullscreenController's _displaySleepDisabler a std::unique_ptr.
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (166253 => 166254)
--- 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)
@@ -7190,6 +7190,7 @@
<ClCompile Include="..\platform\DatabaseStrategy.cpp" />
<ClCompile Include="..\platform\DateComponents.cpp" />
<ClCompile Include="..\platform\Decimal.cpp" />
+ <ClCompile Include="..\platform\DisplaySleepDisabler.cpp" />
<ClCompile Include="..\platform\DragData.cpp" />
<ClCompile Include="..\platform\DragImage.cpp" />
<ClCompile Include="..\platform\FileChooser.cpp" />
@@ -19089,6 +19090,7 @@
<ClInclude Include="..\platform\DatabaseStrategy.h" />
<ClInclude Include="..\platform\DateComponents.h" />
<ClInclude Include="..\platform\Decimal.h" />
+ <ClInclude Include="..\platform\DisplaySleepDisabler.h" />
<ClInclude Include="..\platform\DragData.h" />
<ClInclude Include="..\platform\DragImage.h" />
<ClInclude Include="..\platform\EventLoop.h" />
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (166253 => 166254)
--- 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)
@@ -38,6 +38,7 @@
#include "ContentSecurityPolicy.h"
#include "ContentType.h"
#include "DiagnosticLoggingKeys.h"
+#include "DisplaySleepDisabler.h"
#include "DocumentLoader.h"
#include "ElementIterator.h"
#include "EventNames.h"
@@ -112,10 +113,6 @@
#include "WebKitPlaybackTargetAvailabilityEvent.h"
#endif
-#if PLATFORM(COCOA)
-#include "DisplaySleepDisabler.h"
-#endif
-
#if ENABLE(MEDIA_SOURCE)
#include "DOMWindow.h"
#include "MediaSource.h"
Modified: trunk/Source/WebCore/platform/DisplaySleepDisabler.cpp (166253 => 166254)
--- 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)
@@ -35,4 +35,12 @@
}
#endif // !PLATFORM(COCOA)
+DisplaySleepDisabler::DisplaySleepDisabler(const char*)
+{
}
+
+DisplaySleepDisabler::~DisplaySleepDisabler()
+{
+}
+
+}
Modified: trunk/Source/WebCore/platform/DisplaySleepDisabler.h (166253 => 166254)
--- 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)
@@ -31,10 +31,10 @@
class DisplaySleepDisabler {
public:
static std::unique_ptr<DisplaySleepDisabler> create(const char*);
- virtual ~DisplaySleepDisabler() { }
+ virtual ~DisplaySleepDisabler();
protected:
- DisplaySleepDisabler(const char*) { }
+ DisplaySleepDisabler(const char*);
};
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
