Attachment 368947 Details for Bug 136627 – Patch

[patch] Patch

bug-136627-20190503103459.patch (text/plain), 7.20 KB, created by Eric Carlson on 2019-05-03 10:35:01 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Carlson

Created: 2019-05-03 10:35:01 PDT

Size: 7.20 KB

patch

obsolete

>Subversion Revision: 244907
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 586dc3eb7fdb555a46f3c3c4692e0d92409d9c90..401091a7daa9903008d55a1a03f133003cf62298 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-05-03  Eric Carlson  <eric.carlson@apple.com>
>+
>+        WebVTT: vertical cue text alignment is the wrong way around
>+        https://bugs.webkit.org/show_bug.cgi?id=136627
>+        <rdar://problem/49725538>
>+
>+        Unreviewed, address post review comments and add new Mojave test results.
>+
>+        * html/track/VTTCue.cpp:
>+        (WebCore::VTTCueBox::applyCSSProperties): FormattedNumber is not necessary, use
>+        videoSize.width() and cue->getCSSSize() directly as that gets "shortest" floating
>+        point formatting and avoids unnecessary rounding.
>+
> 2019-05-03  Commit Queue  <commit-queue@webkit.org>
> 
>         Unreviewed, rolling out r244881.
>diff --git a/Source/WebCore/html/track/VTTCue.cpp b/Source/WebCore/html/track/VTTCue.cpp
>index 10d5cc0625a906ee58a5192582261b0ce11f1297..21b84c1fb7a5eca43d7aad82dbc49619c5e4f52a 100644
>--- a/Source/WebCore/html/track/VTTCue.cpp
>+++ b/Source/WebCore/html/track/VTTCue.cpp
>@@ -181,7 +181,7 @@ void VTTCueBox::applyCSSProperties(const IntSize& videoSize)
>     if (cue->vertical() == horizontalKeyword())
>         setInlineStyleProperty(CSSPropertyLeft, position.first, CSSPrimitiveValue::CSS_PERCENTAGE);
>     else if (cue->vertical() == verticalGrowingRightKeyword())
>-        setInlineStyleProperty(CSSPropertyLeft, makeString("calc(-", FormattedNumber::fixedWidth(videoSize.width(), 2), "px - ", FormattedNumber::fixedWidth(cue->getCSSSize(), 2), "px)"));
>+        setInlineStyleProperty(CSSPropertyLeft, makeString("calc(-", videoSize.width(), "px - ", cue->getCSSSize(), "px)"));
> 
>     double authorFontSize = std::min(videoSize.width(), videoSize.height()) * DEFAULTCAPTIONFONTSIZEPERCENTAGE / 100.0;
>     double multiplier = 1.0;
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 242298f6a2a3c2849ea72300f1617fba8c3636bb..c8db88be2654cc027350dd0a5cc84721f00ed19f 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-05-03  Eric Carlson  <eric.carlson@apple.com>
>+
>+        WebVTT: vertical cue text alignment is the wrong way around
>+        https://bugs.webkit.org/show_bug.cgi?id=136627
>+        <rdar://problem/49725538>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/mac-highsierra/media/track/track-cue-rendering-vertical-expected.txt:
>+        * platform/mac/media/track/track-cue-rendering-vertical-expected.txt:
>+
> 2019-05-02  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         Make focusing-element-with-tabindex-by-tap-or-click.html more robust on iOS
>diff --git a/LayoutTests/platform/mac-highsierra/media/track/track-cue-rendering-vertical-expected.txt b/LayoutTests/platform/mac-highsierra/media/track/track-cue-rendering-vertical-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..a3f7688f7097839e8dab757765a1e3a252a2e02f
>--- /dev/null
>+++ b/LayoutTests/platform/mac-highsierra/media/track/track-cue-rendering-vertical-expected.txt
>@@ -0,0 +1,64 @@
>+layer at (0,0) size 800x600
>+  RenderView at (0,0) size 800x600
>+layer at (0,0) size 800x332
>+  RenderBlock {HTML} at (0,0) size 800x332
>+    RenderBody {BODY} at (8,8) size 784x316
>+      RenderBlock (anonymous) at (0,0) size 784x244
>+        RenderText {#text} at (0,0) size 0x0
>+      RenderBlock {DIV} at (0,244) size 784x72
>+        RenderText {#text} at (0,0) size 377x18
>+          text run at (0,0) width 377: "Rendering vertical line-positioned cues with Japanese text."
>+        RenderBR {BR} at (376,0) size 1x18
>+        RenderText {#text} at (0,18) size 163x18
>+          text run at (0,18) width 163: "EVENT(canplaythrough)"
>+        RenderBR {BR} at (162,18) size 1x18
>+        RenderText {#text} at (0,36) size 107x18
>+          text run at (0,36) width 107: "EVENT(seeked)"
>+        RenderBR {BR} at (106,36) size 1x18
>+        RenderText {#text} at (0,54) size 100x18
>+          text run at (0,54) width 100: "END OF TEST"
>+        RenderBR {BR} at (99,54) size 1x18
>+layer at (8,8) size 320x240
>+  RenderVideo {VIDEO} at (0,0) size 320x240
>+layer at (8,8) size 320x240
>+  RenderFlexibleBox {DIV} at (0,0) size 320x240
>+layer at (8,8) size 320x240
>+  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240 [color=#FFFFFF]
>+layer at (306,8) size 18x240
>+  RenderBlock (positioned) {DIV} at (298,0) size 18x240
>+    RenderBlock {DIV} at (4,64) size 14x112
>+      RenderInline {SPAN} at (0,0) size 14x111 [bgcolor=#000000CC]
>+        RenderText {#text} at (0,0) size 14x111
>+          text run at (0,0) width 111: "Cue 1: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
>+layer at (278,8) size 18x240
>+  RenderBlock (positioned) {DIV} at (270,0) size 18x240
>+    RenderBlock {DIV} at (4,64) size 14x112
>+      RenderInline {SPAN} at (0,0) size 14x111 [bgcolor=#000000CC]
>+        RenderText {#text} at (0,0) size 14x111
>+          text run at (0,0) width 111: "Cue 2: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
>+layer at (248,8) size 18x240
>+  RenderBlock (positioned) {DIV} at (240,0) size 18x240
>+    RenderBlock {DIV} at (4,64) size 14x112
>+      RenderInline {SPAN} at (0,0) size 14x111 [bgcolor=#000000CC]
>+        RenderText {#text} at (0,0) size 14x111
>+          text run at (0,0) width 111: "Cue 3: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
>+layer at (220,8) size 18x240
>+  RenderBlock (positioned) {DIV} at (212,0) size 18x240
>+    RenderBlock {DIV} at (4,64) size 14x112
>+      RenderInline {SPAN} at (0,0) size 14x111 [bgcolor=#000000CC]
>+        RenderText {#text} at (0,0) size 14x111
>+          text run at (0,0) width 111: "Cue 4: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
>+layer at (20,8) size 18x240
>+  RenderBlock (positioned) {DIV} at (12,0) size 18x240
>+    RenderBlock {DIV} at (0,64) size 14x112
>+      RenderInline {SPAN} at (0,0) size 14x111 [bgcolor=#000000CC]
>+        RenderText {#text} at (0,0) size 14x111
>+          text run at (0,0) width 111: "Cue 5: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
>+layer at (48,8) size 18x240
>+  RenderBlock (positioned) {DIV} at (40,0) size 18x240
>+    RenderBlock {DIV} at (0,64) size 14x112
>+      RenderInline {SPAN} at (0,0) size 14x111 [bgcolor=#000000CC]
>+        RenderText {#text} at (0,0) size 14x111
>+          text run at (0,0) width 111: "Cue 6: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
>+layer at (8,238) size 320x10
>+  RenderButton {BUTTON} at (0,230) size 320x10
>diff --git a/LayoutTests/platform/mac/media/track/track-cue-rendering-vertical-expected.txt b/LayoutTests/platform/mac/media/track/track-cue-rendering-vertical-expected.txt
>index a3f7688f7097839e8dab757765a1e3a252a2e02f..5d77c900e445a3e03e3972c5558f6012b04f521e 100644
>--- a/LayoutTests/platform/mac/media/track/track-cue-rendering-vertical-expected.txt
>+++ b/LayoutTests/platform/mac/media/track/track-cue-rendering-vertical-expected.txt
>@@ -61,4 +61,4 @@ layer at (48,8) size 18x240
>         RenderText {#text} at (0,0) size 14x111
>           text run at (0,0) width 111: "Cue 6: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
> layer at (8,238) size 320x10
>-  RenderButton {BUTTON} at (0,230) size 320x10
>+  RenderButton {BUTTON} at (0,230) size 320x10 [color=#000000D8]

Flags:

commit-queue: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 136627: 368261 | 368294 | 368784 | 368789 | 368792 | 368802 | 368808 | 368811 | 368944 | 368947