Changeset 145168 in webkit


Ignore:
Timestamp:
Mar 7, 2013 6:08:41 PM (11 years ago)
Author:
akling@apple.com
Message:

Remove desktop version of -webkit-text-size-adjust property.
<​http://webkit.org/b/56543>
<rdar://problem/9150203>

Reviewed by Simon Fraser.

Source/WebCore:

This property existed to support a number of Apple-internal clients of WebKit.
We no longer need this property, and since it's clashing with a mobile version of the
same property with different meaning, let's remove it altogether from the desktop build.

  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):

  • css/CSSParser.cpp:

(WebCore::isValidKeywordPropertyAndValue):
(WebCore::isKeywordPropertyID):
(WebCore::CSSParser::parseValue):

  • css/CSSPrimitiveValue.cpp:

(WebCore::CSSPrimitiveValue::computeLengthDouble):

  • css/CSSProperty.cpp:

(WebCore::CSSProperty::isInheritedProperty):

  • css/CSSPropertyNames.in:
  • css/StyleBuilder.cpp:

(WebCore::ApplyPropertyLineHeight::applyValue):

  • css/StyleResolver.cpp:

(WebCore::StyleResolver::updateFont):
(WebCore::StyleResolver::applyProperties):
(WebCore::StyleResolver::applyProperty):

  • css/StyleResolver.h:

(StyleResolver):

  • css/svg.css:
  • editing/EditingStyle.cpp:
  • inspector/front-end/inspector.css:

(#console-messages):

  • inspector/front-end/resourcesPanel.css:

(.storage-view.query):

  • rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::diff):

  • rendering/style/RenderStyle.h:
  • rendering/style/StyleRareInheritedData.cpp:

(WebCore::StyleRareInheritedData::StyleRareInheritedData):
(WebCore::StyleRareInheritedData::operator==):

  • rendering/style/StyleRareInheritedData.h:

(StyleRareInheritedData):

LayoutTests:

  • editing/pasteboard/5078739.html:
  • editing/pasteboard/data-transfer-items-expected.txt:
  • editing/pasteboard/onpaste-text-html-expected.txt:
  • fast/css/font-size-nan.svg:
  • fast/css/getComputedStyle/computed-style-expected.txt:
  • fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • fast/css/getComputedStyle/resources/property-names.js:
  • fast/css/ignore-text-zoom.html: Removed.
  • fast/css/text-rendering-priority.html:
  • fast/events/ondrop-text-html-expected.txt:
  • platform/chromium-linux/fast/css/ignore-text-zoom-expected.png: Removed.
  • platform/chromium-mac-lion/fast/css/ignore-text-zoom-expected.png: Removed.
  • platform/chromium-mac-snowleopard/fast/css/ignore-text-zoom-expected.png: Removed.
  • platform/chromium-mac/fast/css/ignore-text-zoom-expected.png: Removed.
  • platform/chromium-win/fast/css/ignore-text-zoom-expected.png: Removed.
  • platform/chromium-win/fast/css/ignore-text-zoom-expected.txt: Removed.
  • platform/chromium/fast/css/ignore-text-zoom-expected.txt: Removed.
  • platform/efl/fast/css/ignore-text-zoom-expected.png: Removed.
  • platform/efl/fast/css/ignore-text-zoom-expected.txt: Removed.
  • platform/gtk/fast/css/ignore-text-zoom-expected.png: Removed.
  • platform/gtk/fast/css/ignore-text-zoom-expected.txt: Removed.
  • platform/mac/fast/css/ignore-text-zoom-expected.png: Removed.
  • platform/mac/fast/css/ignore-text-zoom-expected.txt: Removed.
  • platform/qt/fast/css/ignore-text-zoom-expected.png: Removed.
  • platform/qt/fast/css/ignore-text-zoom-expected.txt: Removed.
Location:
trunk
Files:
8 deleted
27 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r145165 r145168  
     12013-03-07  Andreas Kling  <akling@apple.com>
     2
     3        Remove desktop version of -webkit-text-size-adjust property.
     4        <http://webkit.org/b/56543>
     5        <rdar://problem/9150203>
     6
     7        Reviewed by Simon Fraser.
     8
     9        * editing/pasteboard/5078739.html:
     10        * editing/pasteboard/data-transfer-items-expected.txt:
     11        * editing/pasteboard/onpaste-text-html-expected.txt:
     12        * fast/css/font-size-nan.svg:
     13        * fast/css/getComputedStyle/computed-style-expected.txt:
     14        * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     15        * fast/css/getComputedStyle/resources/property-names.js:
     16        * fast/css/ignore-text-zoom.html: Removed.
     17        * fast/css/text-rendering-priority.html:
     18        * fast/events/ondrop-text-html-expected.txt:
     19        * platform/chromium-linux/fast/css/ignore-text-zoom-expected.png: Removed.
     20        * platform/chromium-mac-lion/fast/css/ignore-text-zoom-expected.png: Removed.
     21        * platform/chromium-mac-snowleopard/fast/css/ignore-text-zoom-expected.png: Removed.
     22        * platform/chromium-mac/fast/css/ignore-text-zoom-expected.png: Removed.
     23        * platform/chromium-win/fast/css/ignore-text-zoom-expected.png: Removed.
     24        * platform/chromium-win/fast/css/ignore-text-zoom-expected.txt: Removed.
     25        * platform/chromium/fast/css/ignore-text-zoom-expected.txt: Removed.
     26        * platform/efl/fast/css/ignore-text-zoom-expected.png: Removed.
     27        * platform/efl/fast/css/ignore-text-zoom-expected.txt: Removed.
     28        * platform/gtk/fast/css/ignore-text-zoom-expected.png: Removed.
     29        * platform/gtk/fast/css/ignore-text-zoom-expected.txt: Removed.
     30        * platform/mac/fast/css/ignore-text-zoom-expected.png: Removed.
     31        * platform/mac/fast/css/ignore-text-zoom-expected.txt: Removed.
     32        * platform/qt/fast/css/ignore-text-zoom-expected.png: Removed.
     33        * platform/qt/fast/css/ignore-text-zoom-expected.txt: Removed.
     34
    1352013-03-07  Aaron Colwell  <acolwell@chromium.org>
    236

  • trunk/LayoutTests/editing/pasteboard/5078739.html

    r120173 r145168  
    88var div = document.getElementById("div");
    99div.focus();
    10 document.execCommand("InsertHTML", false, "<span class='Apple-style-span' style='border-collapse: separate; color: rgb(0, 0, 0); font-family: Times; font-size: 16px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: auto; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; -webkit-text-decorations-in-effect: none; -webkit-text-fill-color: rgb(0, 0, 0); -webkit-text-size-adjust: auto; -webkit-text-stroke-color: rgb(0, 0, 0); -webkit-text-stroke-width: 0; '></span>");
     10document.execCommand("InsertHTML", false, "<span class='Apple-style-span' style='border-collapse: separate; color: rgb(0, 0, 0); font-family: Times; font-size: 16px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: auto; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; -webkit-text-decorations-in-effect: none; -webkit-text-fill-color: rgb(0, 0, 0); -webkit-text-stroke-color: rgb(0, 0, 0); -webkit-text-stroke-width: 0; '></span>");
    1111</script>

  • trunk/LayoutTests/editing/pasteboard/data-transfer-items-expected.txt

    r141449 r145168  
    2222copy: items[1] value: <b>Hello World!
    2323paste: items[0] value: This file tests the basic functionality and properties of DataTransferItems. This test requires DRT.
    24 paste: items[1] value: <span style="color: rgb(0, 0, 0); font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; display: inline !important; float: none;">This file tests the basic functionality and properties of DataTransferItems. This test requires DRT.</span>
     24paste: items[1] value: <span style="color: rgb(0, 0, 0); font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; display: inline !important; float: none;">This file tests the basic functionality and properties of DataTransferItems. This test requires DRT.</span>
    2525

  • trunk/LayoutTests/editing/pasteboard/onpaste-text-html-expected.txt

    r137204 r145168  
    11CONSOLE MESSAGE: line 21: text/plain: This test verifies that we can get text/html from the clipboard during an onpaste event.
    2 CONSOLE MESSAGE: line 23: text/html: <span style="color: rgb(0, 0, 0); font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; display: inline !important; float: none;">This test verifies that we can get text/html from the clipboard during an onpaste event.<span class="Apple-converted-space"> </span></span>
     2CONSOLE MESSAGE: line 23: text/html: <span style="color: rgb(0, 0, 0); font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; display: inline !important; float: none;">This test verifies that we can get text/html from the clipboard during an onpaste event.<span class="Apple-converted-space"> </span></span>
    33This test verifies that we can get text/html from the clipboard during an onpaste event. This test requires DRT.
    44Paste content in this div.This test verifies that we can get text/html from the clipboard during an onpaste event. 

  • trunk/LayoutTests/fast/css/font-size-nan.svg

    r136074 r145168  
    66</script>
    77</head>
    8 <samp style="-webkit-line-clamp: 69; font: 27160em Ahem;"><emptycustomtag><foobar style="-webkit-box-shadow: 1662977863 125px 111px mediumorchid, 112 130px 6px royalblue; zoom: 183.924360629; "><acronym style="-webkit-hyphenate-limit-lines: 207; -webkit-text-size-adjust: none;"><code><highlight></highlight><href></href></code></acronym></foobar>
     8<samp style="-webkit-line-clamp: 69; font: 27160em Ahem;"><emptycustomtag><foobar style="-webkit-box-shadow: 1662977863 125px 111px mediumorchid, 112 130px 6px royalblue; zoom: 183.924360629; "><acronym style="-webkit-hyphenate-limit-lines: 207;"><code><highlight></highlight><href></href></code></acronym></foobar>
    99<div>PASS: WebKit doesn't crash.</div>
    1010<textarea style="border-image: url() 212 57 14584936043161189249 63/75px stretch stretch; "></textarea></emptycustomtag></samp>

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

    r145029 r145168  
    258258-webkit-mask-position-x: 0%;
    259259-webkit-mask-position-y: 0%;
    260 -webkit-text-size-adjust: auto;
    261 
     260

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

    r145029 r145168  
    254254-webkit-mask-position-x: 0%
    255255-webkit-mask-position-y: 0%
    256 -webkit-text-size-adjust: auto
    257256
    258257After changing grandparent's 'color' and the parent's 'font-size' inherited properties:

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

    r125716 r145168  
    263263    "-webkit-mask-position-x",
    264264    "-webkit-mask-position-y",
    265     "-webkit-text-size-adjust",
    266265];

  • trunk/LayoutTests/fast/css/text-rendering-priority.html

    r120683 r145168  
    1313        #target { text-rendering: optimizelegibility; }
    1414        #target { -webkit-font-smoothing: none; }
    15         #target { -webkit-text-size-adjust: none; }
    1615        #target { zoom: 2; }
    1716    </style>

  • trunk/LayoutTests/fast/events/ondrop-text-html-expected.txt

    r137204 r145168  
    11CONSOLE MESSAGE: line 21: text/plain: This test verifies that we can get text/html from the drag object during an ondrop event.
    2 CONSOLE MESSAGE: line 23: text/html: <span style="color: rgb(0, 0, 0); font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; display: inline !important; float: none;">This test verifies that we can get text/html from the drag object during an ondrop event.<span class="Apple-converted-space"> </span></span>
     2CONSOLE MESSAGE: line 23: text/html: <span style="color: rgb(0, 0, 0); font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; display: inline !important; float: none;">This test verifies that we can get text/html from the drag object during an ondrop event.<span class="Apple-converted-space"> </span></span>
    33This test verifies that we can get text/html from the drag object during an ondrop event. This test requires DRT.
    44PASS

  • trunk/Source/WebCore/ChangeLog

    r145166 r145168  
     12013-03-07  Andreas Kling  <akling@apple.com>
     2
     3        Remove desktop version of -webkit-text-size-adjust property.
     4        <http://webkit.org/b/56543>
     5        <rdar://problem/9150203>
     6
     7        Reviewed by Simon Fraser.
     8
     9        This property existed to support a number of Apple-internal clients of WebKit.
     10        We no longer need this property, and since it's clashing with a mobile version of the
     11        same property with different meaning, let's remove it altogether from the desktop build.
     12
     13        * css/CSSComputedStyleDeclaration.cpp:
     14        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
     15        * css/CSSParser.cpp:
     16        (WebCore::isValidKeywordPropertyAndValue):
     17        (WebCore::isKeywordPropertyID):
     18        (WebCore::CSSParser::parseValue):
     19        * css/CSSPrimitiveValue.cpp:
     20        (WebCore::CSSPrimitiveValue::computeLengthDouble):
     21        * css/CSSProperty.cpp:
     22        (WebCore::CSSProperty::isInheritedProperty):
     23        * css/CSSPropertyNames.in:
     24        * css/StyleBuilder.cpp:
     25        (WebCore::ApplyPropertyLineHeight::applyValue):
     26        * css/StyleResolver.cpp:
     27        (WebCore::StyleResolver::updateFont):
     28        (WebCore::StyleResolver::applyProperties):
     29        (WebCore::StyleResolver::applyProperty):
     30        * css/StyleResolver.h:
     31        (StyleResolver):
     32        * css/svg.css:
     33        * editing/EditingStyle.cpp:
     34        * inspector/front-end/inspector.css:
     35        (#console-messages):
     36        * inspector/front-end/resourcesPanel.css:
     37        (.storage-view.query):
     38        * rendering/style/RenderStyle.cpp:
     39        (WebCore::RenderStyle::diff):
     40        * rendering/style/RenderStyle.h:
     41        * rendering/style/StyleRareInheritedData.cpp:
     42        (WebCore::StyleRareInheritedData::StyleRareInheritedData):
     43        (WebCore::StyleRareInheritedData::operator==):
     44        * rendering/style/StyleRareInheritedData.h:
     45        (StyleRareInheritedData):
     46
    1472013-03-07  Joshua Bell  <jsbell@chromium.org>
    248

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

    r145029 r145168  
    21972197        case CSSPropertyWebkitTextSecurity:
    21982198            return cssValuePool().createValue(style->textSecurity());
    2199         case CSSPropertyWebkitTextSizeAdjust:
    2200             if (style->textSizeAdjust())
    2201                 return cssValuePool().createIdentifierValue(CSSValueAuto);
    2202             return cssValuePool().createIdentifierValue(CSSValueNone);
    22032199        case CSSPropertyWebkitTextStrokeColor:
    22042200            return currentColorOrValidColor(style.get(), style->textStrokeColor());

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

    r145029 r145168  
    987987        // disc | circle | square | none | inherit
    988988        if (valueID == CSSValueDisc || valueID == CSSValueCircle || valueID == CSSValueSquare || valueID == CSSValueNone)
    989             return true;
    990         break;
    991     case CSSPropertyWebkitTextSizeAdjust:
    992         if (valueID == CSSValueAuto || valueID == CSSValueNone)
    993989            return true;
    994990        break;
    … …  
    11441140    case CSSPropertyWebkitTextEmphasisPosition:
    11451141    case CSSPropertyWebkitTextSecurity:
    1146     case CSSPropertyWebkitTextSizeAdjust:
    11471142    case CSSPropertyWebkitTransformStyle:
    11481143    case CSSPropertyWebkitUserDrag:
    … …  
    30333028    case CSSPropertyWebkitTextEmphasisPosition:
    30343029    case CSSPropertyWebkitTextSecurity:
    3035     case CSSPropertyWebkitTextSizeAdjust:
    30363030    case CSSPropertyWebkitTransformStyle:
    30373031    case CSSPropertyWebkitUserDrag:

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

    r143232 r145168  
    581581    // We do not apply the zoom factor when we are computing the value of the font-size property. The zooming
    582582    // for font sizes is much more complicated, since we have to worry about enforcing the minimum font size preference
    583     // as well as enforcing the implicit "smart minimum." In addition the CSS property text-size-adjust is used to
    584     // prevent text from zooming at all. Therefore we will not apply the zoom here if we are computing font-size.
     583    // as well as enforcing the implicit "smart minimum."
    585584    double result = getDoubleValue() * factor;
    586585    if (computingFontSize || isFontRelativeLength())

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

    r145003 r145168  
    342342    case CSSPropertyWebkitTextOrientation:
    343343    case CSSPropertyWebkitTextSecurity:
    344     case CSSPropertyWebkitTextSizeAdjust:
    345344    case CSSPropertyWebkitTextStroke:
    346345    case CSSPropertyWebkitTextStrokeColor:

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

    r145003 r145168  
    2828-webkit-text-orientation
    2929-epub-text-orientation = -webkit-text-orientation
    30 -webkit-text-size-adjust
    3130-webkit-writing-mode
    3231-epub-writing-mode = -webkit-writing-mode

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

    r145003 r145168  
    11641164        else if (primitiveValue->isLength()) {
    11651165            double multiplier = styleResolver->style()->effectiveZoom();
    1166             if (styleResolver->style()->textSizeAdjust()) {
    1167                 if (Frame* frame = styleResolver->document()->frame())
    1168                     multiplier *= frame->textZoomFactor();
    1169             }
     1166            if (Frame* frame = styleResolver->document()->frame())
     1167                multiplier *= frame->textZoomFactor();
    11701168            lineHeight = primitiveValue->computeLength<Length>(styleResolver->style(), styleResolver->rootElementStyle(), multiplier);
    11711169        } else if (primitiveValue->isPercentage()) {

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

    r145061 r145168  
    20452045        return;
    20462046
    2047     checkForTextSizeAdjust();
    20482047    RenderStyle* style = m_state.style();
    20492048    checkForGenericFamilyChange(style, m_state.parentStyle());
    … …  
    21982197        case HighPriorityProperties:
    21992198            COMPILE_ASSERT(firstCSSProperty == CSSPropertyColor, CSS_color_is_first_property);
    2200             COMPILE_ASSERT(CSSPropertyZoom == CSSPropertyColor + 18, CSS_zoom_is_end_of_first_prop_range);
     2199            COMPILE_ASSERT(CSSPropertyZoom == CSSPropertyColor + 17, CSS_zoom_is_end_of_first_prop_range);
    22012200            COMPILE_ASSERT(CSSPropertyLineHeight == CSSPropertyZoom + 1, CSS_line_height_is_after_zoom);
    22022201#if ENABLE(CSS_VARIABLES)
    … …  
    32783277        fontDescription.setScript(localeToScriptCodeForFontSelection(state.style()->locale()));
    32793278        setFontDescription(fontDescription);
    3280         return;
    3281     }
    3282     case CSSPropertyWebkitTextSizeAdjust: {
    3283         HANDLE_INHERIT_AND_INITIAL(textSizeAdjust, TextSizeAdjust)
    3284         if (!primitiveValue || !primitiveValue->getIdent())
    3285             return;
    3286         setTextSizeAdjust(primitiveValue->getIdent() == CSSValueAuto);
    32873279        return;
    32883280    }
    … …  
    39223914}
    39233915
    3924 void StyleResolver::checkForTextSizeAdjust()
    3925 {
    3926     RenderStyle* style = m_state.style();
    3927 
    3928     if (style->textSizeAdjust())
    3929         return;
    3930 
    3931     FontDescription newFontDescription(style->fontDescription());
    3932     newFontDescription.setComputedSize(newFontDescription.specifiedSize());
    3933     style->setFontDescription(newFontDescription);
    3934 }
    3935 
    39363916void StyleResolver::checkForZoomChange(RenderStyle* style, RenderStyle* parentStyle)
    39373917{

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

    r145061 r145168  
    330330    void checkForGenericFamilyChange(RenderStyle*, RenderStyle* parentStyle);
    331331    void checkForZoomChange(RenderStyle*, RenderStyle* parentStyle);
    332     void checkForTextSizeAdjust();
    333332
    334333    void adjustRenderStyle(RenderStyle* styleToAdjust, RenderStyle* parentStyle, Element*);
    … …  
    523522        void setZoom(float f) { m_fontDirty |= m_style->setZoom(f); }
    524523        void setEffectiveZoom(float f) { m_fontDirty |= m_style->setEffectiveZoom(f); }
    525         void setTextSizeAdjust(bool b) { m_fontDirty |= m_style->setTextSizeAdjust(b); }
    526524        void setWritingMode(WritingMode writingMode) { m_fontDirty |= m_style->setWritingMode(writingMode); }
    527525        void setTextOrientation(TextOrientation textOrientation) { m_fontDirty |= m_style->setTextOrientation(textOrientation); }
    … …  
    600598    void setZoom(float f) { m_state.setZoom(f); }
    601599    void setEffectiveZoom(float f) { m_state.setEffectiveZoom(f); }
    602     void setTextSizeAdjust(bool b) { m_state.setTextSizeAdjust(b); }
    603600    void setWritingMode(WritingMode writingMode) { m_state.setWritingMode(writingMode); }
    604601    void setTextOrientation(TextOrientation textOrientation) { m_state.setTextOrientation(textOrientation); }

  • trunk/Source/WebCore/css/svg.css

    r110532 r145168  
    5656}
    5757
    58 text, tspan, tref {
    59    -webkit-text-size-adjust: none;
    60 }
    61 
    6258/* states */
    6359

  • trunk/Source/WebCore/editing/EditingStyle.cpp

    r144995 r145168  
    7979    CSSPropertyWebkitTextDecorationsInEffect,
    8080    CSSPropertyWebkitTextFillColor,
    81     CSSPropertyWebkitTextSizeAdjust,
    8281    CSSPropertyWebkitTextStrokeColor,
    8382    CSSPropertyWebkitTextStrokeWidth,

  • trunk/Source/WebCore/inspector/front-end/inspector.css

    r144927 r145168  
    943943    word-wrap: break-word;
    944944    -webkit-user-select: text;
    945     -webkit-text-size-adjust: auto;
    946945}
    947946

  • trunk/Source/WebCore/inspector/front-end/resourcesPanel.css

    r144060 r145168  
    132132    overflow-y: overlay;
    133133    overflow-x: hidden;
    134     -webkit-text-size-adjust: auto;
    135134}
    136135

  • trunk/Source/WebCore/rendering/style/RenderStyle.cpp

    r143300 r145168  
    483483            || rareInheritedData->indent != other->rareInheritedData->indent
    484484            || rareInheritedData->m_effectiveZoom != other->rareInheritedData->m_effectiveZoom
    485             || rareInheritedData->textSizeAdjust != other->rareInheritedData->textSizeAdjust
    486485            || rareInheritedData->wordBreak != other->rareInheritedData->wordBreak
    487486            || rareInheritedData->overflowWrap != other->rareInheritedData->overflowWrap

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

    r145003 r145168  
    926926    bool useTouchOverflowScrolling() const { return rareInheritedData->useTouchOverflowScrolling; }
    927927#endif
    928     bool textSizeAdjust() const { return rareInheritedData->textSizeAdjust; }
    929928    ETextSecurity textSecurity() const { return static_cast<ETextSecurity>(rareInheritedData->textSecurity); }
    930929
    … …  
    13951394    void setUseTouchOverflowScrolling(bool v) { SET_VAR(rareInheritedData, useTouchOverflowScrolling, v); }
    13961395#endif
    1397     bool setTextSizeAdjust(bool);
    13981396    void setTextSecurity(ETextSecurity aTextSecurity) { SET_VAR(rareInheritedData, textSecurity, aTextSecurity); }
    13991397
    … …  
    17051703    // Keep these at the end.
    17061704    static LineClampValue initialLineClamp() { return LineClampValue(); }
    1707     static bool initialTextSizeAdjust() { return true; }
    17081705    static ETextSecurity initialTextSecurity() { return TSNONE; }
    17091706#if ENABLE(TOUCH_EVENTS)
    … …  
    18421839}
    18431840
    1844 inline bool RenderStyle::setTextSizeAdjust(bool b)
    1845 {
    1846     if (compareEqual(rareInheritedData->textSizeAdjust, b))
    1847         return false;
    1848     rareInheritedData.access()->textSizeAdjust = b;
    1849     return true;
    1850 }
    1851 
    18521841inline bool RenderStyle::setTextOrientation(TextOrientation textOrientation)
    18531842{

  • trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp

    r141570 r145168  
    7979    , nbspMode(NBNORMAL)
    8080    , lineBreak(LineBreakAuto)
    81     , textSizeAdjust(RenderStyle::initialTextSizeAdjust())
    8281    , resize(RenderStyle::initialResize())
    8382    , userSelect(RenderStyle::initialUserSelect())
    … …  
    149148    , nbspMode(o.nbspMode)
    150149    , lineBreak(o.lineBreak)
    151     , textSizeAdjust(o.textSizeAdjust)
    152150    , resize(o.resize)
    153151    , userSelect(o.userSelect)
    … …  
    240238        && useTouchOverflowScrolling == o.useTouchOverflowScrolling
    241239#endif
    242         && textSizeAdjust == o.textSizeAdjust
    243240        && resize == o.resize
    244241        && userSelect == o.userSelect

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

    r139734 r145168  
    9292    unsigned nbspMode : 1; // ENBSPMode
    9393    unsigned lineBreak : 3; // LineBreak
    94     unsigned textSizeAdjust : 1; // An Apple extension.
    9594    unsigned resize : 2; // EResize
    9695    unsigned userSelect : 2; // EUserSelect
Note: See TracChangeset for help on using the changeset viewer.