Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(715)

Issue 10412040: Merge 116900 - Volume slider needs to be displayed below the mute button (Closed)

Created:
8 years, 7 months ago by imasaki1
Modified:
8 years, 7 months ago
Reviewers:
imasaki1
CC:
chromium-reviews
Base URL:
http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Visibility:
Public.

Description

Merge 116900 - Volume slider needs to be displayed below the mute button https://bugs.webkit.org/show_bug.cgi?id=85990 Patch by Victor Carbune <vcarbune@adobe.com>; on 2012-05-13 Reviewed by Dimitri Glazkov. Source/WebCore: Added back code for rendering offset, but used only when the volume slider needs to be displayed below the controls. Test: media/media-volume-slider-rendered-below.html * css/mediaControlsChromium.css: (audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-controls-volume-slider-container): Changed positioning of the slider to absolute, otherwise it is not possible to position it from the layout() method. * css/mediaControlsQuickTime.css: Added back the double mute-button and changed the z-index of the original button. When the slider is displayed the second mute button is actually there. (audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button): (audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-controls-volume-slider-container): (audio::-webkit-media-controls-volume-slider-mute-button, video::-webkit-media-controls-volume-slider-mute-button): Added copy. * html/shadow/MediaControlElements.cpp: (WebCore::MediaControlPanelElement::makeTransparent): Disabled the possible of hiding controls. WebVTT rendering in the place of controls when these are visible is not possible with the current code. (RenderMediaVolumeSliderContainer): (WebCore): (WebCore::RenderMediaVolumeSliderContainer::RenderMediaVolumeSliderContainer): (WebCore::RenderMediaVolumeSliderContainer::layout): Checked if the absolute coordinates of the corner of the slider would be rendered outside the page. This part of the code is faulty if display:none is toggled on the controls. (WebCore::MediaControlVolumeSliderContainerElement::createRenderer): * html/shadow/MediaControlElements.h: (MediaControlVolumeSliderContainerElement): * html/shadow/MediaControlRootElement.cpp: (WebCore::MediaControlRootElement::create): LayoutTests: Updated tests expectation and marked failing tests accordingly. * media/media-volume-slider-rendered-below.html: Added. * media/media-volume-slider-rendered-expected.txt: Added. * platform/chromium/test_expectations.txt: Updated. * platform/mac/media/audio-controls-rendering-expected.txt: Updated (z-index change). * platform/mac/media/controls-after-reload-expected.txt: Same. * platform/mac/media/controls-strict-expected.txt: Same. * platform/mac/media/video-controls-rendering-expected.txt: Same. * platform/mac/media/video-display-toggle-expected.txt: Same. * platform/mac/media/video-playing-and-pause-expected.txt: Same. * platform/mac/test_expectations.txt: Updated. TBR=commit-queue@webkit.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=118043

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+81 lines, -13 lines) Patch
A + LayoutTests/media/media-volume-slider-rendered-below.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/media/media-volume-slider-rendered-below-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M LayoutTests/platform/chromium/test_expectations.txt View 1 chunk +6 lines, -0 lines 0 comments Download
M LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt View 3 chunks +3 lines, -3 lines 0 comments Download
M LayoutTests/platform/mac/media/controls-after-reload-expected.txt View 1 chunk +1 line, -1 line 0 comments Download
M LayoutTests/platform/mac/media/controls-strict-expected.txt View 1 chunk +1 line, -1 line 0 comments Download
M LayoutTests/platform/mac/media/video-controls-rendering-expected.txt View 3 chunks +3 lines, -3 lines 0 comments Download
M LayoutTests/platform/mac/media/video-display-toggle-expected.txt View 1 chunk +1 line, -1 line 0 comments Download
M LayoutTests/platform/mac/media/video-playing-and-pause-expected.txt View 1 chunk +1 line, -1 line 0 comments Download
M Source/WebCore/css/mediaControlsChromium.css View 1 chunk +2 lines, -1 line 0 comments Download
M Source/WebCore/css/mediaControlsQuickTime.css View 3 chunks +20 lines, -2 lines 0 comments Download
M Source/WebCore/html/shadow/MediaControlElements.h View 1 chunk +1 line, -0 lines 0 comments Download
M Source/WebCore/html/shadow/MediaControlElements.cpp View 3 chunks +35 lines, -2 lines 0 comments Download
M Source/WebCore/html/shadow/MediaControlRootElement.cpp View 1 chunk +9 lines, -0 lines 0 comments Download

Messages

Total messages: 1 (0 generated)
imasaki1
8 years, 7 months ago (2012-05-22 20:43:36 UTC) #1

          

Powered by Google App Engine
This is Rietveld 408576698