Changeset 122421 in webkit

Timestamp:

Jul 11, 2012 11:18:09 PM (12 years ago)

Author:

mrowe@apple.com

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mac/DisplaySleepDisabler.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-11  Mark Rowe  <mrowe@apple.com>
+
+        <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  <falken@chromium.org>
 

trunk/Source/WebCore/platform/mac/DisplaySleepDisabler.cpp

@@ -32 +32 @@
 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
 #include <wtf/UnusedParam.h>
+#include <CoreServices/CoreServices.h>
 #endif
 
@@ -58 +59 @@
     IOPMAssertionRelease(m_disableDisplaySleepAssertion);
 }
-    
+
 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
 void DisplaySleepDisabler::systemActivityTimerFired(Timer<DisplaySleepDisabler>*)