Attachment 455055 Details for Bug 238062 – Patch

[patch] Patch

bug-238062-20220318023632.patch (text/plain), 22.83 KB, created by Oriol Brufau on 2022-03-17 18:36:33 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Oriol Brufau

Created: 2022-03-17 18:36:33 PDT

Size: 22.83 KB

patch

obsolete

>Subversion Revision: 291319
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index cfadb15bb33ee749ec993228f0e0c7253e9c6286..46de25d1045560a137a2ed885fb69d955573b01b 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,51 @@
>+2022-03-17  Oriol Brufau  <obrufau@igalia.com>
>+
>+        Fix hasExplicitlySetBorderRadius flag
>+        https://bugs.webkit.org/show_bug.cgi?id=238062
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The four border-*-radius longhands were sharing the same flag, so the
>+        behavior was broken when setting longhands individually.
>+
>+        This patch splits the flag into 4 different ones, one for each longhand.
>+        Also makes sure to set it properly when a longhand is set to 'initial'.
>+
>+        It's ugly to have all this boilerplate code for the flags, but
>+        https://webkit.org/b/212506 will make it automatically generated.
>+
>+        Test: fast/css/appearance-apple-pay-button-border-radius-longhands.html
>+
>+        * css/CSSProperties.json:
>+        * rendering/style/RenderStyle.cpp:
>+        (WebCore::RenderStyle::RenderStyle):
>+        * rendering/style/RenderStyle.h:
>+        (WebCore::RenderStyle::hasExplicitlySetBorderBottomLeftRadius const):
>+        (WebCore::RenderStyle::hasExplicitlySetBorderBottomRightRadius const):
>+        (WebCore::RenderStyle::hasExplicitlySetBorderTopLeftRadius const):
>+        (WebCore::RenderStyle::hasExplicitlySetBorderTopRightRadius const):
>+        (WebCore::RenderStyle::hasExplicitlySetBorderRadius const):
>+        (WebCore::RenderStyle::setHasExplicitlySetBorderBottomLeftRadius):
>+        (WebCore::RenderStyle::setHasExplicitlySetBorderBottomRightRadius):
>+        (WebCore::RenderStyle::setHasExplicitlySetBorderTopLeftRadius):
>+        (WebCore::RenderStyle::setHasExplicitlySetBorderTopRightRadius):
>+        (WebCore::RenderStyle::NonInheritedFlags::operator== const):
>+        (WebCore::RenderStyle::NonInheritedFlags::copyNonInheritedFrom):
>+        (WebCore::RenderStyle::setHasExplicitlySetBorderRadius): Deleted.
>+        * style/StyleBuilderCustom.h:
>+        (WebCore::Style::BuilderCustom::applyInitialBorderBottomLeftRadius):
>+        (WebCore::Style::BuilderCustom::applyInheritBorderBottomLeftRadius):
>+        (WebCore::Style::BuilderCustom::applyValueBorderBottomLeftRadius):
>+        (WebCore::Style::BuilderCustom::applyInitialBorderBottomRightRadius):
>+        (WebCore::Style::BuilderCustom::applyInheritBorderBottomRightRadius):
>+        (WebCore::Style::BuilderCustom::applyValueBorderBottomRightRadius):
>+        (WebCore::Style::BuilderCustom::applyInitialBorderTopLeftRadius):
>+        (WebCore::Style::BuilderCustom::applyInheritBorderTopLeftRadius):
>+        (WebCore::Style::BuilderCustom::applyValueBorderTopLeftRadius):
>+        (WebCore::Style::BuilderCustom::applyInitialBorderTopRightRadius):
>+        (WebCore::Style::BuilderCustom::applyInheritBorderTopRightRadius):
>+        (WebCore::Style::BuilderCustom::applyValueBorderTopRightRadius):
>+
> 2022-03-15  Commit Queue  <commit-queue@webkit.org>
> 
>         Unreviewed, reverting r291282.
>diff --git a/Source/WebCore/css/CSSProperties.json b/Source/WebCore/css/CSSProperties.json
>index ed40283965055dde48b169c41c5e89843ad4cf0e..7969e2be118d9e5468f636399a1295f0163c67bf 100644
>--- a/Source/WebCore/css/CSSProperties.json
>+++ b/Source/WebCore/css/CSSProperties.json
>@@ -1556,8 +1556,7 @@
>                 "aliases": [
>                     "-webkit-border-bottom-left-radius"
>                 ],
>-                "initial": "initialBorderRadius",
>-                "custom": "Inherit|Value",
>+                "custom": "All",
>                 "logical-property-group": {
>                     "name": "border-radius",
>                     "resolver": "bottom-left"
>@@ -1573,8 +1572,7 @@
>                 "aliases": [
>                     "-webkit-border-bottom-right-radius"
>                 ],
>-                "initial": "initialBorderRadius",
>-                "custom": "Inherit|Value",
>+                "custom": "All",
>                 "logical-property-group": {
>                     "name": "border-radius",
>                     "resolver": "bottom-right"
>@@ -2195,8 +2193,7 @@
>                 "aliases": [
>                     "-webkit-border-top-left-radius"
>                 ],
>-                "initial": "initialBorderRadius",
>-                "custom": "Inherit|Value",
>+                "custom": "All",
>                 "logical-property-group": {
>                     "name": "border-radius",
>                     "resolver": "top-left"
>@@ -2212,8 +2209,7 @@
>                 "aliases": [
>                     "-webkit-border-top-right-radius"
>                 ],
>-                "initial": "initialBorderRadius",
>-                "custom": "Inherit|Value",
>+                "custom": "All",
>                 "logical-property-group": {
>                     "name": "border-radius",
>                     "resolver": "top-right"
>diff --git a/Source/WebCore/rendering/style/RenderStyle.cpp b/Source/WebCore/rendering/style/RenderStyle.cpp
>index cc80e576307e26d93ef2da881d51f093250bf837..1ffe73068d5f560209c3d2de8d8b2cb0892f4324 100644
>--- a/Source/WebCore/rendering/style/RenderStyle.cpp
>+++ b/Source/WebCore/rendering/style/RenderStyle.cpp
>@@ -197,7 +197,10 @@ RenderStyle::RenderStyle(CreateDefaultStyleTag)
>     m_nonInheritedFlags.unicodeBidi = static_cast<unsigned>(initialUnicodeBidi());
>     m_nonInheritedFlags.floating = static_cast<unsigned>(initialFloating());
>     m_nonInheritedFlags.tableLayout = static_cast<unsigned>(initialTableLayout());
>-    m_nonInheritedFlags.hasExplicitlySetBorderRadius = false;
>+    m_nonInheritedFlags.hasExplicitlySetBorderBottomLeftRadius = false;
>+    m_nonInheritedFlags.hasExplicitlySetBorderBottomRightRadius = false;
>+    m_nonInheritedFlags.hasExplicitlySetBorderTopLeftRadius = false;
>+    m_nonInheritedFlags.hasExplicitlySetBorderTopRightRadius = false;
>     m_nonInheritedFlags.hasExplicitlySetDirection = false;
>     m_nonInheritedFlags.hasExplicitlySetWritingMode = false;
>     m_nonInheritedFlags.hasExplicitlySetTextAlign = false;
>diff --git a/Source/WebCore/rendering/style/RenderStyle.h b/Source/WebCore/rendering/style/RenderStyle.h
>index ec95b5a7334d47a9853add17a6291899db7a4f2f..d4d461ca28b0fdeae0be500e74360b1165e769e1 100644
>--- a/Source/WebCore/rendering/style/RenderStyle.h
>+++ b/Source/WebCore/rendering/style/RenderStyle.h
>@@ -305,7 +305,11 @@ public:
>     const LengthSize& borderBottomLeftRadius() const { return m_surroundData->border.bottomLeftRadius(); }
>     const LengthSize& borderBottomRightRadius() const { return m_surroundData->border.bottomRightRadius(); }
>     bool hasBorderRadius() const { return m_surroundData->border.hasBorderRadius(); }
>-    bool hasExplicitlySetBorderRadius() const { return m_nonInheritedFlags.hasExplicitlySetBorderRadius; }
>+    bool hasExplicitlySetBorderBottomLeftRadius() const { return m_nonInheritedFlags.hasExplicitlySetBorderBottomLeftRadius; }
>+    bool hasExplicitlySetBorderBottomRightRadius() const { return m_nonInheritedFlags.hasExplicitlySetBorderBottomRightRadius; }
>+    bool hasExplicitlySetBorderTopLeftRadius() const { return m_nonInheritedFlags.hasExplicitlySetBorderTopLeftRadius; }
>+    bool hasExplicitlySetBorderTopRightRadius() const { return m_nonInheritedFlags.hasExplicitlySetBorderTopRightRadius; }
>+    bool hasExplicitlySetBorderRadius() const { return hasExplicitlySetBorderBottomLeftRadius() || hasExplicitlySetBorderBottomRightRadius() || hasExplicitlySetBorderTopLeftRadius() || hasExplicitlySetBorderTopRightRadius(); }
> 
>     float borderLeftWidth() const { return m_surroundData->border.borderLeftWidth(); }
>     BorderStyle borderLeftStyle() const { return m_surroundData->border.left().style(); }
>@@ -934,7 +938,10 @@ public:
> 
>     void setBorderRadius(LengthSize&&);
>     void setBorderRadius(const IntSize&);
>-    void setHasExplicitlySetBorderRadius(bool v) { m_nonInheritedFlags.hasExplicitlySetBorderRadius = v; }
>+    void setHasExplicitlySetBorderBottomLeftRadius(bool v) { m_nonInheritedFlags.hasExplicitlySetBorderBottomLeftRadius = v; }
>+    void setHasExplicitlySetBorderBottomRightRadius(bool v) { m_nonInheritedFlags.hasExplicitlySetBorderBottomRightRadius = v; }
>+    void setHasExplicitlySetBorderTopLeftRadius(bool v) { m_nonInheritedFlags.hasExplicitlySetBorderTopLeftRadius = v; }
>+    void setHasExplicitlySetBorderTopRightRadius(bool v) { m_nonInheritedFlags.hasExplicitlySetBorderTopRightRadius = v; }
> 
>     RoundedRect getRoundedBorderFor(const LayoutRect& borderRect, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true) const;
>     RoundedRect getRoundedInnerBorderFor(const LayoutRect& borderRect, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true) const;
>@@ -1947,7 +1954,10 @@ private:
>         unsigned floating : 3; // Float
>         unsigned tableLayout : 1; // TableLayoutType
> 
>-        unsigned hasExplicitlySetBorderRadius : 1;
>+        unsigned hasExplicitlySetBorderBottomLeftRadius : 1;
>+        unsigned hasExplicitlySetBorderBottomRightRadius : 1;
>+        unsigned hasExplicitlySetBorderTopLeftRadius : 1;
>+        unsigned hasExplicitlySetBorderTopRightRadius : 1;
>         unsigned hasExplicitlySetDirection : 1;
>         unsigned hasExplicitlySetWritingMode : 1;
>         unsigned hasExplicitlySetTextAlign : 1;
>@@ -2084,7 +2094,10 @@ inline bool RenderStyle::NonInheritedFlags::operator==(const NonInheritedFlags&
>         && unicodeBidi == other.unicodeBidi
>         && floating == other.floating
>         && tableLayout == other.tableLayout
>-        && hasExplicitlySetBorderRadius == other.hasExplicitlySetBorderRadius
>+        && hasExplicitlySetBorderBottomLeftRadius == other.hasExplicitlySetBorderBottomLeftRadius
>+        && hasExplicitlySetBorderBottomRightRadius == other.hasExplicitlySetBorderBottomRightRadius
>+        && hasExplicitlySetBorderTopLeftRadius == other.hasExplicitlySetBorderTopLeftRadius
>+        && hasExplicitlySetBorderTopRightRadius == other.hasExplicitlySetBorderTopRightRadius
>         && hasExplicitlySetDirection == other.hasExplicitlySetDirection
>         && hasExplicitlySetWritingMode == other.hasExplicitlySetWritingMode
>         && hasExplicitlySetTextAlign == other.hasExplicitlySetTextAlign
>@@ -2121,7 +2134,10 @@ inline void RenderStyle::NonInheritedFlags::copyNonInheritedFrom(const NonInheri
> 
>     // Unlike properties tracked by the other hasExplicitlySet* flags, border-radius is non-inherited
>     // and we need to remember whether it's been explicitly set when copying m_surroundData.
>-    hasExplicitlySetBorderRadius = other.hasExplicitlySetBorderRadius;
>+    hasExplicitlySetBorderBottomLeftRadius = other.hasExplicitlySetBorderBottomLeftRadius;
>+    hasExplicitlySetBorderBottomRightRadius = other.hasExplicitlySetBorderBottomRightRadius;
>+    hasExplicitlySetBorderTopLeftRadius = other.hasExplicitlySetBorderTopLeftRadius;
>+    hasExplicitlySetBorderTopRightRadius = other.hasExplicitlySetBorderTopRightRadius;
> }
> 
> inline bool RenderStyle::NonInheritedFlags::hasPseudoStyle(PseudoId pseudo) const
>diff --git a/Source/WebCore/style/StyleBuilderCustom.h b/Source/WebCore/style/StyleBuilderCustom.h
>index e884e5bcfac5dd48509ded239ee2ef66af3e14ed..98836beaf5d2873e28343acdea168a0e6132a044 100644
>--- a/Source/WebCore/style/StyleBuilderCustom.h
>+++ b/Source/WebCore/style/StyleBuilderCustom.h
>@@ -127,12 +127,16 @@ public:
>     static void applyInheritDisplay(BuilderState&);
>     static void applyValueDisplay(BuilderState&, CSSValue&);
>     // FIXME: <https://webkit.org/b/212506> Teach makeprop.pl to generate setters for hasExplicitlySet* flags
>+    static void applyInitialBorderBottomLeftRadius(BuilderState&);
>     static void applyInheritBorderBottomLeftRadius(BuilderState&);
>     static void applyValueBorderBottomLeftRadius(BuilderState&, CSSValue&);
>+    static void applyInitialBorderBottomRightRadius(BuilderState&);
>     static void applyInheritBorderBottomRightRadius(BuilderState&);
>     static void applyValueBorderBottomRightRadius(BuilderState&, CSSValue&);
>+    static void applyInitialBorderTopLeftRadius(BuilderState&);
>     static void applyInheritBorderTopLeftRadius(BuilderState&);
>     static void applyValueBorderTopLeftRadius(BuilderState&, CSSValue&);
>+    static void applyInitialBorderTopRightRadius(BuilderState&);
>     static void applyInheritBorderTopRightRadius(BuilderState&);
>     static void applyValueBorderTopRightRadius(BuilderState&, CSSValue&);
> 
>@@ -1084,52 +1088,76 @@ inline void BuilderCustom::applyValueFontFamily(BuilderState& builderState, CSSV
>     builderState.setFontDescription(WTFMove(fontDescription));
> }
> 
>+inline void BuilderCustom::applyInitialBorderBottomLeftRadius(BuilderState& builderState)
>+{
>+    builderState.style().setBorderBottomLeftRadius(RenderStyle::initialBorderRadius());
>+    builderState.style().setHasExplicitlySetBorderBottomLeftRadius(false);
>+}
>+
> inline void BuilderCustom::applyInheritBorderBottomLeftRadius(BuilderState& builderState)
> {
>     builderState.style().setBorderBottomLeftRadius(forwardInheritedValue(builderState.parentStyle().borderBottomLeftRadius()));
>-    builderState.style().setHasExplicitlySetBorderRadius(builderState.parentStyle().hasExplicitlySetBorderRadius());
>+    builderState.style().setHasExplicitlySetBorderBottomLeftRadius(builderState.parentStyle().hasExplicitlySetBorderBottomLeftRadius());
> }
> 
> inline void BuilderCustom::applyValueBorderBottomLeftRadius(BuilderState& builderState, CSSValue& value)
> {
>     builderState.style().setBorderBottomLeftRadius(BuilderConverter::convertRadius(builderState, value));
>-    builderState.style().setHasExplicitlySetBorderRadius(true);
>+    builderState.style().setHasExplicitlySetBorderBottomLeftRadius(true);
>+}
>+
>+inline void BuilderCustom::applyInitialBorderBottomRightRadius(BuilderState& builderState)
>+{
>+    builderState.style().setBorderBottomRightRadius(RenderStyle::initialBorderRadius());
>+    builderState.style().setHasExplicitlySetBorderBottomRightRadius(false);
> }
> 
> inline void BuilderCustom::applyInheritBorderBottomRightRadius(BuilderState& builderState)
> {
>     builderState.style().setBorderBottomRightRadius(forwardInheritedValue(builderState.parentStyle().borderBottomRightRadius()));
>-    builderState.style().setHasExplicitlySetBorderRadius(builderState.parentStyle().hasExplicitlySetBorderRadius());
>+    builderState.style().setHasExplicitlySetBorderBottomRightRadius(builderState.parentStyle().hasExplicitlySetBorderBottomRightRadius());
> }
> 
> inline void BuilderCustom::applyValueBorderBottomRightRadius(BuilderState& builderState, CSSValue& value)
> {
>     builderState.style().setBorderBottomRightRadius(BuilderConverter::convertRadius(builderState, value));
>-    builderState.style().setHasExplicitlySetBorderRadius(true);
>+    builderState.style().setHasExplicitlySetBorderBottomRightRadius(true);
>+}
>+
>+inline void BuilderCustom::applyInitialBorderTopLeftRadius(BuilderState& builderState)
>+{
>+    builderState.style().setBorderTopLeftRadius(RenderStyle::initialBorderRadius());
>+    builderState.style().setHasExplicitlySetBorderTopLeftRadius(false);
> }
> 
> inline void BuilderCustom::applyInheritBorderTopLeftRadius(BuilderState& builderState)
> {
>     builderState.style().setBorderTopLeftRadius(forwardInheritedValue(builderState.parentStyle().borderTopLeftRadius()));
>-    builderState.style().setHasExplicitlySetBorderRadius(builderState.parentStyle().hasExplicitlySetBorderRadius());
>+    builderState.style().setHasExplicitlySetBorderTopLeftRadius(builderState.parentStyle().hasExplicitlySetBorderTopLeftRadius());
> }
> 
> inline void BuilderCustom::applyValueBorderTopLeftRadius(BuilderState& builderState, CSSValue& value)
> {
>     builderState.style().setBorderTopLeftRadius(BuilderConverter::convertRadius(builderState, value));
>-    builderState.style().setHasExplicitlySetBorderRadius(true);
>+    builderState.style().setHasExplicitlySetBorderTopLeftRadius(true);
>+}
>+
>+inline void BuilderCustom::applyInitialBorderTopRightRadius(BuilderState& builderState)
>+{
>+    builderState.style().setBorderTopRightRadius(RenderStyle::initialBorderRadius());
>+    builderState.style().setHasExplicitlySetBorderTopRightRadius(false);
> }
> 
> inline void BuilderCustom::applyInheritBorderTopRightRadius(BuilderState& builderState)
> {
>     builderState.style().setBorderTopRightRadius(forwardInheritedValue(builderState.parentStyle().borderTopRightRadius()));
>-    builderState.style().setHasExplicitlySetBorderRadius(builderState.parentStyle().hasExplicitlySetBorderRadius());
>+    builderState.style().setHasExplicitlySetBorderTopRightRadius(builderState.parentStyle().hasExplicitlySetBorderTopRightRadius());
> }
> 
> inline void BuilderCustom::applyValueBorderTopRightRadius(BuilderState& builderState, CSSValue& value)
> {
>     builderState.style().setBorderTopRightRadius(BuilderConverter::convertRadius(builderState, value));
>-    builderState.style().setHasExplicitlySetBorderRadius(true);
>+    builderState.style().setHasExplicitlySetBorderTopRightRadius(true);
> }
> 
> inline bool BuilderCustom::isValidDisplayValue(BuilderState& builderState, DisplayType display)
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 03c11074d30dfe8c7114bf29061149d141d291ce..1a7df6471e3a05bc15d9ebd502e992c83156cb87 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,15 @@
>+2022-03-17  Oriol Brufau  <obrufau@igalia.com>
>+
>+        Fix hasExplicitlySetBorderRadius flag
>+        https://bugs.webkit.org/show_bug.cgi?id=238062
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add test.
>+
>+        * fast/css/appearance-apple-pay-button-border-radius-longhands-expected.html: Added.
>+        * fast/css/appearance-apple-pay-button-border-radius-longhands.html: Added.
>+
> 2022-03-15  Jean-Yves Avenard  <jya@apple.com>
> 
>         REGRESSION(r287249): [ Monterey wk2 ] media/media-source/media-webm-vorbis-partial.html is a constant text failure
>diff --git a/LayoutTests/fast/css/appearance-apple-pay-button-border-radius-longhands-expected.html b/LayoutTests/fast/css/appearance-apple-pay-button-border-radius-longhands-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..1cdd392d7544dd29530785c3064fb7582c3112d0
>--- /dev/null
>+++ b/LayoutTests/fast/css/appearance-apple-pay-button-border-radius-longhands-expected.html
>@@ -0,0 +1,55 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+    <style>
>+        .container {
>+            padding: 25px;
>+            width: 500px;
>+        }
>+
>+        .apple-pay-button {
>+            -webkit-appearance: -apple-pay-button;
>+        }
>+
>+        .square-corners {
>+            border-radius: 0px;
>+        }
>+
>+        .very-round-corners {
>+            border-radius: 15px;
>+        }
>+    </style>
>+</head>
>+<body>
>+    <div class='container'>
>+        <button class='apple-pay-button square-corners'></button>
>+        <button class='apple-pay-button square-corners'></button>
>+        <button class='apple-pay-button square-corners'></button>
>+        <button class='apple-pay-button square-corners'></button>
>+    </div>
>+    <div class='container'>
>+        <button class='apple-pay-button square-corners'></button>
>+        <button class='apple-pay-button square-corners'></button>
>+        <button class='apple-pay-button square-corners'></button>
>+        <button class='apple-pay-button square-corners'></button>
>+    </div>
>+    <div class='container'>
>+        <button class='apple-pay-button'></button>
>+        <button class='apple-pay-button'></button>
>+        <button class='apple-pay-button'></button>
>+        <button class='apple-pay-button'></button>
>+    </div>
>+    <div class='container'>
>+        <button class='apple-pay-button very-round-corners'></button>
>+        <button class='apple-pay-button very-round-corners'></button>
>+        <button class='apple-pay-button very-round-corners'></button>
>+        <button class='apple-pay-button very-round-corners'></button>
>+    </div>
>+    <div class='container'>
>+        <button class='apple-pay-button very-round-corners'></button>
>+        <button class='apple-pay-button very-round-corners'></button>
>+        <button class='apple-pay-button very-round-corners'></button>
>+        <button class='apple-pay-button very-round-corners'></button>
>+    </div>
>+</body>
>+</html>
>diff --git a/LayoutTests/fast/css/appearance-apple-pay-button-border-radius-longhands.html b/LayoutTests/fast/css/appearance-apple-pay-button-border-radius-longhands.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..96e14884e0f36ee5536215e17fb17aebad5ef9f3
>--- /dev/null
>+++ b/LayoutTests/fast/css/appearance-apple-pay-button-border-radius-longhands.html
>@@ -0,0 +1,55 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+    <style>
>+        .container {
>+            padding: 25px;
>+            width: 500px;
>+        }
>+
>+        .apple-pay-button {
>+            -webkit-appearance: -apple-pay-button;
>+        }
>+
>+        .square-corners {
>+            border-radius: 0px;
>+        }
>+
>+        .very-round-corners {
>+            border-radius: 15px;
>+        }
>+    </style>
>+</head>
>+<body>
>+    <div class='container'>
>+        <button class='apple-pay-button' style='border-bottom-left-radius: 0px'></button>
>+        <button class='apple-pay-button' style='border-bottom-right-radius: 0px'></button>
>+        <button class='apple-pay-button' style='border-top-left-radius: 0px'></button>
>+        <button class='apple-pay-button' style='border-top-right-radius: 0px'></button>
>+    </div>
>+    <div class='container'>
>+        <button class='apple-pay-button square-corners' style='border-bottom-left-radius: inherit'></button>
>+        <button class='apple-pay-button square-corners' style='border-bottom-right-radius: inherit'></button>
>+        <button class='apple-pay-button square-corners' style='border-top-left-radius: inherit'></button>
>+        <button class='apple-pay-button square-corners' style='border-top-right-radius: inherit'></button>
>+    </div>
>+    <div class='container'>
>+        <button class='apple-pay-button' style='border-bottom-left-radius: inherit'></button>
>+        <button class='apple-pay-button' style='border-bottom-right-radius: inherit'></button>
>+        <button class='apple-pay-button' style='border-top-left-radius: inherit'></button>
>+        <button class='apple-pay-button' style='border-top-right-radius: inherit'></button>
>+    </div>
>+    <div class='container'>
>+        <button class='apple-pay-button' style='border-bottom-left-radius: 15px'></button>
>+        <button class='apple-pay-button' style='border-bottom-right-radius: 15px'></button>
>+        <button class='apple-pay-button' style='border-top-left-radius: 15px'></button>
>+        <button class='apple-pay-button' style='border-top-right-radius: 15px'></button>
>+    </div>
>+    <div class='container'>
>+        <button class='apple-pay-button very-round-corners' style='border-bottom-left-radius: inherit'></button>
>+        <button class='apple-pay-button very-round-corners' style='border-bottom-right-radius: inherit'></button>
>+        <button class='apple-pay-button very-round-corners' style='border-top-left-radius: inherit'></button>
>+        <button class='apple-pay-button very-round-corners' style='border-top-right-radius: inherit'></button>
>+    </div>
>+</body>
>+</html>

Actions: View | Formatted Diff | Diff

Attachments on bug 238062: 455055 | 455059