[webkit-changes] [134004] trunk/Source/WebCore

Thu, 08 Nov 2012 21:01:11 -0800

Title: [134004] trunk/Source/WebCore
Revision
134004
Author
[email protected]
Date
2012-11-08 21:02:39 -0800 (Thu, 08 Nov 2012)

Log Message

Guard calls to WebKitSystemInterface media control drawing functions in RenderThemeMac with PLATFORM(MAC)
https://bugs.webkit.org/show_bug.cgi?id=101634

Patch by Robert Sesek <[email protected]> on 2012-11-08
Reviewed by Adam Barth.

No new tests, just disabling unused code in Chromium port.

* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::adjustMediaSliderThumbSize):
(WebCore::RenderThemeMac::paintMediaFullscreenButton):
(WebCore::RenderThemeMac::paintMediaMuteButton):
(WebCore::RenderThemeMac::paintMediaPlayButton):
(WebCore::RenderThemeMac::paintMediaSeekBackButton):
(WebCore::RenderThemeMac::paintMediaSeekForwardButton):
(WebCore::RenderThemeMac::paintMediaSliderTrack):
(WebCore::RenderThemeMac::paintMediaSliderThumb):
(WebCore::RenderThemeMac::paintMediaRewindButton):
(WebCore::RenderThemeMac::paintMediaReturnToRealtimeButton):
(WebCore::RenderThemeMac::paintMediaToggleClosedCaptionsButton):
(WebCore::RenderThemeMac::paintMediaControlsBackground):
(WebCore::RenderThemeMac::paintMediaCurrentTime):
(WebCore::RenderThemeMac::paintMediaTimeRemaining):
(WebCore::RenderThemeMac::paintMediaVolumeSliderContainer):
(WebCore::RenderThemeMac::paintMediaVolumeSliderTrack):
(WebCore::RenderThemeMac::paintMediaVolumeSliderThumb):
(WebCore::RenderThemeMac::paintMediaFullScreenVolumeSliderTrack):
(WebCore::RenderThemeMac::paintMediaFullScreenVolumeSliderThumb):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (134003 => 134004)


--- trunk/Source/WebCore/ChangeLog	2012-11-09 04:50:44 UTC (rev 134003)
+++ trunk/Source/WebCore/ChangeLog	2012-11-09 05:02:39 UTC (rev 134004)
@@ -1,3 +1,33 @@
+2012-11-08  Robert Sesek  <[email protected]>
+
+        Guard calls to WebKitSystemInterface media control drawing functions in RenderThemeMac with PLATFORM(MAC)
+        https://bugs.webkit.org/show_bug.cgi?id=101634
+
+        Reviewed by Adam Barth.
+
+        No new tests, just disabling unused code in Chromium port.
+
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::adjustMediaSliderThumbSize):
+        (WebCore::RenderThemeMac::paintMediaFullscreenButton):
+        (WebCore::RenderThemeMac::paintMediaMuteButton):
+        (WebCore::RenderThemeMac::paintMediaPlayButton):
+        (WebCore::RenderThemeMac::paintMediaSeekBackButton):
+        (WebCore::RenderThemeMac::paintMediaSeekForwardButton):
+        (WebCore::RenderThemeMac::paintMediaSliderTrack):
+        (WebCore::RenderThemeMac::paintMediaSliderThumb):
+        (WebCore::RenderThemeMac::paintMediaRewindButton):
+        (WebCore::RenderThemeMac::paintMediaReturnToRealtimeButton):
+        (WebCore::RenderThemeMac::paintMediaToggleClosedCaptionsButton):
+        (WebCore::RenderThemeMac::paintMediaControlsBackground):
+        (WebCore::RenderThemeMac::paintMediaCurrentTime):
+        (WebCore::RenderThemeMac::paintMediaTimeRemaining):
+        (WebCore::RenderThemeMac::paintMediaVolumeSliderContainer):
+        (WebCore::RenderThemeMac::paintMediaVolumeSliderTrack):
+        (WebCore::RenderThemeMac::paintMediaVolumeSliderThumb):
+        (WebCore::RenderThemeMac::paintMediaFullScreenVolumeSliderTrack):
+        (WebCore::RenderThemeMac::paintMediaFullScreenVolumeSliderThumb):
+
 2012-11-08  Keishi Hattori  <[email protected]>
 
         Enable calendar picker for input types week/month

Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (134003 => 134004)


--- trunk/Source/WebCore/rendering/RenderThemeMac.mm	2012-11-09 04:50:44 UTC (rev 134003)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm	2012-11-09 05:02:39 UTC (rev 134004)
@@ -1786,6 +1786,7 @@
 
 void RenderThemeMac::adjustMediaSliderThumbSize(RenderStyle* style) const
 {
+#if PLATFORM(MAC)
     int wkPart;
     switch (style->appearance()) {
     case MediaSliderThumbPart:
@@ -1814,6 +1815,9 @@
     float zoomLevel = style->effectiveZoom();
     style->setWidth(Length(static_cast<int>(width * zoomLevel), Fixed));
     style->setHeight(Length(static_cast<int>(height * zoomLevel), Fixed));
+#else
+    ASSERT_NOT_REACHED();
+#endif
 }
 
 enum WKMediaControllerThemeState { 
@@ -1851,6 +1855,7 @@
 
 bool RenderThemeMac::paintMediaFullscreenButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
+#if PLATFORM(MAC)
     Node* node = o->node();
     if (!node)
         return false;
@@ -1860,10 +1865,15 @@
         wkDrawMediaUIPart(mediaControlElementType(node), mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
     }
     return false;
+#else
+    ASSERT_NOT_REACHED();
+    return false;
+#endif
 }
 
 bool RenderThemeMac::paintMediaMuteButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
+#if PLATFORM(MAC)
     Node* node = o->node();
     Node* mediaNode = node ? node->shadowHost() : 0;
     if (!mediaNode || (!mediaNode->hasTagName(videoTag) && !mediaNode->hasTagName(audioTag)))
@@ -1874,10 +1884,15 @@
         wkDrawMediaUIPart(mediaControlElementType(node), mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
     }
     return false;
+#else
+    ASSERT_NOT_REACHED();
+    return false;
+#endif
 }
 
 bool RenderThemeMac::paintMediaPlayButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
+#if PLATFORM(MAC)
     Node* node = o->node();
     Node* mediaNode = node ? node->shadowHost() : 0;
     if (!mediaNode || (!mediaNode->hasTagName(videoTag) && !mediaNode->hasTagName(audioTag)))
@@ -1888,10 +1903,15 @@
         wkDrawMediaUIPart(mediaControlElementType(node), mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
     }
     return false;
+#else
+    ASSERT_NOT_REACHED();
+    return false;
+#endif
 }
 
 bool RenderThemeMac::paintMediaSeekBackButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
+#if PLATFORM(MAC)
     Node* node = o->node();
     if (!node)
         return false;
@@ -1899,10 +1919,15 @@
     LocalCurrentGraphicsContext localContext(paintInfo.context);
     wkDrawMediaUIPart(MediaSeekBackButton, mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
     return false;
+#else
+    ASSERT_NOT_REACHED();
+    return false;
+#endif
 }
 
 bool RenderThemeMac::paintMediaSeekForwardButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
+#if PLATFORM(MAC)
     Node* node = o->node();
     if (!node)
         return false;
@@ -1910,10 +1935,15 @@
     LocalCurrentGraphicsContext localContext(paintInfo.context);
     wkDrawMediaUIPart(MediaSeekForwardButton, mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
     return false;
+#else
+    ASSERT_NOT_REACHED();
+    return false;
+#endif
 }
 
 bool RenderThemeMac::paintMediaSliderTrack(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
+#if PLATFORM(MAC)
     Node* node = o->node();
     Element* mediaNode = node ? node->shadowHost() : 0;
     if (!mediaNode || !mediaNode->isMediaElement())
@@ -1938,10 +1968,15 @@
     wkDrawMediaSliderTrack(mediaControllerTheme(), context, unzoomedRect, 
         timeLoaded, currentTime, duration, getMediaUIPartStateFlags(node));
     return false;
+#else
+    ASSERT_NOT_REACHED();
+    return false;
+#endif
 }
 
 bool RenderThemeMac::paintMediaSliderThumb(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
+#if PLATFORM(MAC)
     Node* node = o->node();
     if (!node)
         return false;
@@ -1949,10 +1984,15 @@
     LocalCurrentGraphicsContext localContext(paintInfo.context);
     wkDrawMediaUIPart(MediaSliderThumb, mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
     return false;
+#else
+    ASSERT_NOT_REACHED();
+    return false;
+#endif
 }
     
 bool RenderThemeMac::paintMediaRewindButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
+#if PLATFORM(MAC)
     Node* node = o->node();
     if (!node)
         return false;
@@ -1960,10 +2000,15 @@
     LocalCurrentGraphicsContext localContext(paintInfo.context);
     wkDrawMediaUIPart(MediaRewindButton, mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
     return false;
+#else
+    ASSERT_NOT_REACHED();
+    return false;
+#endif
 }
 
 bool RenderThemeMac::paintMediaReturnToRealtimeButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
+#if PLATFORM(MAC)
     Node* node = o->node();
     if (!node)
         return false;
@@ -1971,10 +2016,15 @@
     LocalCurrentGraphicsContext localContext(paintInfo.context);
     wkDrawMediaUIPart(MediaReturnToRealtimeButton, mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
     return false;
+#else
+    ASSERT_NOT_REACHED();
+    return false;
+#endif
 }
 
 bool RenderThemeMac::paintMediaToggleClosedCaptionsButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
+#if PLATFORM(MAC)
     Node* node = o->node();
     if (!node)
         return false;
@@ -1984,10 +2034,15 @@
     LocalCurrentGraphicsContext localContext(paintInfo.context);
     wkDrawMediaUIPart(mediaControlElementType(node), mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
     return false;
+#else
+    ASSERT_NOT_REACHED();
+    return false;
+#endif
 }
  
 bool RenderThemeMac::paintMediaControlsBackground(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
+#if PLATFORM(MAC)
     Node* node = o->node();
     if (!node)
         return false;
@@ -1995,10 +2050,15 @@
     LocalCurrentGraphicsContext localContext(paintInfo.context);
     wkDrawMediaUIPart(MediaTimelineContainer, mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
     return false;
+#else
+    ASSERT_NOT_REACHED();
+    return false;
+#endif
 }
 
 bool RenderThemeMac::paintMediaCurrentTime(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
+#if PLATFORM(MAC)
     Node* node = o->node();
     if (!node)
         return false;
@@ -2008,10 +2068,15 @@
     FloatRect unzoomedRect = getUnzoomedRectAndAdjustCurrentContext(o, paintInfo, r);
     wkDrawMediaUIPart(MediaCurrentTimeDisplay, mediaControllerTheme(), cgContextContainer.context(), unzoomedRect, getMediaUIPartStateFlags(node));
     return false;
+#else
+    ASSERT_NOT_REACHED();
+    return false;
+#endif
 }
 
 bool RenderThemeMac::paintMediaTimeRemaining(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
+#if PLATFORM(MAC)
     Node* node = o->node();
     if (!node)
         return false;
@@ -2021,10 +2086,15 @@
     FloatRect unzoomedRect = getUnzoomedRectAndAdjustCurrentContext(o, paintInfo, r);
     wkDrawMediaUIPart(MediaTimeRemainingDisplay, mediaControllerTheme(), cgContextContainer.context(), unzoomedRect, getMediaUIPartStateFlags(node));
     return false;
+#else
+    ASSERT_NOT_REACHED();
+    return false;
+#endif
 }
 
 bool RenderThemeMac::paintMediaVolumeSliderContainer(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
+#if PLATFORM(MAC)
     Node* node = o->node();
     if (!node)
         return false;
@@ -2032,10 +2102,15 @@
     LocalCurrentGraphicsContext localContext(paintInfo.context);
     wkDrawMediaUIPart(MediaVolumeSliderContainer, mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
     return false;
+#else
+    ASSERT_NOT_REACHED();
+    return false;
+#endif
 }
 
 bool RenderThemeMac::paintMediaVolumeSliderTrack(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
+#if PLATFORM(MAC)
     Node* node = o->node();
     if (!node)
         return false;
@@ -2043,10 +2118,15 @@
     LocalCurrentGraphicsContext localContext(paintInfo.context);
     wkDrawMediaUIPart(MediaVolumeSlider, mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
     return false;
+#else
+    ASSERT_NOT_REACHED();
+    return false;
+#endif
 }
     
 bool RenderThemeMac::paintMediaVolumeSliderThumb(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
+#if PLATFORM(MAC)
     Node* node = o->node();
     if (!node)
         return false;
@@ -2054,10 +2134,15 @@
     LocalCurrentGraphicsContext localContext(paintInfo.context);
     wkDrawMediaUIPart(MediaVolumeSliderThumb, mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
     return false;
+#else
+    ASSERT_NOT_REACHED();
+    return false;
+#endif
 }
 
 bool RenderThemeMac::paintMediaFullScreenVolumeSliderTrack(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
+#if PLATFORM(MAC)
     Node* node = o->node();
     if (!node)
         return false;
@@ -2065,10 +2150,15 @@
     LocalCurrentGraphicsContext localContext(paintInfo.context);
     wkDrawMediaUIPart(MediaFullScreenVolumeSlider, mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
     return false;
+#else
+    ASSERT_NOT_REACHED();
+    return false;
+#endif
 }
 
 bool RenderThemeMac::paintMediaFullScreenVolumeSliderThumb(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
+#if PLATFORM(MAC)
     Node* node = o->node();
     if (!node)
         return false;
@@ -2076,6 +2166,10 @@
     LocalCurrentGraphicsContext localContext(paintInfo.context);
     wkDrawMediaUIPart(MediaFullScreenVolumeSliderThumb, mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
     return false;
+#else
+    ASSERT_NOT_REACHED();
+    return false;
+#endif
 }
 
 String RenderThemeMac::extraMediaControlsStyleSheet()

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to