Changeset 49878 in webkit
- Timestamp:
- Oct 20, 2009 12:08:17 PM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r49876 r49878 1 2009-10-20 Andrew Scherkus <scherkus@chromium.org> 2 3 Reviewed by Eric Seidel. 4 5 Hide Chromium's media slider thumb if no source has been loaded. 6 7 https://bugs.webkit.org/show_bug.cgi?id=30529 8 9 Covered by existing layout tests, notably: 10 LayoutTests/media/controls-rendering.html 11 LayoutTests/media/unsupported-tracks.html 12 LayoutTests/media/video-src-none.html 13 14 * rendering/RenderMediaControlsChromium.cpp: 15 (WebCore::hasSource): Returns true if an HTMLMediaElement has a valid source set. 16 (WebCore::paintMediaMuteButton): Refactored to use hasSource(). 17 (WebCore::paintMediaPlayButton): Ditto. 18 (WebCore::paintMediaSliderThumb): Add call to hasSource() to determine if we should paint the thumb. 19 1 20 2009-10-20 Satoshi Nakagawa <psychs@limechat.net> 2 21 -
trunk/WebCore/rendering/RenderMediaControlsChromium.cpp
r49799 r49878 55 55 } 56 56 57 static bool hasSource(const HTMLMediaElement* mediaElement) 58 { 59 return mediaElement->networkState() != HTMLMediaElement::NETWORK_EMPTY 60 && mediaElement->networkState() != HTMLMediaElement::NETWORK_NO_SOURCE; 61 } 62 57 63 static bool paintMediaButton(GraphicsContext* context, const IntRect& rect, Image* image) 58 64 { … … 72 78 static Image* soundDisabled = platformResource("mediaSoundDisabled"); 73 79 74 if ( mediaElement->networkState() == HTMLMediaElement::NETWORK_NO_SOURCE|| !mediaElement->hasAudio())80 if (!hasSource(mediaElement) || !mediaElement->hasAudio()) 75 81 return paintMediaButton(paintInfo.context, rect, soundDisabled); 76 82 … … 88 94 static Image* mediaPlayDisabled = platformResource("mediaPlayDisabled"); 89 95 90 if (mediaElement->networkState() == HTMLMediaElement::NETWORK_EMPTY || 91 mediaElement->networkState() == HTMLMediaElement::NETWORK_NO_SOURCE) 96 if (!hasSource(mediaElement)) 92 97 return paintMediaButton(paintInfo.context, rect, mediaPlayDisabled); 93 98 … … 147 152 if (!object->parent()->isSlider()) 148 153 return false; 154 155 HTMLMediaElement* mediaElement = toParentMediaElement(object->parent()); 156 if (!mediaElement) 157 return false; 158 159 if (!hasSource(mediaElement)) 160 return true; 149 161 150 162 static Image* mediaSliderThumb = platformResource("mediaSliderThumb");
Note: See TracChangeset
for help on using the changeset viewer.