[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
simon.fraser at apple.com
simon.fraser at apple.com
Thu Oct 29 20:39:37 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 9eba7146bce04a3be175a7e7d74c58906d2fb781
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 6 00:40:02 2009 +0000
2009-10-05 Simon Fraser <simon.fraser at apple.com>
Fix the build: MediaControllerThemeQT was renamed to MediaControllerThemeQuickTime.
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::shouldRenderMediaControlPart):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49137 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 643e1b9..4b50267 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-05 Simon Fraser <simon.fraser at apple.com>
+
+ Fix the build: MediaControllerThemeQT was renamed to MediaControllerThemeQuickTime.
+
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::shouldRenderMediaControlPart):
+
2009-10-05 Pierre d'Herbemont <pdherbemont at webkit.org>
Reviewed by Simon Fraser
diff --git a/WebCore/rendering/RenderThemeMac.mm b/WebCore/rendering/RenderThemeMac.mm
index ee9f41d..03e39a0 100644
--- a/WebCore/rendering/RenderThemeMac.mm
+++ b/WebCore/rendering/RenderThemeMac.mm
@@ -1701,7 +1701,7 @@ String RenderThemeMac::extraMediaControlsStyleSheet()
bool RenderThemeMac::shouldRenderMediaControlPart(ControlPart part, Element* e)
{
if (part == MediaFullscreenButtonPart)
- return mediaControllerTheme() == MediaControllerThemeQT;
+ return mediaControllerTheme() == MediaControllerThemeQuickTime;
return RenderTheme::shouldRenderMediaControlPart(part, e);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list