Changeset 45576 in webkit

Timestamp:

Jul 6, 2009 5:44:23 PM (15 years ago)

Author:

eric.carlson@apple.com

Message:

2009-07-06 Eric Carlson <​eric.carlson@apple.com>

Reviewed by Simon Fraser.

<rdar://problem/7035474> Make new media controller UI default on SnowLeopard

• rendering/RenderThemeMac.mm: (WebCore::mediaControllerTheme):

New media controller UI is enabled by default on SnowLeopard.

2009-07-06 Eric Carlson <​eric.carlson@apple.com>

Reviewed by Simon Fraser.

<rdar://problem/7035474> Make new media controller UI default on SnowLeopard

Disable media tests that depend on controller size/position on SnowLeopard until
<rdar://problem/6502936> Update run-webkit-tests to deal with new media controller look
has been fixed

• platform/mac-snowleopard/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-snowleopard/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderThemeMac.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-07-06  Eric Carlson  <eric.carlson@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        <rdar://problem/7035474> Make new media controller UI default on SnowLeopard
+
+        Disable media tests that depend on controller size/position on SnowLeopard until
+        <rdar://problem/6502936> Update run-webkit-tests to deal with new media controller look
+        has been fixed
+
+        * platform/mac-snowleopard/Skipped:
+
 2009-07-06  Shinichiro Hamaji  <hamaji@chromium.org>
 

trunk/LayoutTests/platform/mac-snowleopard/Skipped

@@ -25 +25 @@
 svg/custom/viewbox-syntax.svg
 svg/hixie/perf/007.xml
+
+# Disable media tests that depend on controller size/position until
+# <rdar://problem/6502936> Update run-webkit-tests to deal with new media controller look
+# has been fixed
+media/audio-controls-rendering.html
+media/controls-strict.html
+media/video-controls-rendering.html
+media/video-controls-transformed.html
+media/video-controls-visible-audio-only.html
+media/video-controls-zoomed.html
+media/video-display-toggle.html
+media/video-empty-source.html
+media/video-zoom-controls.html

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-07-06  Eric Carlson  <eric.carlson@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        <rdar://problem/7035474> Make new media controller UI default on SnowLeopard
+
+        * rendering/RenderThemeMac.mm:
+        (WebCore::mediaControllerTheme):
+            New media controller UI is enabled by default on SnowLeopard.
+
 2009-07-06  Nate Chapin  <japhet@chromium.org>
 

trunk/WebCore/rendering/RenderThemeMac.mm

@@ -1424 +1424 @@
     static const long minimumQuickTimeVersion = 0x07600000; // 7.6
     static SInt32 quickTimeVersion = 0;
+    static int controllerTheme = -1;
+    
+    if (controllerTheme != -1)
+        return controllerTheme;
+
+    controllerTheme = MediaControllerThemeClassic;
 
     if (!quickTimeVersion) {
@@ -1429 +1435 @@
         err = Gestalt(gestaltQuickTime, &quickTimeVersion);
         if (err != noErr)
-            return MediaControllerThemeClassic;
+            return controllerTheme;
     }
     if (quickTimeVersion < minimumQuickTimeVersion)
-        return MediaControllerThemeClassic;
-
-    // keep the feature off for now without an explicit opt-in
+        return controllerTheme;
+
     Boolean validKey;
     Boolean useQTMediaUI = CFPreferencesGetAppBooleanValue(CFSTR("UseQuickTimeMediaUI"), CFSTR("com.apple.WebCore"), &validKey);
+
+#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+    if (validKey && !useQTMediaUI)
+        return controllerTheme;
+#else
     if (!validKey || !useQTMediaUI)
-        return MediaControllerThemeClassic;
-
-    return MediaControllerThemeQT;
+        return controllerTheme;
+#endif
+
+    controllerTheme = MediaControllerThemeQT;
+    return controllerTheme;
 }
 #endif