Changeset 166254 in webkit

Timestamp:

Mar 25, 2014 2:26:17 PM (10 years ago)

Author:

jer.noble@apple.com

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.vcxproj/WebCore.vcxproj (modified) (2 diffs)
• html/HTMLMediaElement.cpp (modified) (2 diffs)
• platform/DisplaySleepDisabler.cpp (modified) (1 diff)
• platform/DisplaySleepDisabler.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-25  Jer Noble  <jer.noble@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.noble@apple.com>
 

trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

@@ -7191 +7191 @@
     <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" />
@@ -19090 +19091 @@
     <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" />

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -39 +39 @@
 #include "ContentType.h"
 #include "DiagnosticLoggingKeys.h"
+#include "DisplaySleepDisabler.h"
 #include "DocumentLoader.h"
 #include "ElementIterator.h"
@@ -111 +112 @@
 #if ENABLE(IOS_AIRPLAY)
 #include "WebKitPlaybackTargetAvailabilityEvent.h"
-#endif
-
-#if PLATFORM(COCOA)
-#include "DisplaySleepDisabler.h"
 #endif
 

trunk/Source/WebCore/platform/DisplaySleepDisabler.cpp

@@ -36 +36 @@
 #endif // !PLATFORM(COCOA)
 
+DisplaySleepDisabler::DisplaySleepDisabler(const char*)
+{
 }
+
+DisplaySleepDisabler::~DisplaySleepDisabler()
+{
+}
+
+}

trunk/Source/WebCore/platform/DisplaySleepDisabler.h

@@ -32 +32 @@
 public:
     static std::unique_ptr<DisplaySleepDisabler> create(const char*);
-    virtual ~DisplaySleepDisabler() { }
+    virtual ~DisplaySleepDisabler();
 
 protected:
-    DisplaySleepDisabler(const char*) { }
+    DisplaySleepDisabler(const char*);
 };