Title: [144447] trunk
- Revision
- 144447
- Author
- [email protected]
- Date
- 2013-03-01 05:38:55 -0800 (Fri, 01 Mar 2013)
Log Message
Unreviewed, rolling out r144443.
http://trac.webkit.org/changeset/144443
https://bugs.webkit.org/show_bug.cgi?id=111169
Caused 2 tests to crash by segv on Chromium Mac10.6 (Requested
by toyoshim on #webkit).
Patch by Sheriff Bot <[email protected]> on 2013-03-01
Source/WebCore:
* css/mediaControls.css:
(video::-webkit-media-text-track-display):
* rendering/RenderTextTrackCue.cpp:
(WebCore::RenderTextTrackCue::isOutside):
(WebCore::RenderTextTrackCue::repositionCueSnapToLinesSet):
LayoutTests:
* media/track/track-cue-rendering-with-padding-expected.txt: Removed.
* media/track/track-cue-rendering-with-padding.html: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (144446 => 144447)
--- trunk/LayoutTests/ChangeLog 2013-03-01 13:30:17 UTC (rev 144446)
+++ trunk/LayoutTests/ChangeLog 2013-03-01 13:38:55 UTC (rev 144447)
@@ -1,3 +1,15 @@
+2013-03-01 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r144443.
+ http://trac.webkit.org/changeset/144443
+ https://bugs.webkit.org/show_bug.cgi?id=111169
+
+ Caused 2 tests to crash by segv on Chromium Mac10.6 (Requested
+ by toyoshim on #webkit).
+
+ * media/track/track-cue-rendering-with-padding-expected.txt: Removed.
+ * media/track/track-cue-rendering-with-padding.html: Removed.
+
2013-03-01 Takashi Toyoshima <[email protected]>
Unreviewed chromium gardening, cleanup lint errors #2
Deleted: trunk/LayoutTests/media/track/track-cue-rendering-with-padding-expected.txt (144446 => 144447)
--- trunk/LayoutTests/media/track/track-cue-rendering-with-padding-expected.txt 2013-03-01 13:30:17 UTC (rev 144446)
+++ trunk/LayoutTests/media/track/track-cue-rendering-with-padding-expected.txt 2013-03-01 13:38:55 UTC (rev 144447)
@@ -1,9 +0,0 @@
-Rendering text track cue line with padding set.
-
-EVENT(canplaythrough)
-EVENT(seeked)
-
-** Cue should be displayed entirely within the container. **
-EXPECTED (cueDisplayBottomPoint <= cueContainerBottomPoint == 'true') OK
-END OF TEST
-
Deleted: trunk/LayoutTests/media/track/track-cue-rendering-with-padding.html (144446 => 144447)
--- trunk/LayoutTests/media/track/track-cue-rendering-with-padding.html 2013-03-01 13:30:17 UTC (rev 144446)
+++ trunk/LayoutTests/media/track/track-cue-rendering-with-padding.html 2013-03-01 13:38:55 UTC (rev 144447)
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
- <style type="text/css">
- video::-webkit-media-text-track-display {
- padding: 15px;
- }
- </style>
-
- <script src=""
- <script src=""
- <script src=""
-
- <script>
- var cueContainerBottomPoint;
- var cueDisplayBottomPoint;
-
- function startTest()
- {
- if (!window.internals) {
- consoleWrite("<br><b>** This test only works in DRT! **<" + "/b>");
- return;
- }
-
- var cueContainerElement = textTrackDisplayElement(video);
- var cueDisplayElement = textTrackDisplayElement(video, 'display', 0);
-
- cueDisplayBottomPoint = cueDisplayElement.offsetTop + cueDisplayElement.offsetHeight;
- cueContainerBottomPoint = cueContainerElement.offsetTop + cueContainerElement.offsetHeight;
-
- consoleWrite("<br>** Cue should be displayed entirely within the container. **");
- testExpected("cueDisplayBottomPoint <= cueContainerBottomPoint", true);
- endTest();
- }
-
- function loaded()
- {
- consoleWrite("Rendering text track cue line with padding set.<br>");
- findMediaElement();
-
- testTrack = document.querySelector('track');
- video.src = "" '../content/test');
-
- waitForEvent('seeked', startTest);
- waitForEvent('canplaythrough', function() {
- video.currentTime = .25;
- });
- }
-
- </script>
- </head>
- <body _onload_="loaded()">
- <video controls>
- <track src="" kind="captions" default>
- </video>
- </body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (144446 => 144447)
--- trunk/Source/WebCore/ChangeLog 2013-03-01 13:30:17 UTC (rev 144446)
+++ trunk/Source/WebCore/ChangeLog 2013-03-01 13:38:55 UTC (rev 144447)
@@ -1,5 +1,20 @@
2013-03-01 Sheriff Bot <[email protected]>
+ Unreviewed, rolling out r144443.
+ http://trac.webkit.org/changeset/144443
+ https://bugs.webkit.org/show_bug.cgi?id=111169
+
+ Caused 2 tests to crash by segv on Chromium Mac10.6 (Requested
+ by toyoshim on #webkit).
+
+ * css/mediaControls.css:
+ (video::-webkit-media-text-track-display):
+ * rendering/RenderTextTrackCue.cpp:
+ (WebCore::RenderTextTrackCue::isOutside):
+ (WebCore::RenderTextTrackCue::repositionCueSnapToLinesSet):
+
+2013-03-01 Sheriff Bot <[email protected]>
+
Unreviewed, rolling out r144422 and r144424.
http://trac.webkit.org/changeset/144422
http://trac.webkit.org/changeset/144424
Modified: trunk/Source/WebCore/css/mediaControls.css (144446 => 144447)
--- trunk/Source/WebCore/css/mediaControls.css 2013-03-01 13:30:17 UTC (rev 144446)
+++ trunk/Source/WebCore/css/mediaControls.css 2013-03-01 13:38:55 UTC (rev 144447)
@@ -249,7 +249,6 @@
position: absolute;
overflow: hidden;
white-space: pre-wrap;
- -webkit-box-sizing: border-box;
}
video::cue(:future) {
Modified: trunk/Source/WebCore/rendering/RenderTextTrackCue.cpp (144446 => 144447)
--- trunk/Source/WebCore/rendering/RenderTextTrackCue.cpp 2013-03-01 13:30:17 UTC (rev 144446)
+++ trunk/Source/WebCore/rendering/RenderTextTrackCue.cpp 2013-03-01 13:38:55 UTC (rev 144447)
@@ -123,7 +123,7 @@
bool RenderTextTrackCue::isOutside() const
{
- return !containingBlock()->absoluteBoundingBoxRect().contains(absoluteContentBox());
+ return !containingBlock()->absoluteBoundingBoxRect().contains(absoluteBoundingBoxRect());
}
bool RenderTextTrackCue::isOverlapping() const
@@ -225,25 +225,6 @@
// 19. Jump back to the step labeled step loop.
}
-
- // Acommodate extra top and bottom padding, border or margin.
- // Note: this is supported only for internal UA styling, not through the cue selector.
- if (hasInlineDirectionBordersPaddingOrMargin()) {
- IntRect containerRect = containingBlock()->absoluteBoundingBoxRect();
- IntRect cueRect = absoluteBoundingBoxRect();
-
- int topOverflow = cueRect.y() - containerRect.y();
- int bottomOverflow = containerRect.y() + containerRect.height() - cueRect.y() - cueRect.height();
-
- int adjustment = 0;
- if (topOverflow < 0)
- adjustment = -topOverflow;
- else if (bottomOverflow < 0)
- adjustment = bottomOverflow;
-
- if (adjustment)
- setY(y() + adjustment);
- }
}
void RenderTextTrackCue::repositionGenericCue()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
