Changeset 104301 in webkit
- Timestamp:
- Jan 6, 2012 10:28:43 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r104300 r104301 1 2012-01-05 Jer Noble <jer.noble@apple.com> 2 3 REGRESSION (r90797): Full screen video HUD cannot be dragged horizontally 4 https://bugs.webkit.org/show_bug.cgi?id=75200 5 6 Reviewed by Eric Carlson. 7 8 * fullscreen/video-controls-drag-expected.txt: Added. 9 * fullscreen/video-controls-drag.html: Added. 10 1 11 2012-01-06 Stephen White <senorblanco@chromium.org> 2 12 -
trunk/Source/WebCore/ChangeLog
r104290 r104301 1 2012-01-05 Jer Noble <jer.noble@apple.com> 2 3 REGRESSION (r90797): Full screen video HUD cannot be dragged horizontally 4 https://bugs.webkit.org/show_bug.cgi?id=75200 5 6 Reviewed by Eric Carlson. 7 8 Test: fullscreen/video-controls-drag.html 9 10 The !important rules in fullscreenQuickTime.css are overriding the styles added by the 11 drag operation in MediaControlElements.cpp. Give the panel a "dragged" class in setPosition 12 (clearing it in resetPosition) that allows the !important rules to apply only when the 13 panel is not dragged. 14 15 * css/fullscreenQuickTime.css: 16 (video:-webkit-full-screen::-webkit-media-controls-panel): 17 (video:-webkit-full-screen::-webkit-media-controls-panel:not(.dragged)): 18 * html/shadow/MediaControlElements.cpp: 19 (WebCore::MediaControlPanelElement::setPosition): 20 (WebCore::MediaControlPanelElement::resetPosition): 21 1 22 2012-01-05 Antti Koivisto <antti@apple.com> 2 23 -
trunk/Source/WebCore/css/fullscreenQuickTime.css
r90797 r104301 30 30 -webkit-appearance: none !important; 31 31 32 bottom: 50px !important;33 left: 50% !important;34 margin-left: -220px !important;35 32 padding: 12px 0 0 10px !important; 36 33 width: 430px !important; … … 57 54 58 55 -webkit-transition: opacity 0.3s linear !important; 56 } 57 58 video:-webkit-full-screen::-webkit-media-controls-panel:not(.dragged) { 59 bottom: 50px !important; 60 left: 50% !important; 61 margin-left: -220px !important; 59 62 } 60 63 -
trunk/Source/WebCore/html/shadow/MediaControlElements.cpp
r103486 r104301 35 35 #include "CSSStyleSelector.h" 36 36 #include "CSSValueKeywords.h" 37 #include "DOMTokenList.h" 37 38 #include "EventNames.h" 38 39 #include "FloatConversion.h" … … 186 187 style->setProperty(CSSPropertyMarginLeft, 0.0, CSSPrimitiveValue::CSS_PX); 187 188 style->setProperty(CSSPropertyMarginTop, 0.0, CSSPrimitiveValue::CSS_PX); 189 190 ExceptionCode ignored; 191 classList()->add("dragged", ignored); 188 192 } 189 193 … … 196 200 style->removeProperty(CSSPropertyMarginLeft); 197 201 style->removeProperty(CSSPropertyMarginTop); 202 203 ExceptionCode ignored; 204 classList()->remove("dragged", ignored); 198 205 } 199 206
Note: See TracChangeset
for help on using the changeset viewer.