Changeset 206181 in webkit


Ignore:
Timestamp:
Sep 20, 2016 3:30:49 PM (8 years ago)
Author:
andersca@apple.com
Message:

Remove "in-store" from "-apple-pay-button-type"
​https://bugs.webkit.org/show_bug.cgi?id=162321
rdar://problem/28394581

Reviewed by Beth Dakin.

  • css/CSSPrimitiveValueMappings.h:

(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
(WebCore::CSSPrimitiveValue::operator ApplePayButtonType):

  • css/CSSValueKeywords.in:
  • css/parser/CSSParser.cpp:

(WebCore::isValidKeywordPropertyAndValue):

  • css/parser/CSSParserFastPaths.cpp:

(WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):

  • rendering/RenderThemeCocoa.mm:

(WebCore::toPKPaymentButtonType):

  • rendering/style/RenderStyleConstants.h:
Location:
trunk/Source/WebCore
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r206179 r206181  
     12016-09-20  Anders Carlsson  <andersca@apple.com>
     2
     3        Remove "in-store" from "-apple-pay-button-type"
     4        https://bugs.webkit.org/show_bug.cgi?id=162321
     5        rdar://problem/28394581
     6
     7        Reviewed by Beth Dakin.
     8
     9        * css/CSSPrimitiveValueMappings.h:
     10        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
     11        (WebCore::CSSPrimitiveValue::operator ApplePayButtonType):
     12        * css/CSSValueKeywords.in:
     13        * css/parser/CSSParser.cpp:
     14        (WebCore::isValidKeywordPropertyAndValue):
     15        * css/parser/CSSParserFastPaths.cpp:
     16        (WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
     17        * rendering/RenderThemeCocoa.mm:
     18        (WebCore::toPKPaymentButtonType):
     19        * rendering/style/RenderStyleConstants.h:
     20
    1212016-09-20  Alex Christensen  <achristensen@webkit.org>
    222

  • trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h

    r205980 r206181  
    55315531        m_value.valueID = CSSValueSetUp;
    55325532        break;
    5533     case ApplePayButtonType::InStore:
    5534         m_value.valueID = CSSValueInStore;
    5535         break;
    55365533    default:
    55375534        ASSERT_NOT_REACHED();
    … …  
    55505547    case CSSValueSetUp:
    55515548        return ApplePayButtonType::SetUp;
    5552     case CSSValueInStore:
    5553         return ApplePayButtonType::InStore;
    55545549    default:
    55555550        break;

  • trunk/Source/WebCore/css/CSSValueKeywords.in

    r206161 r206181  
    12801280buy
    12811281set-up
    1282 in-store
    12831282#endif
    12841283

  • trunk/Source/WebCore/css/parser/CSSParser.cpp

    r206161 r206181  
    10661066            return true;
    10671067        break;
    1068     case CSSPropertyApplePayButtonType: // plain | buy | set-up | in-store
    1069         if (valueID == CSSValuePlain || valueID == CSSValueBuy || valueID == CSSValueSetUp || valueID == CSSValueInStore)
     1068    case CSSPropertyApplePayButtonType: // plain | buy | set-up
     1069        if (valueID == CSSValuePlain || valueID == CSSValueBuy || valueID == CSSValueSetUp)
    10701070            return true;
    10711071        break;

  • trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp

    r206022 r206181  
    757757    case CSSPropertyApplePayButtonStyle: // white | white-outline | black
    758758        return valueID == CSSValueWhite || valueID == CSSValueWhiteOutline || valueID == CSSValueBlack;
    759     case CSSPropertyApplePayButtonType: // plain | buy | set-up | in-store
    760         return valueID == CSSValuePlain || valueID == CSSValueBuy || valueID == CSSValueSetUp || valueID == CSSValueInStore;
     759    case CSSPropertyApplePayButtonType: // plain | buy | set-up
     760        return valueID == CSSValuePlain || valueID == CSSValueBuy || valueID == CSSValueSetUp;
    761761#endif
    762762    default:

  • trunk/Source/WebCore/rendering/RenderThemeCocoa.mm

    r205980 r206181  
    7979    case ApplePayButtonType::SetUp:
    8080        return PKPaymentButtonTypeSetUp;
    81     case ApplePayButtonType::InStore:
    82         return PKPaymentButtonTypeInStore;
    8381    }
    8482}

  • trunk/Source/WebCore/rendering/style/RenderStyleConstants.h

    r205980 r206181  
    708708    Buy,
    709709    SetUp,
    710     InStore,
    711710};
    712711#endif
Note: See TracChangeset for help on using the changeset viewer.