Changeset 145168 in webkit
- Timestamp:
- Mar 7, 2013 6:08:41 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 8 deleted
- 27 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r145165 r145168 1 2013-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 1 35 2013-03-07 Aaron Colwell <acolwell@chromium.org> 2 36 -
trunk/LayoutTests/editing/pasteboard/5078739.html
r120173 r145168 8 8 var div = document.getElementById("div"); 9 9 div.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-s ize-adjust: auto; -webkit-text-stroke-color: rgb(0, 0, 0); -webkit-text-stroke-width: 0; '></span>");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-stroke-color: rgb(0, 0, 0); -webkit-text-stroke-width: 0; '></span>"); 11 11 </script> -
trunk/LayoutTests/editing/pasteboard/data-transfer-items-expected.txt
r141449 r145168 22 22 copy: items[1] value: <b>Hello World! 23 23 paste: 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-s ize-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>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-stroke-width: 0px; display: inline !important; float: none;">This file tests the basic functionality and properties of DataTransferItems. This test requires DRT.</span> 25 25 -
trunk/LayoutTests/editing/pasteboard/onpaste-text-html-expected.txt
r137204 r145168 1 1 CONSOLE 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-s ize-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>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-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> 3 3 This test verifies that we can get text/html from the clipboard during an onpaste event. This test requires DRT. 4 4 Paste 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 6 6 </script> 7 7 </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> 9 9 <div>PASS: WebKit doesn't crash.</div> 10 10 <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 258 258 -webkit-mask-position-x: 0%; 259 259 -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 254 254 -webkit-mask-position-x: 0% 255 255 -webkit-mask-position-y: 0% 256 -webkit-text-size-adjust: auto257 256 258 257 After changing grandparent's 'color' and the parent's 'font-size' inherited properties: -
trunk/LayoutTests/fast/css/getComputedStyle/resources/property-names.js
r125716 r145168 263 263 "-webkit-mask-position-x", 264 264 "-webkit-mask-position-y", 265 "-webkit-text-size-adjust",266 265 ]; -
trunk/LayoutTests/fast/css/text-rendering-priority.html
r120683 r145168 13 13 #target { text-rendering: optimizelegibility; } 14 14 #target { -webkit-font-smoothing: none; } 15 #target { -webkit-text-size-adjust: none; }16 15 #target { zoom: 2; } 17 16 </style> -
trunk/LayoutTests/fast/events/ondrop-text-html-expected.txt
r137204 r145168 1 1 CONSOLE 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-s ize-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>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-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> 3 3 This test verifies that we can get text/html from the drag object during an ondrop event. This test requires DRT. 4 4 PASS -
trunk/Source/WebCore/ChangeLog
r145166 r145168 1 2013-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 1 47 2013-03-07 Joshua Bell <jsbell@chromium.org> 2 48 -
trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
r145029 r145168 2197 2197 case CSSPropertyWebkitTextSecurity: 2198 2198 return cssValuePool().createValue(style->textSecurity()); 2199 case CSSPropertyWebkitTextSizeAdjust:2200 if (style->textSizeAdjust())2201 return cssValuePool().createIdentifierValue(CSSValueAuto);2202 return cssValuePool().createIdentifierValue(CSSValueNone);2203 2199 case CSSPropertyWebkitTextStrokeColor: 2204 2200 return currentColorOrValidColor(style.get(), style->textStrokeColor()); -
trunk/Source/WebCore/css/CSSParser.cpp
r145029 r145168 987 987 // disc | circle | square | none | inherit 988 988 if (valueID == CSSValueDisc || valueID == CSSValueCircle || valueID == CSSValueSquare || valueID == CSSValueNone) 989 return true;990 break;991 case CSSPropertyWebkitTextSizeAdjust:992 if (valueID == CSSValueAuto || valueID == CSSValueNone)993 989 return true; 994 990 break; … … 1144 1140 case CSSPropertyWebkitTextEmphasisPosition: 1145 1141 case CSSPropertyWebkitTextSecurity: 1146 case CSSPropertyWebkitTextSizeAdjust:1147 1142 case CSSPropertyWebkitTransformStyle: 1148 1143 case CSSPropertyWebkitUserDrag: … … 3033 3028 case CSSPropertyWebkitTextEmphasisPosition: 3034 3029 case CSSPropertyWebkitTextSecurity: 3035 case CSSPropertyWebkitTextSizeAdjust:3036 3030 case CSSPropertyWebkitTransformStyle: 3037 3031 case CSSPropertyWebkitUserDrag: -
trunk/Source/WebCore/css/CSSPrimitiveValue.cpp
r143232 r145168 581 581 // We do not apply the zoom factor when we are computing the value of the font-size property. The zooming 582 582 // 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." 585 584 double result = getDoubleValue() * factor; 586 585 if (computingFontSize || isFontRelativeLength()) -
trunk/Source/WebCore/css/CSSProperty.cpp
r145003 r145168 342 342 case CSSPropertyWebkitTextOrientation: 343 343 case CSSPropertyWebkitTextSecurity: 344 case CSSPropertyWebkitTextSizeAdjust:345 344 case CSSPropertyWebkitTextStroke: 346 345 case CSSPropertyWebkitTextStrokeColor: -
trunk/Source/WebCore/css/CSSPropertyNames.in
r145003 r145168 28 28 -webkit-text-orientation 29 29 -epub-text-orientation = -webkit-text-orientation 30 -webkit-text-size-adjust31 30 -webkit-writing-mode 32 31 -epub-writing-mode = -webkit-writing-mode -
trunk/Source/WebCore/css/StyleBuilder.cpp
r145003 r145168 1164 1164 else if (primitiveValue->isLength()) { 1165 1165 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(); 1170 1168 lineHeight = primitiveValue->computeLength<Length>(styleResolver->style(), styleResolver->rootElementStyle(), multiplier); 1171 1169 } else if (primitiveValue->isPercentage()) { -
trunk/Source/WebCore/css/StyleResolver.cpp
r145061 r145168 2045 2045 return; 2046 2046 2047 checkForTextSizeAdjust();2048 2047 RenderStyle* style = m_state.style(); 2049 2048 checkForGenericFamilyChange(style, m_state.parentStyle()); … … 2198 2197 case HighPriorityProperties: 2199 2198 COMPILE_ASSERT(firstCSSProperty == CSSPropertyColor, CSS_color_is_first_property); 2200 COMPILE_ASSERT(CSSPropertyZoom == CSSPropertyColor + 1 8, CSS_zoom_is_end_of_first_prop_range);2199 COMPILE_ASSERT(CSSPropertyZoom == CSSPropertyColor + 17, CSS_zoom_is_end_of_first_prop_range); 2201 2200 COMPILE_ASSERT(CSSPropertyLineHeight == CSSPropertyZoom + 1, CSS_line_height_is_after_zoom); 2202 2201 #if ENABLE(CSS_VARIABLES) … … 3278 3277 fontDescription.setScript(localeToScriptCodeForFontSelection(state.style()->locale())); 3279 3278 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);3287 3279 return; 3288 3280 } … … 3922 3914 } 3923 3915 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 3936 3916 void StyleResolver::checkForZoomChange(RenderStyle* style, RenderStyle* parentStyle) 3937 3917 { -
trunk/Source/WebCore/css/StyleResolver.h
r145061 r145168 330 330 void checkForGenericFamilyChange(RenderStyle*, RenderStyle* parentStyle); 331 331 void checkForZoomChange(RenderStyle*, RenderStyle* parentStyle); 332 void checkForTextSizeAdjust();333 332 334 333 void adjustRenderStyle(RenderStyle* styleToAdjust, RenderStyle* parentStyle, Element*); … … 523 522 void setZoom(float f) { m_fontDirty |= m_style->setZoom(f); } 524 523 void setEffectiveZoom(float f) { m_fontDirty |= m_style->setEffectiveZoom(f); } 525 void setTextSizeAdjust(bool b) { m_fontDirty |= m_style->setTextSizeAdjust(b); }526 524 void setWritingMode(WritingMode writingMode) { m_fontDirty |= m_style->setWritingMode(writingMode); } 527 525 void setTextOrientation(TextOrientation textOrientation) { m_fontDirty |= m_style->setTextOrientation(textOrientation); } … … 600 598 void setZoom(float f) { m_state.setZoom(f); } 601 599 void setEffectiveZoom(float f) { m_state.setEffectiveZoom(f); } 602 void setTextSizeAdjust(bool b) { m_state.setTextSizeAdjust(b); }603 600 void setWritingMode(WritingMode writingMode) { m_state.setWritingMode(writingMode); } 604 601 void setTextOrientation(TextOrientation textOrientation) { m_state.setTextOrientation(textOrientation); } -
trunk/Source/WebCore/css/svg.css
r110532 r145168 56 56 } 57 57 58 text, tspan, tref {59 -webkit-text-size-adjust: none;60 }61 62 58 /* states */ 63 59 -
trunk/Source/WebCore/editing/EditingStyle.cpp
r144995 r145168 79 79 CSSPropertyWebkitTextDecorationsInEffect, 80 80 CSSPropertyWebkitTextFillColor, 81 CSSPropertyWebkitTextSizeAdjust,82 81 CSSPropertyWebkitTextStrokeColor, 83 82 CSSPropertyWebkitTextStrokeWidth, -
trunk/Source/WebCore/inspector/front-end/inspector.css
r144927 r145168 943 943 word-wrap: break-word; 944 944 -webkit-user-select: text; 945 -webkit-text-size-adjust: auto;946 945 } 947 946 -
trunk/Source/WebCore/inspector/front-end/resourcesPanel.css
r144060 r145168 132 132 overflow-y: overlay; 133 133 overflow-x: hidden; 134 -webkit-text-size-adjust: auto;135 134 } 136 135 -
trunk/Source/WebCore/rendering/style/RenderStyle.cpp
r143300 r145168 483 483 || rareInheritedData->indent != other->rareInheritedData->indent 484 484 || rareInheritedData->m_effectiveZoom != other->rareInheritedData->m_effectiveZoom 485 || rareInheritedData->textSizeAdjust != other->rareInheritedData->textSizeAdjust486 485 || rareInheritedData->wordBreak != other->rareInheritedData->wordBreak 487 486 || rareInheritedData->overflowWrap != other->rareInheritedData->overflowWrap -
trunk/Source/WebCore/rendering/style/RenderStyle.h
r145003 r145168 926 926 bool useTouchOverflowScrolling() const { return rareInheritedData->useTouchOverflowScrolling; } 927 927 #endif 928 bool textSizeAdjust() const { return rareInheritedData->textSizeAdjust; }929 928 ETextSecurity textSecurity() const { return static_cast<ETextSecurity>(rareInheritedData->textSecurity); } 930 929 … … 1395 1394 void setUseTouchOverflowScrolling(bool v) { SET_VAR(rareInheritedData, useTouchOverflowScrolling, v); } 1396 1395 #endif 1397 bool setTextSizeAdjust(bool);1398 1396 void setTextSecurity(ETextSecurity aTextSecurity) { SET_VAR(rareInheritedData, textSecurity, aTextSecurity); } 1399 1397 … … 1705 1703 // Keep these at the end. 1706 1704 static LineClampValue initialLineClamp() { return LineClampValue(); } 1707 static bool initialTextSizeAdjust() { return true; }1708 1705 static ETextSecurity initialTextSecurity() { return TSNONE; } 1709 1706 #if ENABLE(TOUCH_EVENTS) … … 1842 1839 } 1843 1840 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 1852 1841 inline bool RenderStyle::setTextOrientation(TextOrientation textOrientation) 1853 1842 { -
trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp
r141570 r145168 79 79 , nbspMode(NBNORMAL) 80 80 , lineBreak(LineBreakAuto) 81 , textSizeAdjust(RenderStyle::initialTextSizeAdjust())82 81 , resize(RenderStyle::initialResize()) 83 82 , userSelect(RenderStyle::initialUserSelect()) … … 149 148 , nbspMode(o.nbspMode) 150 149 , lineBreak(o.lineBreak) 151 , textSizeAdjust(o.textSizeAdjust)152 150 , resize(o.resize) 153 151 , userSelect(o.userSelect) … … 240 238 && useTouchOverflowScrolling == o.useTouchOverflowScrolling 241 239 #endif 242 && textSizeAdjust == o.textSizeAdjust243 240 && resize == o.resize 244 241 && userSelect == o.userSelect -
trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h
r139734 r145168 92 92 unsigned nbspMode : 1; // ENBSPMode 93 93 unsigned lineBreak : 3; // LineBreak 94 unsigned textSizeAdjust : 1; // An Apple extension.95 94 unsigned resize : 2; // EResize 96 95 unsigned userSelect : 2; // EUserSelect
Note: See TracChangeset
for help on using the changeset viewer.