Unreviewed, rolling out r144443.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Mar 2013 13:38:55 +0000 (13:38 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Mar 2013 13:38:55 +0000 (13:38 +0000)
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 <webkit.review.bot@gmail.com> 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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@144447 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/media/track/track-cue-rendering-with-padding-expected.txt [deleted file]
LayoutTests/media/track/track-cue-rendering-with-padding.html [deleted file]
Source/WebCore/ChangeLog
Source/WebCore/css/mediaControls.css
Source/WebCore/rendering/RenderTextTrackCue.cpp

index 4018d45..0a07360 100644 (file)
@@ -1,3 +1,15 @@
+2013-03-01  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        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  <toyoshim@chromium.org>
 
         Unreviewed chromium gardening, cleanup lint errors #2
diff --git a/LayoutTests/media/track/track-cue-rendering-with-padding-expected.txt b/LayoutTests/media/track/track-cue-rendering-with-padding-expected.txt
deleted file mode 100644 (file)
index d3e705a..0000000
+++ /dev/null
@@ -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
-
diff --git a/LayoutTests/media/track/track-cue-rendering-with-padding.html b/LayoutTests/media/track/track-cue-rendering-with-padding.html
deleted file mode 100644 (file)
index 06cfb2c..0000000
+++ /dev/null
@@ -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=../media-file.js></script>
-        <script src=../media-controls.js></script>
-        <script src=../video-test.js></script>
-
-        <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 = findMediaFile('video', '../content/test');
-
-            waitForEvent('seeked', startTest);
-            waitForEvent('canplaythrough', function() {
-                video.currentTime = .25;
-            });
-        }
-
-        </script>
-    </head>
-    <body onload="loaded()">
-        <video controls>
-            <track src="captions-webvtt/captions-fast.vtt" kind="captions" default>
-        </video>
-    </body>
-</html>
index 959f4a0..5f1aea1 100644 (file)
@@ -1,5 +1,20 @@
 2013-03-01  Sheriff Bot  <webkit.review.bot@gmail.com>
 
+        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  <webkit.review.bot@gmail.com>
+
         Unreviewed, rolling out r144422 and r144424.
         http://trac.webkit.org/changeset/144422
         http://trac.webkit.org/changeset/144424
index b94d447..8e2763b 100644 (file)
@@ -249,7 +249,6 @@ video::-webkit-media-text-track-display {
     position: absolute;
     overflow: hidden;
     white-space: pre-wrap;
-    -webkit-box-sizing: border-box;
 }
 
 video::cue(:future) {
index 11399b3..e1678dd 100644 (file)
@@ -123,7 +123,7 @@ void RenderTextTrackCue::placeBoxInDefaultPosition(LayoutUnit position, bool& sw
 
 bool RenderTextTrackCue::isOutside() const
 {
-    return !containingBlock()->absoluteBoundingBoxRect().contains(absoluteContentBox());
+    return !containingBlock()->absoluteBoundingBoxRect().contains(absoluteBoundingBoxRect());
 }
 
 bool RenderTextTrackCue::isOverlapping() const
@@ -225,25 +225,6 @@ void RenderTextTrackCue::repositionCueSnapToLinesSet()
 
         // 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()