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/RenderThemeWin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/WebCore/rendering/RenderThemeWin.h') diff --git a/Source/WebCore/rendering/RenderThemeWin.h b/Source/WebCore/rendering/RenderThemeWin.h index 7e0223a..7e8a491 100644 --- a/Source/WebCore/rendering/RenderThemeWin.h +++ b/Source/WebCore/rendering/RenderThemeWin.h @@ -124,7 +124,7 @@ public: #if ENABLE(VIDEO) virtual String extraMediaControlsStyleSheet(); - virtual bool shouldRenderMediaControlPart(ControlPart, Element*); + virtual bool supportsClosedCaptioning() const; virtual bool paintMediaControlsBackground(RenderObject*, const PaintInfo&, const IntRect&); virtual bool paintMediaFullscreenButton(RenderObject*, const PaintInfo&, const IntRect&); virtual bool paintMediaMuteButton(RenderObject*, const PaintInfo&, const IntRect&); -- cgit v1.1