Title: [95517] trunk/Source/WebCore
- Revision
- 95517
- Author
- [email protected]
- Date
- 2011-09-19 23:33:57 -0700 (Mon, 19 Sep 2011)
Log Message
Attempt to fix the Leopard build.
* platform/mac/DisplaySleepDisabler.cpp:
(WebCore::DisplaySleepDisabler::DisplaySleepDisabler):
* platform/mac/DisplaySleepDisabler.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (95516 => 95517)
--- trunk/Source/WebCore/ChangeLog 2011-09-20 04:33:10 UTC (rev 95516)
+++ trunk/Source/WebCore/ChangeLog 2011-09-20 06:33:57 UTC (rev 95517)
@@ -1,5 +1,13 @@
2011-09-19 Mark Rowe <[email protected]>
+ Attempt to fix the Leopard build.
+
+ * platform/mac/DisplaySleepDisabler.cpp:
+ (WebCore::DisplaySleepDisabler::DisplaySleepDisabler):
+ * platform/mac/DisplaySleepDisabler.h:
+
+2011-09-19 Mark Rowe <[email protected]>
+
<http://webkit.org/b/68421> Stop calling UpdateSystemActivity in places where we hold power assertions that achieve the same effect
On SnowLeopard and newer it's not necessary to call UpdateSystemActivity to prevent the screensaver from kicking
Modified: trunk/Source/WebCore/platform/mac/DisplaySleepDisabler.cpp (95516 => 95517)
--- trunk/Source/WebCore/platform/mac/DisplaySleepDisabler.cpp 2011-09-20 04:33:10 UTC (rev 95516)
+++ trunk/Source/WebCore/platform/mac/DisplaySleepDisabler.cpp 2011-09-20 06:33:57 UTC (rev 95517)
@@ -48,7 +48,7 @@
IOPMAssertionCreateWithName(kIOPMAssertionTypeNoDisplaySleep, kIOPMAssertionLevelOn, reasonCF.get(), &m_disableDisplaySleepAssertion);
#else
UNUSED_PARAM(reason);
- IOPMAssertionCreate(kIOPMAssertionTypeNoDisplaySleep, kIOPMAssertionLevelOn, &_idleDisplaySleepAssertion);
+ IOPMAssertionCreate(kIOPMAssertionTypeNoDisplaySleep, kIOPMAssertionLevelOn, &m_disableDisplaySleepAssertion);
m_systemActivityTimer.startRepeating(systemActivityInterval);
#endif
}
Modified: trunk/Source/WebCore/platform/mac/DisplaySleepDisabler.h (95516 => 95517)
--- trunk/Source/WebCore/platform/mac/DisplaySleepDisabler.h 2011-09-20 04:33:10 UTC (rev 95516)
+++ trunk/Source/WebCore/platform/mac/DisplaySleepDisabler.h 2011-09-20 06:33:57 UTC (rev 95517)
@@ -29,7 +29,7 @@
#include <wtf/Noncopyable.h>
#include <wtf/PassOwnPtr.h>
-#ifdef BUILDNG_ON_LEOPARD
+#ifdef BUILDING_ON_LEOPARD
#include "Timer.h"
#endif
@@ -44,12 +44,12 @@
private:
DisplaySleepDisabler(const char* reason);
-#ifdef BUILDNG_ON_LEOPARD
+#ifdef BUILDING_ON_LEOPARD
void systemActivityTimerFired(Timer<DisplaySleepDisabler>*);
#endif
uint32_t m_disableDisplaySleepAssertion;
-#ifdef BUILDNG_ON_LEOPARD
+#ifdef BUILDING_ON_LEOPARD
Timer<DisplaySleepDisabler> m_systemActivityTimer;
#endif
};
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
