Changeset 293089 in webkit


Ignore:
Timestamp:
Apr 20, 2022 3:43:36 AM (3 months ago)
Author:
ntim@apple.com
Message:

Unprefix -webkit-user-select CSS property
​https://bugs.webkit.org/show_bug.cgi?id=208677

Reviewed by Simon Fraser.

LayoutTests/imported/w3c:

WPT progressions.

  • web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
  • web-platform-tests/css/css-ui/inheritance-expected.txt:
  • web-platform-tests/css/css-ui/parsing/user-select-computed-expected.txt:
  • web-platform-tests/css/css-ui/parsing/user-select-valid-expected.txt:
  • web-platform-tests/inert/inert-computed-style-expected.txt:

Source/WebCore:

  • animation/CSSPropertyAnimation.cpp:

(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):

  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::valueForPropertyInStyle):

  • css/CSSProperties.json:
  • css/parser/CSSParserFastPaths.cpp:

(WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
(WebCore::CSSParserFastPaths::isKeywordPropertyID):

  • css/html.css:

(#if defined(WTF_PLATFORM_IOS_FAMILY) && WTF_PLATFORM_IOS_FAMILY):
(input::-webkit-inner-spin-button):
(input::-webkit-strong-password-auto-fill-button):
(input::-webkit-credentials-auto-fill-button):
(input::-webkit-contacts-auto-fill-button):
(input::-webkit-credit-card-auto-fill-button):
(input::-webkit-caps-lock-indicator):
(#if defined(ENABLE_DATALIST_ELEMENT) && ENABLE_DATALIST_ELEMENT):
(textarea):
(input:-webkit-autofill-strong-password):

  • css/mediaControls.css:

(audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel):
(audio::-webkit-media-controls-timeline-container, video::-webkit-media-controls-timeline-container):
(video::-webkit-media-text-track-container):

  • css/plugIns.css:

(embed::-webkit-snapshotted-plugin-content > .snapshot-overlay > .snapshot-label,):

  • dom/ImageOverlay.cpp:

(WebCore::ImageOverlay::updateSubtree):
(WebCore::ImageOverlay::updateWithTextRecognitionResult):

  • html/HTMLElement.cpp:

(WebCore::HTMLElement::collectPresentationalHintsForAttribute):

LayoutTests:

  • editing/selection/user-select-js-property-expected.txt:
  • editing/selection/user-select-js-property.html:
  • fast/css/getComputedStyle/computed-style-expected.txt:
  • fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • fast/css/getComputedStyle/resources/property-names.js:
  • platform/gtk/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
  • platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
  • platform/wpe/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
  • svg/css/getComputedStyle-basic-expected.txt:
Location:
trunk
Files:
26 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r293088 r293089  
     12022-04-20  Tim Nguyen  <ntim@apple.com>
     2
     3        Unprefix -webkit-user-select CSS property
     4        https://bugs.webkit.org/show_bug.cgi?id=208677
     5
     6        Reviewed by Simon Fraser.
     7
     8        * editing/selection/user-select-js-property-expected.txt:
     9        * editing/selection/user-select-js-property.html:
     10        * fast/css/getComputedStyle/computed-style-expected.txt:
     11        * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     12        * fast/css/getComputedStyle/resources/property-names.js:
     13        * platform/gtk/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
     14        * platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
     15        * platform/wpe/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
     16        * svg/css/getComputedStyle-basic-expected.txt:
     17
    1182022-04-20  Tim Nguyen  <ntim@apple.com>
    219

  • trunk/LayoutTests/editing/selection/user-select-js-property-expected.txt

    r293028 r293089  
    1 Test setting CSSStyleDeclaration.webkitUserStyle and userStyle
     1Test setting CSSStyleDeclaration.webkitUserSelect and userSelect
    22
    33editable
    … …  
    55
    66PASS user-select-js-property
     7PASS 'userSelect' in style
    78PASS 'webkitUserSelect' in style
    8 PASS webkitUserSelect of '#bar { -webkit-user-select: none; }' should be 'none'
     9PASS userSelect of '#foo { user-select: none; }' should be 'none'
     10PASS webkitUserSelect of '#foo { user-select: none; }' should be 'none'
     11PASS userSelect of '#bar { user-select: none; }' should be 'none'
     12PASS webkitUserSelect of '#bar { user-select: none; }' should be 'none'
     13PASS userSelect of 'user-select:none' should be 'none'
     14PASS webkitUserSelect of 'user-select:none' should be 'none'
     15PASS userSelect of '-webkit-user-select:none' should be 'none'
    916PASS webkitUserSelect of '-webkit-user-select:none' should be 'none'
    1017

  • trunk/LayoutTests/editing/selection/user-select-js-property.html

    r293028 r293089  
    33<script src="../../resources/testharnessreport.js"></script>
    44<style>
    5     /* FIXME: Add testcases for unprefixed version (webkit.org/b/208677) */
     5    #foo {
     6        user-select: none;
     7    }
    68    #bar {
    79        -webkit-user-select: none;
    … …  
    911</style>
    1012<div id="container">
    11 <p id="description">Test setting CSSStyleDeclaration.webkitUserStyle and userStyle</p>
     13<p id="description">Test setting CSSStyleDeclaration.webkitUserSelect and userSelect</p>
    1214<div id="sample1" contenteditable="true">editable</div>
    1315<div id="sample2" contenteditable="false">uneditable</div>
     16<div class="none" style="user-select:none"></div>
    1417<div class="none" style="-webkit-user-select:none"></div>
    1518</div>
    … …  
    1720<script>
    1821var selection = window.getSelection();
    19 function setSelection(node)
    20 {
     22function setSelection(node) {
    2123    var range = document.createRange();
    2224    range.selectNodeContents(node);
    … …  
    2527}
    2628
    27 test(function(){
    28     // user-select:none in editable element
     29test(function() {
     30    // user-select: none in editable element
    2931    sample1.style.webkitUserSelect = "none";
    3032    setSelection(sample1);
    3133    assert_equals(selection.type, "Range");
    3234
    33     // user-select:none in uneditable element
     35    // user-select: none in uneditable element
    3436    sample2.style.webkitUserSelect = "none";
    3537    setSelection(sample2);
    … …  
    3840
    3941var style = document.createElement("baz").style;
    40 test(function () {
     42test(function() {
     43  assert_true("userSelect" in style);
     44}, "'userSelect' in style");
     45test(function() {
    4146    assert_true("webkitUserSelect" in style);
    4247}, "'webkitUserSelect' in style");
    … …  
    5156
    5257function testUserSelect(style, title) {
    53     test(function () {
     58    test(function() {
     59        assert_equals(style.userSelect, "none");
     60    }, `userSelect of '${title}' should be 'none'`);
     61    test(function() {
    5462        assert_equals(style.webkitUserSelect, "none");
    55     }, "webkitUserSelect of '" + title + "' should be 'none'");
     63    }, `webkitUserSelect of '${title}' should be 'none'`);
    5664}
    5765</script>

  • trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt

    r292467 r293089  
    194194transition-timing-function: ease;
    195195unicode-bidi: normal;
     196user-select: text;
    196197vector-effect: none;
    197198vertical-align: baseline;
    … …  
    257258-webkit-user-drag: auto;
    258259-webkit-user-modify: read-only;
    259 -webkit-user-select: text;
    260260
    261261Other attributes that the computed style class supports:

  • trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r292467 r293089  
    193193transition-timing-function: ease
    194194unicode-bidi: normal
     195user-select: text
    195196vector-effect: none
    196197vertical-align: baseline
    … …  
    256257-webkit-user-drag: auto
    257258-webkit-user-modify: read-only
    258 -webkit-user-select: text
    259259background-position-x: 0%
    260260background-position-y: 0%

  • trunk/LayoutTests/fast/css/getComputedStyle/resources/property-names.js

    r292467 r293089  
    117117    "-webkit-user-drag": true,
    118118    "-webkit-user-modify": true,
    119     "-webkit-user-select": true,
    120119    "-webkit-writing-mode": true,
    121120    "alignment-baseline": true,
    … …  
    268267    "top": true,
    269268    "unicode-bidi": true,
     269    "user-select": true,
    270270    "vector-effect": true,
    271271    "vertical-align": true,

  • trunk/LayoutTests/imported/w3c/ChangeLog

    r293052 r293089  
     12022-04-20  Tim Nguyen  <ntim@apple.com>
     2
     3        Unprefix -webkit-user-select CSS property
     4        https://bugs.webkit.org/show_bug.cgi?id=208677
     5
     6        Reviewed by Simon Fraser.
     7
     8        WPT progressions.
     9
     10        * web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
     11        * web-platform-tests/css/css-ui/inheritance-expected.txt:
     12        * web-platform-tests/css/css-ui/parsing/user-select-computed-expected.txt:
     13        * web-platform-tests/css/css-ui/parsing/user-select-valid-expected.txt:
     14        * web-platform-tests/inert/inert-computed-style-expected.txt:
     15
    1162022-04-19  Alex Christensen  <achristensen@webkit.org>
    217

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt

    r292467 r293089  
    319319PASS translate
    320320PASS unicode-bidi
     321PASS user-select
    321322PASS vector-effect
    322323PASS vertical-align
    … …  
    398399PASS -webkit-user-drag
    399400PASS -webkit-user-modify
    400 PASS -webkit-user-select
    401401

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-ui/inheritance-expected.txt

    r284098 r293089  
    2626PASS Property resize has initial value none
    2727PASS Property resize does not inherit
    28 FAIL Property user-select has initial value auto assert_true: user-select doesn't seem to be supported in the computed style expected true got false
    29 FAIL Property user-select does not inherit assert_true: expected true got false
     28FAIL Property user-select has initial value auto assert_equals: expected "auto" but got "text"
     29FAIL Property user-select does not inherit assert_not_equals: got disallowed value "none"
    3030

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-ui/parsing/user-select-computed-expected.txt

    r264456 r293089  
    11
    2 FAIL Property user-select value 'auto' assert_true: user-select doesn't seem to be supported in the computed style expected true got false
    3 FAIL Property user-select value 'text' assert_true: user-select doesn't seem to be supported in the computed style expected true got false
    4 FAIL Property user-select value 'none' assert_true: user-select doesn't seem to be supported in the computed style expected true got false
    5 FAIL Property user-select value 'contain' assert_true: user-select doesn't seem to be supported in the computed style expected true got false
    6 FAIL Property user-select value 'all' assert_true: user-select doesn't seem to be supported in the computed style expected true got false
     2FAIL Property user-select value 'auto' assert_equals: expected "auto" but got "text"
     3PASS Property user-select value 'text'
     4PASS Property user-select value 'none'
     5FAIL Property user-select value 'contain' assert_true: 'contain' is a supported value for user-select. expected true got false
     6PASS Property user-select value 'all'
    77

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-ui/parsing/user-select-valid-expected.txt

    r264341 r293089  
    11
    2 FAIL e.style['user-select'] = "auto" should set the property value assert_not_equals: property should be set got disallowed value ""
    3 FAIL e.style['user-select'] = "text" should set the property value assert_not_equals: property should be set got disallowed value ""
    4 FAIL e.style['user-select'] = "none" should set the property value assert_not_equals: property should be set got disallowed value ""
     2PASS e.style['user-select'] = "auto" should set the property value
     3PASS e.style['user-select'] = "text" should set the property value
     4PASS e.style['user-select'] = "none" should set the property value
    55FAIL e.style['user-select'] = "contain" should set the property value assert_not_equals: property should be set got disallowed value ""
    6 FAIL e.style['user-select'] = "all" should set the property value assert_not_equals: property should be set got disallowed value ""
     6PASS e.style['user-select'] = "all" should set the property value
    77

  • trunk/LayoutTests/imported/w3c/web-platform-tests/inert/inert-computed-style-expected.txt

    r283795 r293089  
    11
    2 FAIL inert isn't hit-testable, but that isn't expose in the computed style assert_equals: inert node doesn't change pointer-events computed value expected (string) "auto" but got (undefined) undefined
     2FAIL inert isn't hit-testable, but that isn't expose in the computed style assert_equals: inert node doesn't change pointer-events computed value expected "auto" but got "text"
    33

  • trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt

    r292467 r293089  
    319319PASS translate
    320320PASS unicode-bidi
     321PASS user-select
    321322PASS vector-effect
    322323PASS vertical-align
    … …  
    396397PASS -webkit-user-drag
    397398PASS -webkit-user-modify
    398 PASS -webkit-user-select
    399399

  • trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt

    r292467 r293089  
    287287PASS transition-timing-function
    288288PASS unicode-bidi
     289PASS user-select
    289290PASS vector-effect
    290291PASS vertical-align
    … …  
    373374PASS -webkit-user-drag
    374375PASS -webkit-user-modify
    375 PASS -webkit-user-select
    376376

  • trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt

    r292467 r293089  
    319319PASS translate
    320320PASS unicode-bidi
     321PASS user-select
    321322PASS vector-effect
    322323PASS vertical-align
    … …  
    395396PASS -webkit-user-drag
    396397PASS -webkit-user-modify
    397 PASS -webkit-user-select
    398398

  • trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt

    r292467 r293089  
    385385rect: style.getPropertyValue(unicode-bidi) : normal
    386386rect: style.getPropertyCSSValue(unicode-bidi) : [object CSSPrimitiveValue]
     387rect: style.getPropertyValue(user-select) : text
     388rect: style.getPropertyCSSValue(user-select) : [object CSSPrimitiveValue]
    387389rect: style.getPropertyValue(vector-effect) : none
    388390rect: style.getPropertyCSSValue(vector-effect) : [object CSSPrimitiveValue]
    … …  
    511513rect: style.getPropertyValue(-webkit-user-modify) : read-only
    512514rect: style.getPropertyCSSValue(-webkit-user-modify) : [object CSSPrimitiveValue]
    513 rect: style.getPropertyValue(-webkit-user-select) : text
    514 rect: style.getPropertyCSSValue(-webkit-user-select) : [object CSSPrimitiveValue]
    515515g: style.getPropertyValue(align-content) : normal
    516516g: style.getPropertyCSSValue(align-content) : [object CSSValueList]
    … …  
    899899g: style.getPropertyValue(unicode-bidi) : normal
    900900g: style.getPropertyCSSValue(unicode-bidi) : [object CSSPrimitiveValue]
     901g: style.getPropertyValue(user-select) : text
     902g: style.getPropertyCSSValue(user-select) : [object CSSPrimitiveValue]
    901903g: style.getPropertyValue(vector-effect) : none
    902904g: style.getPropertyCSSValue(vector-effect) : [object CSSPrimitiveValue]
    … …  
    10251027g: style.getPropertyValue(-webkit-user-modify) : read-only
    10261028g: style.getPropertyCSSValue(-webkit-user-modify) : [object CSSPrimitiveValue]
    1027 g: style.getPropertyValue(-webkit-user-select) : text
    1028 g: style.getPropertyCSSValue(-webkit-user-select) : [object CSSPrimitiveValue]
    10291029

  • trunk/Source/WebCore/ChangeLog

    r293086 r293089  
     12022-04-20  Tim Nguyen  <ntim@apple.com>
     2
     3        Unprefix -webkit-user-select CSS property
     4        https://bugs.webkit.org/show_bug.cgi?id=208677
     5
     6        Reviewed by Simon Fraser.
     7
     8        * animation/CSSPropertyAnimation.cpp:
     9        (WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
     10        * css/CSSComputedStyleDeclaration.cpp:
     11        (WebCore::ComputedStyleExtractor::valueForPropertyInStyle):
     12        * css/CSSProperties.json:
     13        * css/parser/CSSParserFastPaths.cpp:
     14        (WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
     15        (WebCore::CSSParserFastPaths::isKeywordPropertyID):
     16        * css/html.css:
     17        (#if defined(WTF_PLATFORM_IOS_FAMILY) && WTF_PLATFORM_IOS_FAMILY):
     18        (input::-webkit-inner-spin-button):
     19        (input::-webkit-strong-password-auto-fill-button):
     20        (input::-webkit-credentials-auto-fill-button):
     21        (input::-webkit-contacts-auto-fill-button):
     22        (input::-webkit-credit-card-auto-fill-button):
     23        (input::-webkit-caps-lock-indicator):
     24        (#if defined(ENABLE_DATALIST_ELEMENT) && ENABLE_DATALIST_ELEMENT):
     25        (textarea):
     26        (input:-webkit-autofill-strong-password):
     27        * css/mediaControls.css:
     28        (audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel):
     29        (audio::-webkit-media-controls-timeline-container, video::-webkit-media-controls-timeline-container):
     30        (video::-webkit-media-text-track-container):
     31        * css/plugIns.css:
     32        (embed::-webkit-snapshotted-plugin-content > .snapshot-overlay > .snapshot-label,):
     33        * dom/ImageOverlay.cpp:
     34        (WebCore::ImageOverlay::updateSubtree):
     35        (WebCore::ImageOverlay::updateWithTextRecognitionResult):
     36        * html/HTMLElement.cpp:
     37        (WebCore::HTMLElement::collectPresentationalHintsForAttribute):
     38
    1392022-04-20  Diego Pino Garcia  <dpino@igalia.com>
    240

  • trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp

    r292497 r293089  
    36513651        case CSSPropertyWebkitUserDrag:
    36523652        case CSSPropertyWebkitUserModify:
    3653         case CSSPropertyWebkitUserSelect:
     3653        case CSSPropertyUserSelect:
    36543654            continue;
    36553655        default:

  • trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

    r293042 r293089  
    38403840        case CSSPropertyWebkitUserDrag:
    38413841            return cssValuePool.createValue(style.userDrag());
    3842         case CSSPropertyWebkitUserSelect:
     3842        case CSSPropertyUserSelect:
    38433843            return cssValuePool.createValue(style.userSelect());
    38443844        case CSSPropertyBorderBottomLeftRadius:

  • trunk/Source/WebCore/css/CSSProperties.json

    r292759 r293089  
    72657265            "status": "non-standard"
    72667266        },
    7267         "-webkit-user-select": {
    7268             "inherited": true,
    7269             "values": [
    7270                 "element"
    7271             ],
    7272             "status": {
    7273                 "status": "experimental"
    7274         },
     7267        "user-select": {
     7268            "codegen-properties": {
     7269                "aliases": [
     7270                    "-webkit-user-select"
     7271                ]
     7272            },
     7273            "inherited": true,
     7274            "values": [
     7275                "none",
     7276                "auto",
     7277                "text",
     7278                "all",
     7279                {
     7280                    "value": "contain",
     7281                    "status": "unimplemented"
     7282                }
     7283            ],
    72757284            "specification": {
    72767285                "category": "css-ui",

  • trunk/Source/WebCore/css/html.css

    r293085 r293089  
    423423#endif
    424424    -webkit-rtl-ordering: logical;
    425     -webkit-user-select: text;
     425    user-select: text;
    426426    cursor: auto;
    427427}
    … …  
    598598    height: 1.5em;
    599599    flex: none;
    600     -webkit-user-select: none;
     600    user-select: none;
    601601}
    602602
    … …  
    605605    font-family: -apple-system !important;
    606606    -webkit-text-security: none !important;
    607     -webkit-user-select: none !important;
     607    user-select: none !important;
    608608    pointer-events: none !important;
    609609    text-align: right !important;
    … …  
    631631#endif
    632632    flex: none;
    633     -webkit-user-select: none;
     633    user-select: none;
    634634}
    635635
    … …  
    663663    background-color: black;
    664664    flex: none;
    665     -webkit-user-select: none;
     665    user-select: none;
    666666}
    667667
    … …  
    683683    background-color: black;
    684684    flex: none;
    685     -webkit-user-select: none;
     685    user-select: none;
    686686}
    687687
    … …  
    700700    align-self: stretch;
    701701    flex: none;
    702     -webkit-user-select: none;
     702    user-select: none;
    703703}
    704704
    … …  
    711711    align-self: stretch;
    712712    flex: none;
    713     -webkit-user-select: none;
     713    user-select: none;
    714714#if defined(WTF_PLATFORM_IOS_FAMILY) && WTF_PLATFORM_IOS_FAMILY
    715715    width: 11px;
    … …  
    739739    border: 1px solid;
    740740    -webkit-rtl-ordering: logical;
    741     -webkit-user-select: text;
     741    user-select: text;
    742742    padding: 2px;
    743743#else
    … …  
    789789
    790790input:-webkit-autofill-strong-password {
    791     -webkit-user-select: none !important;
     791    user-select: none !important;
    792792}
    793793

  • trunk/Source/WebCore/css/mediaControls.css

    r274810 r293089  
    4747    flex-direction: row;
    4848    align-items: center;
    49     -webkit-user-select: none;
     49    user-select: none;
    5050    position: relative;
    5151    bottom: 0;
    … …  
    101101    justify-content: flex-end;
    102102    flex: 1 1;
    103     -webkit-user-select: none;
     103    user-select: none;
    104104    height: 16px;
    105105    min-width: 0;
    … …  
    231231    text-decoration: none;
    232232    pointer-events: none;
    233     -webkit-user-select: none;
     233    user-select: none;
    234234    word-break: break-word;
    235235

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

    r292759 r293089  
    827827    case CSSPropertyWebkitUserModify: // read-only | read-write
    828828        return valueID == CSSValueReadOnly || valueID == CSSValueReadWrite || valueID == CSSValueReadWritePlaintextOnly;
    829     case CSSPropertyWebkitUserSelect: // auto | none | text | all
     829    case CSSPropertyUserSelect: // auto | none | text | all
    830830        return valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueText || valueID == CSSValueAll;
    831831    case CSSPropertyWritingMode:
    … …  
    991991    case CSSPropertyWebkitUserDrag:
    992992    case CSSPropertyWebkitUserModify:
    993     case CSSPropertyWebkitUserSelect:
     993    case CSSPropertyUserSelect:
    994994    case CSSPropertyWhiteSpace:
    995995    case CSSPropertyWordBreak:

  • trunk/Source/WebCore/css/plugIns.css

    r188653 r293089  
    6969{
    7070    color: black;
    71     -webkit-user-select: none;
     71    user-select: none;
    7272}
    7373

  • trunk/Source/WebCore/dom/ImageOverlay.cpp

    r293059 r293089  
    379379            rootContainer->setTranslate(false);
    380380            if (document->isImageDocument())
    381                 rootContainer->setInlineStyleProperty(CSSPropertyWebkitUserSelect, CSSValueText);
     381                rootContainer->setInlineStyleProperty(CSSPropertyUserSelect, CSSValueText);
    382382
    383383            if (mediaControlsContainer)
    … …  
    441441
    442442        if (document->quirks().needsToForceUserSelectAndUserDragWhenInstallingImageOverlay()) {
    443             element.setInlineStyleProperty(CSSPropertyWebkitUserSelect, CSSValueText);
     443            element.setInlineStyleProperty(CSSPropertyUserSelect, CSSValueText);
    444444            element.setInlineStyleProperty(CSSPropertyWebkitUserDrag, CSSValueAuto);
    445445        }
    … …  
    566566            ));
    567567
    568             textContainer->setInlineStyleProperty(CSSPropertyWebkitUserSelect, applyUserSelectAll ? CSSValueAll : CSSValueNone);
     568            textContainer->setInlineStyleProperty(CSSPropertyUserSelect, applyUserSelectAll ? CSSValueAll : CSSValueNone);
    569569        }
    570570

  • trunk/Source/WebCore/html/HTMLElement.cpp

    r293059 r293089  
    215215            addPropertyToPresentationalHintStyle(style, CSSPropertyWebkitUserDrag, CSSValueElement);
    216216            if (!isDraggableIgnoringAttributes())
    217                 addPropertyToPresentationalHintStyle(style, CSSPropertyWebkitUserSelect, CSSValueNone);
     217                addPropertyToPresentationalHintStyle(style, CSSPropertyUserSelect, CSSValueNone);
    218218        } else if (equalLettersIgnoringASCIICase(value, "false"))
    219219            addPropertyToPresentationalHintStyle(style, CSSPropertyWebkitUserDrag, CSSValueNone);
Note: See TracChangeset for help on using the changeset viewer.