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

Thu, 08 Nov 2012 22:52:47 -0800

Title: [134016] trunk/Source/WebCore
Revision
134016
Author
commit-qu...@webkit.org
Date
2012-11-08 22:54:16 -0800 (Thu, 08 Nov 2012)

Log Message

Unreviewed, rolling out r134004.
http://trac.webkit.org/changeset/134004
https://bugs.webkit.org/show_bug.cgi?id=101713

multiple crashes (Requested by hayato on #webkit).

Patch by Sheriff Bot <webkit.review....@gmail.com> on 2012-11-08

* 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 (134015 => 134016)


--- trunk/Source/WebCore/ChangeLog	2012-11-09 06:46:47 UTC (rev 134015)
+++ trunk/Source/WebCore/ChangeLog	2012-11-09 06:54:16 UTC (rev 134016)
@@ -1,3 +1,32 @@
+2012-11-08  Sheriff Bot  <webkit.review....@gmail.com>
+
+        Unreviewed, rolling out r134004.
+        http://trac.webkit.org/changeset/134004
+        https://bugs.webkit.org/show_bug.cgi?id=101713
+
+        multiple crashes (Requested by hayato on #webkit).
+
+        * 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  Jan Keromnes  <j...@linux.com>
 
         Web Inspector: stop using cursorCoords in CodeMirrorTextEditor

Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (134015 => 134016)


--- trunk/Source/WebCore/rendering/RenderThemeMac.mm	2012-11-09 06:46:47 UTC (rev 134015)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm	2012-11-09 06:54:16 UTC (rev 134016)
@@ -1786,7 +1786,6 @@
 
 void RenderThemeMac::adjustMediaSliderThumbSize(RenderStyle* style) const
 {
-#if PLATFORM(MAC)
     int wkPart;
     switch (style->appearance()) {
     case MediaSliderThumbPart:
@@ -1815,9 +1814,6 @@
     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 { 
@@ -1855,7 +1851,6 @@
 
 bool RenderThemeMac::paintMediaFullscreenButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
-#if PLATFORM(MAC)
     Node* node = o->node();
     if (!node)
         return false;
@@ -1865,15 +1860,10 @@
         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)))
@@ -1884,15 +1874,10 @@
         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)))
@@ -1903,15 +1888,10 @@
         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;
@@ -1919,15 +1899,10 @@
     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;
@@ -1935,15 +1910,10 @@
     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())
@@ -1968,15 +1938,10 @@
     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;
@@ -1984,15 +1949,10 @@
     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;
@@ -2000,15 +1960,10 @@
     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;
@@ -2016,15 +1971,10 @@
     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;
@@ -2034,15 +1984,10 @@
     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;
@@ -2050,15 +1995,10 @@
     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;
@@ -2068,15 +2008,10 @@
     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;
@@ -2086,15 +2021,10 @@
     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;
@@ -2102,15 +2032,10 @@
     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;
@@ -2118,15 +2043,10 @@
     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;
@@ -2134,15 +2054,10 @@
     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;
@@ -2150,15 +2065,10 @@
     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;
@@ -2166,10 +2076,6 @@
     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
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to