Changeset 144447 in webkit
- Timestamp:
- Mar 1, 2013 5:38:55 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 2 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r144445 r144447 1 2013-03-01 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r144443. 4 http://trac.webkit.org/changeset/144443 5 https://bugs.webkit.org/show_bug.cgi?id=111169 6 7 Caused 2 tests to crash by segv on Chromium Mac10.6 (Requested 8 by toyoshim on #webkit). 9 10 * media/track/track-cue-rendering-with-padding-expected.txt: Removed. 11 * media/track/track-cue-rendering-with-padding.html: Removed. 12 1 13 2013-03-01 Takashi Toyoshima <toyoshim@chromium.org> 2 14 -
trunk/Source/WebCore/ChangeLog
r144446 r144447 1 2013-03-01 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r144443. 4 http://trac.webkit.org/changeset/144443 5 https://bugs.webkit.org/show_bug.cgi?id=111169 6 7 Caused 2 tests to crash by segv on Chromium Mac10.6 (Requested 8 by toyoshim on #webkit). 9 10 * css/mediaControls.css: 11 (video::-webkit-media-text-track-display): 12 * rendering/RenderTextTrackCue.cpp: 13 (WebCore::RenderTextTrackCue::isOutside): 14 (WebCore::RenderTextTrackCue::repositionCueSnapToLinesSet): 15 1 16 2013-03-01 Sheriff Bot <webkit.review.bot@gmail.com> 2 17 -
trunk/Source/WebCore/css/mediaControls.css
r144443 r144447 250 250 overflow: hidden; 251 251 white-space: pre-wrap; 252 -webkit-box-sizing: border-box;253 252 } 254 253 -
trunk/Source/WebCore/rendering/RenderTextTrackCue.cpp
r144443 r144447 124 124 bool RenderTextTrackCue::isOutside() const 125 125 { 126 return !containingBlock()->absoluteBoundingBoxRect().contains(absolute ContentBox());126 return !containingBlock()->absoluteBoundingBoxRect().contains(absoluteBoundingBoxRect()); 127 127 } 128 128 … … 226 226 // 19. Jump back to the step labeled step loop. 227 227 } 228 229 // Acommodate extra top and bottom padding, border or margin.230 // Note: this is supported only for internal UA styling, not through the cue selector.231 if (hasInlineDirectionBordersPaddingOrMargin()) {232 IntRect containerRect = containingBlock()->absoluteBoundingBoxRect();233 IntRect cueRect = absoluteBoundingBoxRect();234 235 int topOverflow = cueRect.y() - containerRect.y();236 int bottomOverflow = containerRect.y() + containerRect.height() - cueRect.y() - cueRect.height();237 238 int adjustment = 0;239 if (topOverflow < 0)240 adjustment = -topOverflow;241 else if (bottomOverflow < 0)242 adjustment = bottomOverflow;243 244 if (adjustment)245 setY(y() + adjustment);246 }247 228 } 248 229
Note: See TracChangeset
for help on using the changeset viewer.