Modified: trunk/Source/WebCore/ChangeLog (89386 => 89387)
--- trunk/Source/WebCore/ChangeLog 2011-06-21 22:31:21 UTC (rev 89386)
+++ trunk/Source/WebCore/ChangeLog 2011-06-21 22:35:00 UTC (rev 89387)
@@ -1,3 +1,16 @@
+2011-06-21 Alexey Proskuryakov <a...@apple.com>
+
+ Fix Mac build in some configurations.
+
+ * platform/mac/WebCoreSystemInterface.h: Added an enum matching WKSI one, since we cannot use
+ WKSI in WebCore.
+
+ * platform/mac/WebVideoFullscreenHUDWindowController.mm: Removed an include of WebKitSystemInterface.h.
+ It's not meant to be used from WebCore, and if included, a wrong copy may be used.
+ (createControlWithMediaUIControlType): Added a FIXME about problems with Leopard build.
+ (-[WebVideoFullscreenHUDWindowController windowDidLoad]): Ditto. Switched enum values to
+ WCSI style (lower level "wk").
+
2011-06-21 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r89354.
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (89386 => 89387)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2011-06-21 22:31:21 UTC (rev 89386)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2011-06-21 22:35:00 UTC (rev 89387)
@@ -157,7 +157,19 @@
extern BOOL (*wkHitTestMediaUIPart)(int part, int themeStyle, CGRect bounds, CGPoint point);
extern void (*wkMeasureMediaUIPart)(int part, int themeStyle, CGRect *bounds, CGSize *naturalSize);
extern NSView *(*wkCreateMediaUIBackgroundView)(void);
+
+typedef enum {
+ wkMediaUIControlTimeline,
+ wkMediaUIControlSlider,
+ wkMediaUIControlPlayPauseButton,
+ wkMediaUIControlExitFullscreenButton,
+ wkMediaUIControlRewindButton,
+ wkMediaUIControlFastForwardButton,
+ wkMediaUIControlVolumeUpButton,
+ wkMediaUIControlVolumeDownButton
+};
extern NSControl *(*wkCreateMediaUIControl)(int);
+
extern void (*wkWindowSetAlpha)(NSWindow *, float);
extern void (*wkWindowSetScaledFrame)(NSWindow *, NSRect, NSRect);
extern BOOL (*wkMediaControllerThemeAvailable)(int themeStyle);
Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm (89386 => 89387)
--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm 2011-06-21 22:31:21 UTC (rev 89386)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm 2011-06-21 22:35:00 UTC (rev 89387)
@@ -33,7 +33,6 @@
#import <_javascript_Core/RetainPtr.h>
#import <_javascript_Core/UnusedParam.h>
#import <WebCore/HTMLMediaElement.h>
-#import <WebKitSystemInterface.h>
using namespace WebCore;
using namespace std;
@@ -284,6 +283,8 @@
}
#ifndef HAVE_MEDIA_CONTROL
+// FIXME: This code is never compiled, because HAVE_MEDIA_CONTROL is always defined to something, even on Leopard.
+// FIXME: Values in this enum have a different order than ones in WKMediaUIControlType.
enum {
WKMediaUIControlPlayPauseButton,
WKMediaUIControlRewindButton,
@@ -303,6 +304,7 @@
[control setFrame:frame];
return control;
#else
+ // FIXME: This code is never compiled, because HAVE_MEDIA_CONTROL is always defined to something, even on Leopard.
if (controlType == wkMediaUIControlSlider)
return [[NSSlider alloc] initWithFrame:frame];
return [[NSControl alloc] initWithFrame:frame];
@@ -350,6 +352,7 @@
#ifdef HAVE_MEDIA_CONTROL
NSView *background = ""
#else
+ // FIXME: This code is never compiled, because HAVE_MEDIA_CONTROL is always defined to something, even on Leopard.
NSView *background = "" alloc] init];
#endif
[window setContentView:background];
@@ -360,14 +363,14 @@
NSView *contentView = [window contentView];
CGFloat center = webkit_CGFloor((windowWidth - playButtonWidth) / 2);
- _playButton = (NSButton *)createControlWithMediaUIControlType(WKMediaUIControlPlayPauseButton, NSMakeRect(center, windowHeight - playButtonTopMargin - playButtonHeight, playButtonWidth, playButtonHeight));
+ _playButton = (NSButton *)createControlWithMediaUIControlType(wkMediaUIControlPlayPauseButton, NSMakeRect(center, windowHeight - playButtonTopMargin - playButtonHeight, playButtonWidth, playButtonHeight));
ASSERT([_playButton isKindOfClass:[NSButton class]]);
[_playButton setTarget:self];
[_playButton setAction:@selector(togglePlaying:)];
[contentView addSubview:_playButton];
CGFloat closeToRight = windowWidth - horizontalMargin - exitFullscreenButtonWidth;
- NSControl *exitFullscreenButton = createControlWithMediaUIControlType(WKMediaUIControlExitFullscreenButton, NSMakeRect(closeToRight, windowHeight - exitFullscreenButtonTopMargin - exitFullscreenButtonHeight, exitFullscreenButtonWidth, exitFullscreenButtonHeight));
+ NSControl *exitFullscreenButton = createControlWithMediaUIControlType(wkMediaUIControlExitFullscreenButton, NSMakeRect(closeToRight, windowHeight - exitFullscreenButtonTopMargin - exitFullscreenButtonHeight, exitFullscreenButtonWidth, exitFullscreenButtonHeight));
[exitFullscreenButton setAction:@selector(exitFullscreen:)];
[exitFullscreenButton setTarget:self];
[contentView addSubview:exitFullscreenButton];
@@ -375,29 +378,30 @@
CGFloat volumeControlsBottom = windowHeight - volumeControlsTopMargin - volumeButtonHeight;
CGFloat left = horizontalMargin;
- NSControl *volumeDownButton = createControlWithMediaUIControlType(WKMediaUIControlVolumeDownButton, NSMakeRect(left, volumeControlsBottom, volumeButtonWidth, volumeButtonHeight));
+ NSControl *volumeDownButton = createControlWithMediaUIControlType(wkMediaUIControlVolumeDownButton, NSMakeRect(left, volumeControlsBottom, volumeButtonWidth, volumeButtonHeight));
[contentView addSubview:volumeDownButton];
[volumeDownButton setTarget:self];
[volumeDownButton setAction:@selector(setVolumeToZero:)];
[volumeDownButton release];
left += volumeButtonWidth;
- _volumeSlider = createControlWithMediaUIControlType(WKMediaUIControlSlider, NSMakeRect(left, volumeControlsBottom + webkit_CGFloor((volumeButtonHeight - volumeSliderHeight) / 2), volumeSliderWidth, volumeSliderHeight));
+ _volumeSlider = createControlWithMediaUIControlType(wkMediaUIControlSlider, NSMakeRect(left, volumeControlsBottom + webkit_CGFloor((volumeButtonHeight - volumeSliderHeight) / 2), volumeSliderWidth, volumeSliderHeight));
[_volumeSlider setValue:[NSNumber numberWithDouble:[self maxVolume]] forKey:@"maxValue"];
[_volumeSlider setTarget:self];
[_volumeSlider setAction:@selector(volumeChanged:)];
[contentView addSubview:_volumeSlider];
left += volumeSliderWidth + volumeUpButtonLeftMargin;
- NSControl *volumeUpButton = createControlWithMediaUIControlType(WKMediaUIControlVolumeUpButton, NSMakeRect(left, volumeControlsBottom, volumeButtonWidth, volumeButtonHeight));
+ NSControl *volumeUpButton = createControlWithMediaUIControlType(wkMediaUIControlVolumeUpButton, NSMakeRect(left, volumeControlsBottom, volumeButtonWidth, volumeButtonHeight));
[volumeUpButton setTarget:self];
[volumeUpButton setAction:@selector(setVolumeToMaximum:)];
[contentView addSubview:volumeUpButton];
[volumeUpButton release];
#ifdef HAVE_MEDIA_CONTROL
- _timeline = wkCreateMediaUIControl(WKMediaUIControlTimeline);
+ _timeline = wkCreateMediaUIControl(wkMediaUIControlTimeline);
#else
+ // FIXME: This code is never compiled, because HAVE_MEDIA_CONTROL is always defined to something, even on Leopard.
_timeline = [[NSSlider alloc] init];
#endif
[_timeline setTarget:self];
