Title: [122421] trunk/Source/WebCore
- Revision
- 122421
- Author
- [email protected]
- Date
- 2012-07-11 23:18:09 -0700 (Wed, 11 Jul 2012)
Log Message
<http://webkit.org/b/91051> Fix the Qt Mac build after r122400.
Qt on Mac builds with a deployment target of OS X 10.5. However, it was not been setting
BUILDING_ON_LEOPARD / TARGETING_LEOPARD and thus was falling down code paths in DisplaySleepDisabler.cpp
that were specific to Snow Leopard and newer. After the removal of BUILDING_ON_LEOPARD
and TARGETING_LEOPARD it ended up falling down the correct Leopard-compatible code path,
which revealed that the code made assumptions about which headers had already been included.
* platform/mac/DisplaySleepDisabler.cpp: Include CoreServices/CoreServices.h to pull in
a declaration of UpdateSystemActivity when targeting Leopard.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (122420 => 122421)
--- trunk/Source/WebCore/ChangeLog 2012-07-12 05:33:03 UTC (rev 122420)
+++ trunk/Source/WebCore/ChangeLog 2012-07-12 06:18:09 UTC (rev 122421)
@@ -1,3 +1,16 @@
+2012-07-11 Mark Rowe <[email protected]>
+
+ <http://webkit.org/b/91051> Fix the Qt Mac build after r122400.
+
+ Qt on Mac builds with a deployment target of OS X 10.5. However, it was not been setting
+ BUILDING_ON_LEOPARD / TARGETING_LEOPARD and thus was falling down code paths in DisplaySleepDisabler.cpp
+ that were specific to Snow Leopard and newer. After the removal of BUILDING_ON_LEOPARD
+ and TARGETING_LEOPARD it ended up falling down the correct Leopard-compatible code path,
+ which revealed that the code made assumptions about which headers had already been included.
+
+ * platform/mac/DisplaySleepDisabler.cpp: Include CoreServices/CoreServices.h to pull in
+ a declaration of UpdateSystemActivity when targeting Leopard.
+
2012-07-11 Matt Falkenhagen <[email protected]>
Add dialog element feature toggle to InternalSettings
Modified: trunk/Source/WebCore/platform/mac/DisplaySleepDisabler.cpp (122420 => 122421)
--- trunk/Source/WebCore/platform/mac/DisplaySleepDisabler.cpp 2012-07-12 05:33:03 UTC (rev 122420)
+++ trunk/Source/WebCore/platform/mac/DisplaySleepDisabler.cpp 2012-07-12 06:18:09 UTC (rev 122421)
@@ -31,6 +31,7 @@
#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
#include <wtf/UnusedParam.h>
+#include <CoreServices/CoreServices.h>
#endif
namespace WebCore {
@@ -57,7 +58,7 @@
{
IOPMAssertionRelease(m_disableDisplaySleepAssertion);
}
-
+
#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
void DisplaySleepDisabler::systemActivityTimerFired(Timer<DisplaySleepDisabler>*)
{
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
