Changeset 144443 in webkit

Timestamp:

Mar 1, 2013 4:32:43 AM (11 years ago)

Author:

vcarbune@chromium.org

Message:

Support padding, margin and border for internal UA cue styling
​https://bugs.webkit.org/show_bug.cgi?id=110703

Reviewed by Eric Carlson.

Source/WebCore:

For some particular user agent styling this allows the possibility
of making the window around the cue text bigger to match some user
styles (see CaptionUserPreferencesMac::captionsStyleSheetOverride).

These properties *cannot* be set through by using the ::cue
pseudo-element and, as specified, are used only internally.

Test: media/track/track-cue-rendering-with-padding.html

• css/mediaControls.css:

(video::-webkit-media-text-track-display): Set the CSS box model
to include in the specified width or height the values of
padding / margin / border by using -webkit-box-sizing and avoid
overflow over 100% width because of having these properties set.

• rendering/RenderTextTrackCue.cpp:

(WebCore::RenderTextTrackCue::isOutside): To not interfere with
the regular WebVTT positioning algorithm, the check is done for
the absolute content box.
(WebCore::RenderTextTrackCue::repositionCueSnapToLinesSet): Added
an extra adjustment step to accomodate vertical padding (and not
overflow the cue container)

LayoutTests:

• media/track/track-cue-rendering-with-padding-expected.txt: Added.
• media/track/track-cue-rendering-with-padding.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/track/track-cue-rendering-with-padding-expected.txt (added)
• LayoutTests/media/track/track-cue-rendering-with-padding.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/mediaControls.css (modified) (1 diff)
• Source/WebCore/rendering/RenderTextTrackCue.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-01  Victor Carbune  <vcarbune@chromium.org>
+
+        Support padding, margin and border for internal UA cue styling
+        https://bugs.webkit.org/show_bug.cgi?id=110703
+
+        Reviewed by Eric Carlson.
+
+        * media/track/track-cue-rendering-with-padding-expected.txt: Added.
+        * media/track/track-cue-rendering-with-padding.html: Added.
+
 2013-03-01  Takashi Toyoshima  <toyoshim@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-01  Victor Carbune  <vcarbune@chromium.org>
+
+        Support padding, margin and border for internal UA cue styling
+        https://bugs.webkit.org/show_bug.cgi?id=110703
+
+        Reviewed by Eric Carlson.
+
+        For some particular user agent styling this allows the possibility
+        of making the window around the cue text bigger to match some user
+        styles (see CaptionUserPreferencesMac::captionsStyleSheetOverride).
+
+        These properties *cannot* be set through by using the ::cue
+        pseudo-element and, as specified, are used only internally.
+
+        Test: media/track/track-cue-rendering-with-padding.html
+
+        * css/mediaControls.css:
+        (video::-webkit-media-text-track-display): Set the CSS box model
+        to include in the specified width or height the values of
+        padding / margin / border by using -webkit-box-sizing and avoid
+        overflow over 100% width because of having these properties set.
+        * rendering/RenderTextTrackCue.cpp:
+        (WebCore::RenderTextTrackCue::isOutside): To not interfere with
+        the regular WebVTT positioning algorithm, the check is done for
+        the absolute content box.
+        (WebCore::RenderTextTrackCue::repositionCueSnapToLinesSet): Added
+        an extra adjustment step to accomodate vertical padding (and not
+        overflow the cue container)
+
 2013-02-26  Eugene Klyuchnikov  <eustas@chromium.org>
 

trunk/Source/WebCore/css/mediaControls.css

@@ -250 +250 @@
     overflow: hidden;
     white-space: pre-wrap;
+    -webkit-box-sizing: border-box;
 }
 

trunk/Source/WebCore/rendering/RenderTextTrackCue.cpp

@@ -124 +124 @@
 bool RenderTextTrackCue::isOutside() const
 {
-    return !containingBlock()->absoluteBoundingBoxRect().contains(absoluteBoundingBoxRect());
+    return !containingBlock()->absoluteBoundingBoxRect().contains(absoluteContentBox());
 }
 
@@ -226 +226 @@
         // 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);
+    }
 }