From 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 2 Jun 2011 12:07:03 +0100 Subject: Merge WebKit at r84325: Initial merge by git. Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b --- Source/WebCore/rendering/RenderThemeChromiumMac.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Source/WebCore/rendering/RenderThemeChromiumMac.h') diff --git a/Source/WebCore/rendering/RenderThemeChromiumMac.h b/Source/WebCore/rendering/RenderThemeChromiumMac.h index 4fd371f..dcb23dd 100644 --- a/Source/WebCore/rendering/RenderThemeChromiumMac.h +++ b/Source/WebCore/rendering/RenderThemeChromiumMac.h @@ -38,16 +38,18 @@ protected: virtual bool paintMediaMuteButton(RenderObject*, const PaintInfo&, const IntRect&); virtual bool paintMediaSliderTrack(RenderObject*, const PaintInfo&, const IntRect&); virtual bool paintMediaControlsBackground(RenderObject*, const PaintInfo&, const IntRect&); - virtual bool shouldRenderMediaControlPart(ControlPart, Element*); virtual String extraMediaControlsStyleSheet(); - +#if ENABLE(FULLSCREEN_API) + virtual String extraFullScreenStyleSheet(); +#endif + virtual bool paintMediaSliderThumb(RenderObject*, const PaintInfo&, const IntRect&); virtual bool paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo&, const IntRect&); virtual bool paintMediaVolumeSliderTrack(RenderObject*, const PaintInfo&, const IntRect&); virtual bool paintMediaVolumeSliderThumb(RenderObject*, const PaintInfo&, const IntRect&); virtual IntPoint volumeSliderOffsetFromMuteButton(RenderBox*, const IntSize&) const; virtual bool usesMediaControlStatusDisplay() { return false; } - + virtual bool hasOwnDisabledStateHandlingFor(ControlPart) const { return true; } #endif virtual bool usesTestModeFocusRingColor() const; -- cgit v1.1