Changeset 171158 in webkit
- Timestamp:
- Jul 16, 2014 4:34:23 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 5 added
- 3 deleted
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r171150 r171158 1 2014-07-16 Roger Fong <roger_fong@apple.com> 2 3 Captions container should not clip content. 4 https://bugs.webkit.org/show_bug.cgi?id=134840. 5 <rdar://problem/14553608>. 6 7 Reviewed by Simon Fraser. 8 9 * media/track/track-cue-rendering-snap-to-lines-not-set-expected.txt: Rebaseline. 10 * media/track/captions-webvtt/long-word-small-track-display.vtt: Added. 11 * media/track/track-in-band-subtitles-too-large-expected.txt: Added. 12 * media/track/track-in-band-subtitles-too-large.html: Added. 13 * media/track/track-long-word-container-sizing-expected.txt: Added. 14 * media/track/track-long-word-container-sizing.html: Added. 15 16 We no longer break in the middle of a word, this test is no longer useful. 17 * media/track/captions-webvtt/long-word.vtt: Removed. 18 * media/track/track-word-breaking-expected.txt: Removed. 19 * media/track/track-word-breaking.html: Removed. 20 1 21 2014-07-16 Mike West <mkwst@chromium.org> 2 22 -
trunk/LayoutTests/media/track/track-cue-rendering-snap-to-lines-not-set-expected.txt
r165905 r171158 10 10 EXPECTED (cueDisplayElement.innerText == 'This is a demo track to illustrate positioning features of cues.') OK 11 11 Cue alignment (default or as specified): middle 12 Cue left position (percentage): 5 012 Cue left position (percentage): 51 13 13 Cue top position (percentage): 100 14 14 … … 20 20 EXPECTED (cueDisplayElement.innerText == 'Using HTML5 captions, you can position the cues anywhere.') OK 21 21 Cue alignment (default or as specified): middle 22 Cue left position (percentage): 5 022 Cue left position (percentage): 51 23 23 Cue top position (percentage): 50 24 24 -
trunk/Source/WebCore/ChangeLog
r171157 r171158 1 2014-07-16 Roger Fong <roger_fong@apple.com> 2 3 Captions container should not clip content. 4 https://bugs.webkit.org/show_bug.cgi?id=134840. 5 <rdar://problem/14553608>. 6 7 Reviewed by Simon Fraser. 8 9 Tests: media/track/track-in-band-subtitles-too-large.html 10 media/track/track-long-word-container-sizing.html 11 12 * Modules/mediacontrols/mediaControlsApple.css: 13 (video::-webkit-media-text-track-container): 14 Set word break property of WebCTT cues to normal to make it consistent with in-band cues. 15 * html/track/TextTrackCueGeneric.cpp: 16 (WebCore::TextTrackCueGenericBoxElement::applyCSSProperties): 17 Set -webkit-min-content on min-width/min-height property of the text track display. 18 * html/track/VTTCue.cpp: 19 (WebCore::VTTCueBox::applyCSSProperties): 20 Do the same for WebVTT cues. 21 1 22 2014-07-16 Eric Carlson <eric.carlson@apple.com> 2 23 -
trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css
r171004 r171158 710 710 pointer-events: none; 711 711 -webkit-user-select: none; 712 word-break: break-word;713 712 714 713 -webkit-flex: 1 1; -
trunk/Source/WebCore/html/track/TextTrackCueGeneric.cpp
r170694 r171158 82 82 } 83 83 84 if (cue->getWritingDirection() == VTTCue::Horizontal) 85 setInlineStyleProperty(CSSPropertyMinWidth, "-webkit-min-content"); 86 else 87 setInlineStyleProperty(CSSPropertyMinHeight, "-webkit-min-content"); 88 84 89 if (cue->foregroundColor().isValid()) 85 90 cueElement->setInlineStyleProperty(CSSPropertyColor, cue->foregroundColor().serialized()); … … 106 111 setInlineStyleProperty(CSSPropertyWebkitWritingMode, cue->getCSSWritingMode(), false); 107 112 setInlineStyleProperty(CSSPropertyWhiteSpace, CSSValuePreWrap); 108 setInlineStyleProperty(CSSPropertyWordBreak, CSSValueNormal);109 113 } 110 114 -
trunk/Source/WebCore/html/track/VTTCue.cpp
r171004 r171158 175 175 setInlineStyleProperty(CSSPropertyWidth, static_cast<double>(m_cue.getCSSSize()), CSSPrimitiveValue::CSS_PERCENTAGE); 176 176 setInlineStyleProperty(CSSPropertyHeight, CSSValueAuto); 177 setInlineStyleProperty(CSSPropertyMinWidth, "-webkit-min-content"); 177 178 } else { 178 179 setInlineStyleProperty(CSSPropertyWidth, CSSValueAuto); 179 180 setInlineStyleProperty(CSSPropertyHeight, static_cast<double>(m_cue.getCSSSize()), CSSPrimitiveValue::CSS_PERCENTAGE); 181 setInlineStyleProperty(CSSPropertyMinHeight, "-webkit-min-content"); 180 182 } 181 183
Note: See TracChangeset
for help on using the changeset viewer.