Diff
Modified: trunk/Source/WebCore/ChangeLog (154111 => 154112)
--- trunk/Source/WebCore/ChangeLog 2013-08-15 18:09:32 UTC (rev 154111)
+++ trunk/Source/WebCore/ChangeLog 2013-08-15 18:48:27 UTC (rev 154112)
@@ -1,3 +1,41 @@
+2013-08-15 Eric Carlson <[email protected]>
+
+ [Mac] Remove "legacy" media UI
+ https://bugs.webkit.org/show_bug.cgi?id=119752
+
+ Reviewed by Jer Noble.
+
+ * WebCore.exp.in: Remove _wkMediaControllerThemeAvailable.
+
+ * platform/mac/WebCoreSystemInterface.h: Update for API change.
+ * platform/mac/WebCoreSystemInterface.mm: Ditto.
+
+ * rendering/RenderThemeMac.h: Don't override hasOwnDisabledStateHandlingFor.
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::adjustMediaSliderThumbSize): Remove code to deal with legacy theme.
+ (WebCore::getUnzoomedRectAndAdjustCurrentContext): Ditto.
+ (WebCore::RenderThemeMac::paintMediaFullscreenButton): wkDrawMediaUIPart doesn't need to know
+ the current theme.
+ (WebCore::RenderThemeMac::paintMediaMuteButton): Ditto.
+ (WebCore::RenderThemeMac::paintMediaPlayButton): Ditto.
+ (WebCore::RenderThemeMac::paintMediaSeekBackButton): Ditto.
+ (WebCore::RenderThemeMac::paintMediaSeekForwardButton): Ditto.
+ (WebCore::RenderThemeMac::paintMediaSliderTrack): Ditto.
+ (WebCore::RenderThemeMac::paintMediaSliderThumb): Ditto.
+ (WebCore::RenderThemeMac::paintMediaRewindButton): Ditto.
+ (WebCore::RenderThemeMac::paintMediaReturnToRealtimeButton): Ditto.
+ (WebCore::RenderThemeMac::paintMediaControlsBackground): Ditto.
+ (WebCore::RenderThemeMac::paintMediaCurrentTime): Ditto.
+ (WebCore::RenderThemeMac::paintMediaTimeRemaining): Ditto.
+ (WebCore::RenderThemeMac::paintMediaVolumeSliderContainer): Ditto.
+ (WebCore::RenderThemeMac::paintMediaVolumeSliderTrack): Ditto.
+ (WebCore::RenderThemeMac::paintMediaVolumeSliderThumb): Ditto.
+ (WebCore::RenderThemeMac::paintMediaFullScreenVolumeSliderTrack): Ditto.
+ (WebCore::RenderThemeMac::paintMediaFullScreenVolumeSliderThumb): Ditto.
+ (WebCore::RenderThemeMac::extraMediaControlsStyleSheet): We only have one theme.
+ (WebCore::RenderThemeMac::extraFullScreenStyleSheet): Ditto.
+ (WebCore::RenderThemeMac::usesMediaControlStatusDisplay): Ditto.
+
2013-08-15 Antti Koivisto <[email protected]>
<https://webkit.org/b/119834> Remove ElementShadow
Modified: trunk/Source/WebCore/WebCore.exp.in (154111 => 154112)
--- trunk/Source/WebCore/WebCore.exp.in 2013-08-15 18:09:32 UTC (rev 154111)
+++ trunk/Source/WebCore/WebCore.exp.in 2013-08-15 18:48:27 UTC (rev 154112)
@@ -1975,7 +1975,6 @@
_wkGetWheelEventDeltas
_wkHitTestMediaUIPart
_wkMeasureMediaUIPart
-_wkMediaControllerThemeAvailable
_wkPopupMenu
_wkQTClearMediaDownloadCache
_wkQTClearMediaDownloadCacheForSite
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (154111 => 154112)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2013-08-15 18:09:32 UTC (rev 154111)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2013-08-15 18:48:27 UTC (rev 154112)
@@ -146,9 +146,9 @@
extern NSFont* (*wkGetFontInLanguageForRange)(NSFont*, NSString*, NSRange);
extern NSFont* (*wkGetFontInLanguageForCharacter)(NSFont*, UniChar);
extern BOOL (*wkGetGlyphTransformedAdvances)(CGFontRef, NSFont*, CGAffineTransform*, ATSGlyphRef*, CGSize* advance);
-extern void (*wkDrawMediaSliderTrack)(int themeStyle, CGContextRef context, CGRect rect, float timeLoaded, float currentTime,
+extern void (*wkDrawMediaSliderTrack)(CGContextRef context, CGRect rect, float timeLoaded, float currentTime,
float duration, unsigned state);
-extern void (*wkDrawMediaUIPart)(int part, int themeStyle, CGContextRef context, CGRect rect, unsigned state);
+extern void (*wkDrawMediaUIPart)(int part, CGContextRef context, CGRect rect, unsigned state);
extern CFStringRef (*wkSignedPublicKeyAndChallengeString)(unsigned keySize, CFStringRef challenge, CFStringRef keyDescription);
extern NSString* (*wkGetPreferredExtensionForMIMEType)(NSString*);
extern NSArray* (*wkGetExtensionsForMIMEType)(NSString*);
@@ -159,8 +159,8 @@
extern BOOL (*wkGetNSURLResponseMustRevalidate)(NSURLResponse *response);
extern void (*wkGetWheelEventDeltas)(NSEvent*, float* deltaX, float* deltaY, BOOL* continuous);
extern UInt8 (*wkGetNSEventKeyChar)(NSEvent *);
-extern BOOL (*wkHitTestMediaUIPart)(int part, int themeStyle, CGRect bounds, CGPoint point);
-extern void (*wkMeasureMediaUIPart)(int part, int themeStyle, CGRect *bounds, CGSize *naturalSize);
+extern BOOL (*wkHitTestMediaUIPart)(int part, CGRect bounds, CGPoint point);
+extern void (*wkMeasureMediaUIPart)(int part, CGRect *bounds, CGSize *naturalSize);
extern NSView *(*wkCreateMediaUIBackgroundView)(void);
typedef enum {
@@ -177,7 +177,6 @@
extern void (*wkWindowSetAlpha)(NSWindow *, float);
extern void (*wkWindowSetScaledFrame)(NSWindow *, NSRect, NSRect);
-extern BOOL (*wkMediaControllerThemeAvailable)(int themeStyle);
extern void (*wkPopupMenu)(NSMenu*, NSPoint location, float width, NSView*, int selectedItem, NSFont*);
extern unsigned (*wkQTIncludeOnlyModernMediaFileTypes)(void);
extern int (*wkQTMovieDataRate)(QTMovie*);
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (154111 => 154112)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2013-08-15 18:09:32 UTC (rev 154111)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2013-08-15 18:48:27 UTC (rev 154112)
@@ -50,16 +50,15 @@
NSFont* (*wkGetFontInLanguageForRange)(NSFont*, NSString*, NSRange);
NSFont* (*wkGetFontInLanguageForCharacter)(NSFont*, UniChar);
BOOL (*wkGetGlyphTransformedAdvances)(CGFontRef, NSFont*, CGAffineTransform*, ATSGlyphRef*, CGSize* advance);
-void (*wkDrawMediaSliderTrack)(int themeStyle, CGContextRef context, CGRect rect, float timeLoaded, float currentTime,
+void (*wkDrawMediaSliderTrack)(CGContextRef context, CGRect rect, float timeLoaded, float currentTime,
float duration, unsigned state);
-BOOL (*wkHitTestMediaUIPart)(int part, int themeStyle, CGRect bounds, CGPoint point);
-void (*wkDrawMediaUIPart)(int part, int themeStyle, CGContextRef context, CGRect rect, unsigned state);
-void (*wkMeasureMediaUIPart)(int part, int themeStyle, CGRect *bounds, CGSize *naturalSize);
+BOOL (*wkHitTestMediaUIPart)(int part, CGRect bounds, CGPoint point);
+void (*wkDrawMediaUIPart)(int part, CGContextRef context, CGRect rect, unsigned state);
+void (*wkMeasureMediaUIPart)(int part, CGRect *bounds, CGSize *naturalSize);
NSView *(*wkCreateMediaUIBackgroundView)(void);
NSControl *(*wkCreateMediaUIControl)(int);
void (*wkWindowSetAlpha)(NSWindow *, float);
void (*wkWindowSetScaledFrame)(NSWindow *, NSRect, NSRect);
-BOOL (*wkMediaControllerThemeAvailable)(int themeStyle);
NSString* (*wkGetPreferredExtensionForMIMEType)(NSString*);
CFStringRef (*wkSignedPublicKeyAndChallengeString)(unsigned keySize, CFStringRef challenge, CFStringRef keyDescription);
NSArray* (*wkGetExtensionsForMIMEType)(NSString*);
Modified: trunk/Source/WebCore/rendering/RenderThemeMac.h (154111 => 154112)
--- trunk/Source/WebCore/rendering/RenderThemeMac.h 2013-08-15 18:09:32 UTC (rev 154111)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.h 2013-08-15 18:48:27 UTC (rev 154112)
@@ -130,9 +130,7 @@
virtual String extraFullScreenStyleSheet();
#endif
- virtual bool hasOwnDisabledStateHandlingFor(ControlPart) const;
- virtual bool usesMediaControlStatusDisplay();
- virtual bool usesMediaControlVolumeSlider() const;
+ virtual bool usesMediaControlStatusDisplay() { return true; }
virtual void adjustMediaSliderThumbSize(RenderStyle*) const;
virtual IntPoint volumeSliderOffsetFromMuteButton(RenderBox*, const IntSize&) const OVERRIDE;
#endif
Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (154111 => 154112)
--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2013-08-15 18:09:32 UTC (rev 154111)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2013-08-15 18:48:27 UTC (rev 154112)
@@ -182,33 +182,6 @@
#if ENABLE(VIDEO)
-typedef enum {
- MediaControllerThemeClassic = 1,
- MediaControllerThemeQuickTime = 2
-} MediaControllerThemeStyle;
-
-static int mediaControllerTheme()
-{
- static int controllerTheme = -1;
-
- if (controllerTheme != -1)
- return controllerTheme;
-
- controllerTheme = MediaControllerThemeClassic;
-
- Boolean validKey;
- Boolean useQTMediaUIPref = CFPreferencesGetAppBooleanValue(CFSTR("UseQuickTimeMediaUI"), CFSTR("com.apple.WebCore"), &validKey);
-
- if (validKey && !useQTMediaUIPref)
- return controllerTheme;
-
- controllerTheme = MediaControllerThemeQuickTime;
- return controllerTheme;
-}
-
-const int mediaSliderThumbWidth = 13;
-const int mediaSliderThumbHeight = 14;
-
void RenderThemeMac::adjustMediaSliderThumbSize(RenderStyle* style) const
{
int wkPart;
@@ -226,16 +199,11 @@
return;
}
- int width = mediaSliderThumbWidth;
- int height = mediaSliderThumbHeight;
+ CGSize size;
+ wkMeasureMediaUIPart(wkPart, NULL, &size);
+ int width = size.width;
+ int height = size.height;
- if (mediaControllerTheme() == MediaControllerThemeQuickTime) {
- CGSize size;
- wkMeasureMediaUIPart(wkPart, MediaControllerThemeQuickTime, NULL, &size);
- width = size.width;
- height = size.height;
- }
-
float zoomLevel = style->effectiveZoom();
style->setWidth(Length(static_cast<int>(width * zoomLevel), Fixed));
style->setHeight(Length(static_cast<int>(height * zoomLevel), Fixed));
@@ -263,7 +231,7 @@
{
float zoomLevel = o->style()->effectiveZoom();
FloatRect unzoomedRect(originalRect);
- if (zoomLevel != 1.0f && mediaControllerTheme() == MediaControllerThemeQuickTime) {
+ if (zoomLevel != 1.0f) {
unzoomedRect.setWidth(unzoomedRect.width() / zoomLevel);
unzoomedRect.setHeight(unzoomedRect.height() / zoomLevel);
paintInfo.context->translate(unzoomedRect.x(), unzoomedRect.y());
@@ -281,7 +249,7 @@
if (node->isMediaControlElement()) {
LocalCurrentGraphicsContext localContext(paintInfo.context);
- wkDrawMediaUIPart(mediaControlElementType(node), mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
+ wkDrawMediaUIPart(mediaControlElementType(node), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
}
return false;
}
@@ -295,7 +263,7 @@
if (node->isMediaControlElement()) {
LocalCurrentGraphicsContext localContext(paintInfo.context);
- wkDrawMediaUIPart(mediaControlElementType(node), mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
+ wkDrawMediaUIPart(mediaControlElementType(node), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
}
return false;
}
@@ -309,7 +277,7 @@
if (node->isMediaControlElement()) {
LocalCurrentGraphicsContext localContext(paintInfo.context);
- wkDrawMediaUIPart(mediaControlElementType(node), mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
+ wkDrawMediaUIPart(mediaControlElementType(node), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
}
return false;
}
@@ -321,7 +289,7 @@
return false;
LocalCurrentGraphicsContext localContext(paintInfo.context);
- wkDrawMediaUIPart(MediaSeekBackButton, mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
+ wkDrawMediaUIPart(MediaSeekBackButton, localContext.cgContext(), r, getMediaUIPartStateFlags(node));
return false;
}
@@ -332,7 +300,7 @@
return false;
LocalCurrentGraphicsContext localContext(paintInfo.context);
- wkDrawMediaUIPart(MediaSeekForwardButton, mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
+ wkDrawMediaUIPart(MediaSeekForwardButton, localContext.cgContext(), r, getMediaUIPartStateFlags(node));
return false;
}
@@ -358,7 +326,7 @@
CGContextRef context = cgContextContainer.context();
GraphicsContextStateSaver stateSaver(*paintInfo.context);
FloatRect unzoomedRect = getUnzoomedRectAndAdjustCurrentContext(o, paintInfo, r);
- wkDrawMediaSliderTrack(mediaControllerTheme(), context, unzoomedRect,
+ wkDrawMediaSliderTrack(context, unzoomedRect,
timeLoaded, currentTime, duration, getMediaUIPartStateFlags(node));
return false;
}
@@ -370,7 +338,7 @@
return false;
LocalCurrentGraphicsContext localContext(paintInfo.context);
- wkDrawMediaUIPart(MediaSliderThumb, mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
+ wkDrawMediaUIPart(MediaSliderThumb, localContext.cgContext(), r, getMediaUIPartStateFlags(node));
return false;
}
@@ -381,7 +349,7 @@
return false;
LocalCurrentGraphicsContext localContext(paintInfo.context);
- wkDrawMediaUIPart(MediaRewindButton, mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
+ wkDrawMediaUIPart(MediaRewindButton, localContext.cgContext(), r, getMediaUIPartStateFlags(node));
return false;
}
@@ -392,7 +360,7 @@
return false;
LocalCurrentGraphicsContext localContext(paintInfo.context);
- wkDrawMediaUIPart(MediaReturnToRealtimeButton, mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
+ wkDrawMediaUIPart(MediaReturnToRealtimeButton, localContext.cgContext(), r, getMediaUIPartStateFlags(node));
return false;
}
@@ -403,7 +371,7 @@
return false;
LocalCurrentGraphicsContext localContext(paintInfo.context);
- wkDrawMediaUIPart(MediaTimelineContainer, mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
+ wkDrawMediaUIPart(MediaTimelineContainer, localContext.cgContext(), r, getMediaUIPartStateFlags(node));
return false;
}
@@ -416,7 +384,7 @@
ContextContainer cgContextContainer(paintInfo.context);
GraphicsContextStateSaver stateSaver(*paintInfo.context);
FloatRect unzoomedRect = getUnzoomedRectAndAdjustCurrentContext(o, paintInfo, r);
- wkDrawMediaUIPart(MediaCurrentTimeDisplay, mediaControllerTheme(), cgContextContainer.context(), unzoomedRect, getMediaUIPartStateFlags(node));
+ wkDrawMediaUIPart(MediaCurrentTimeDisplay, cgContextContainer.context(), unzoomedRect, getMediaUIPartStateFlags(node));
return false;
}
@@ -429,7 +397,7 @@
ContextContainer cgContextContainer(paintInfo.context);
GraphicsContextStateSaver stateSaver(*paintInfo.context);
FloatRect unzoomedRect = getUnzoomedRectAndAdjustCurrentContext(o, paintInfo, r);
- wkDrawMediaUIPart(MediaTimeRemainingDisplay, mediaControllerTheme(), cgContextContainer.context(), unzoomedRect, getMediaUIPartStateFlags(node));
+ wkDrawMediaUIPart(MediaTimeRemainingDisplay, cgContextContainer.context(), unzoomedRect, getMediaUIPartStateFlags(node));
return false;
}
@@ -440,7 +408,7 @@
return false;
LocalCurrentGraphicsContext localContext(paintInfo.context);
- wkDrawMediaUIPart(MediaVolumeSliderContainer, mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
+ wkDrawMediaUIPart(MediaVolumeSliderContainer, localContext.cgContext(), r, getMediaUIPartStateFlags(node));
return false;
}
@@ -451,7 +419,7 @@
return false;
LocalCurrentGraphicsContext localContext(paintInfo.context);
- wkDrawMediaUIPart(MediaVolumeSlider, mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
+ wkDrawMediaUIPart(MediaVolumeSlider, localContext.cgContext(), r, getMediaUIPartStateFlags(node));
return false;
}
@@ -462,7 +430,7 @@
return false;
LocalCurrentGraphicsContext localContext(paintInfo.context);
- wkDrawMediaUIPart(MediaVolumeSliderThumb, mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
+ wkDrawMediaUIPart(MediaVolumeSliderThumb, localContext.cgContext(), r, getMediaUIPartStateFlags(node));
return false;
}
@@ -473,7 +441,7 @@
return false;
LocalCurrentGraphicsContext localContext(paintInfo.context);
- wkDrawMediaUIPart(MediaFullScreenVolumeSlider, mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
+ wkDrawMediaUIPart(MediaFullScreenVolumeSlider, localContext.cgContext(), r, getMediaUIPartStateFlags(node));
return false;
}
@@ -484,46 +452,22 @@
return false;
LocalCurrentGraphicsContext localContext(paintInfo.context);
- wkDrawMediaUIPart(MediaFullScreenVolumeSliderThumb, mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
+ wkDrawMediaUIPart(MediaFullScreenVolumeSliderThumb, localContext.cgContext(), r, getMediaUIPartStateFlags(node));
return false;
}
String RenderThemeMac::extraMediaControlsStyleSheet()
{
- if (mediaControllerTheme() == MediaControllerThemeQuickTime)
- return String(mediaControlsQuickTimeUserAgentStyleSheet, sizeof(mediaControlsQuickTimeUserAgentStyleSheet));
-
- return String();
+ return String(mediaControlsQuickTimeUserAgentStyleSheet, sizeof(mediaControlsQuickTimeUserAgentStyleSheet));
}
#if ENABLE(FULLSCREEN_API)
String RenderThemeMac::extraFullScreenStyleSheet()
{
- if (mediaControllerTheme() == MediaControllerThemeQuickTime)
- return String(fullscreenQuickTimeUserAgentStyleSheet, sizeof(fullscreenQuickTimeUserAgentStyleSheet));
-
- return String();
+ return String(fullscreenQuickTimeUserAgentStyleSheet, sizeof(fullscreenQuickTimeUserAgentStyleSheet));
}
#endif
-bool RenderThemeMac::hasOwnDisabledStateHandlingFor(ControlPart part) const
-{
- if (part == MediaMuteButtonPart)
- return false;
-
- return mediaControllerTheme() == MediaControllerThemeClassic;
-}
-
-bool RenderThemeMac::usesMediaControlStatusDisplay()
-{
- return mediaControllerTheme() == MediaControllerThemeQuickTime;
-}
-
-bool RenderThemeMac::usesMediaControlVolumeSlider() const
-{
- return mediaControllerTheme() == MediaControllerThemeQuickTime;
-}
-
IntPoint RenderThemeMac::volumeSliderOffsetFromMuteButton(RenderBox* muteButtonBox, const IntSize& size) const
{
return RenderMediaControls::volumeSliderOffsetFromMuteButton(muteButtonBox, size);
Modified: trunk/Source/WebKit/mac/ChangeLog (154111 => 154112)
--- trunk/Source/WebKit/mac/ChangeLog 2013-08-15 18:09:32 UTC (rev 154111)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-08-15 18:48:27 UTC (rev 154112)
@@ -1,3 +1,13 @@
+2013-08-15 Eric Carlson <[email protected]>
+
+ [Mac] Remove "legacy" media UI
+ https://bugs.webkit.org/show_bug.cgi?id=119752
+
+ Reviewed by Jer Noble.
+
+ * WebCoreSupport/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface): Remove MediaControllerThemeAvailable.
+
2013-08-14 Tim Horton <[email protected]>
Remotely hosted plugins don’t work in window-server-hosted WebKit1 views
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (154111 => 154112)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2013-08-15 18:09:32 UTC (rev 154111)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2013-08-15 18:48:27 UTC (rev 154112)
@@ -89,7 +89,6 @@
INIT(CreateMediaUIControl);
INIT(WindowSetAlpha);
INIT(WindowSetScaledFrame);
- INIT(MediaControllerThemeAvailable);
INIT(PopupMenu);
INIT(SetBaseCTM);
INIT(SetCGFontRenderingMode);
Modified: trunk/Source/WebKit2/ChangeLog (154111 => 154112)
--- trunk/Source/WebKit2/ChangeLog 2013-08-15 18:09:32 UTC (rev 154111)
+++ trunk/Source/WebKit2/ChangeLog 2013-08-15 18:48:27 UTC (rev 154112)
@@ -1,3 +1,13 @@
+2013-08-15 Eric Carlson <[email protected]>
+
+ [Mac] Remove "legacy" media UI
+ https://bugs.webkit.org/show_bug.cgi?id=119752
+
+ Reviewed by Jer Noble.
+
+ * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface): Remove MediaControllerThemeAvailable.
+
2013-08-14 Dean Jackson <[email protected]>
<https://webkit.org/b/119827> Allow primary plug-in detection to run more than once if necessary
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (154111 => 154112)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2013-08-15 18:09:32 UTC (rev 154111)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2013-08-15 18:48:27 UTC (rev 154112)
@@ -77,7 +77,6 @@
INIT(HitTestMediaUIPart);
INIT(InitializeMaximumHTTPConnectionCountPerHost);
INIT(MeasureMediaUIPart);
- INIT(MediaControllerThemeAvailable);
INIT(PopupMenu);
INIT(QTIncludeOnlyModernMediaFileTypes);
INIT(QTMovieDataRate);
Modified: trunk/WebKitLibraries/ChangeLog (154111 => 154112)
--- trunk/WebKitLibraries/ChangeLog 2013-08-15 18:09:32 UTC (rev 154111)
+++ trunk/WebKitLibraries/ChangeLog 2013-08-15 18:48:27 UTC (rev 154112)
@@ -1,3 +1,14 @@
+2013-08-15 Eric Carlson <[email protected]>
+
+ [Mac] Remove "legacy" media UI
+ https://bugs.webkit.org/show_bug.cgi?id=119752
+
+ Reviewed by Jer Noble.
+
+ * WebKitSystemInterface.h:
+ * libWebKitSystemInterfaceLion.a:
+ * libWebKitSystemInterfaceMountainLion.a:
+
2013-08-13 Simon Fraser <[email protected]>
Various media tests spew "CGContextScaleCTM: invalid context 0x0" errors
Modified: trunk/WebKitLibraries/WebKitSystemInterface.h (154111 => 154112)
--- trunk/WebKitLibraries/WebKitSystemInterface.h 2013-08-15 18:09:32 UTC (rev 154111)
+++ trunk/WebKitLibraries/WebKitSystemInterface.h 2013-08-15 18:48:27 UTC (rev 154112)
@@ -41,7 +41,6 @@
NSString *WKGetMIMETypeForExtension(NSString *extension);
NSDate *WKGetNSURLResponseLastModifiedDate(NSURLResponse *response);
-NSTimeInterval WKGetNSURLResponseFreshnessLifetime(NSURLResponse *response);
NSString *WKCopyNSURLResponseStatusLine(NSURLResponse *response);
CFArrayRef WKCopyNSURLResponseCertificateChain(NSURLResponse *response);
@@ -298,22 +297,16 @@
} WKMediaUIPart;
typedef enum {
- WKMediaControllerThemeClassic = 1,
- WKMediaControllerThemeQuickTime = 2
-} WKMediaControllerThemeStyle;
-
-typedef enum {
WKMediaControllerFlagDisabled = 1 << 0,
WKMediaControllerFlagPressed = 1 << 1,
WKMediaControllerFlagDrawEndCaps = 1 << 3,
WKMediaControllerFlagFocused = 1 << 4
} WKMediaControllerThemeState;
-BOOL WKMediaControllerThemeAvailable(int themeStyle);
-BOOL WKHitTestMediaUIPart(int part, int themeStyle, CGRect bounds, CGPoint point);
-void WKMeasureMediaUIPart(int part, int themeStyle, CGRect *bounds, CGSize *naturalSize);
-void WKDrawMediaUIPart(int part, int themeStyle, CGContextRef context, CGRect rect, unsigned state);
-void WKDrawMediaSliderTrack(int themeStyle, CGContextRef context, CGRect rect, float timeLoaded, float currentTime, float duration, unsigned state);
+BOOL WKHitTestMediaUIPart(int part, CGRect bounds, CGPoint point);
+void WKMeasureMediaUIPart(int part, CGRect *bounds, CGSize *naturalSize);
+void WKDrawMediaUIPart(int part, CGContextRef context, CGRect rect, unsigned state);
+void WKDrawMediaSliderTrack(CGContextRef context, CGRect rect, float timeLoaded, float currentTime, float duration, unsigned state);
NSView *WKCreateMediaUIBackgroundView(void);
typedef enum {
Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceLion.a
(Binary files differ)
Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a
(Binary files differ)
