Remove desktop version of -webkit-text-size-adjust property.
authorakling@apple.com <akling@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 8 Mar 2013 02:08:41 +0000 (02:08 +0000)
committerakling@apple.com <akling@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 8 Mar 2013 02:08:41 +0000 (02:08 +0000)
<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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@145168 268f45cc-cd09-0410-ab3c-d52691b4dbfc

35 files changed:
LayoutTests/ChangeLog
LayoutTests/editing/pasteboard/5078739.html
LayoutTests/editing/pasteboard/data-transfer-items-expected.txt
LayoutTests/editing/pasteboard/onpaste-text-html-expected.txt
LayoutTests/fast/css/font-size-nan.svg
LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt
LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
LayoutTests/fast/css/getComputedStyle/resources/property-names.js
LayoutTests/fast/css/ignore-text-zoom.html [deleted file]
LayoutTests/fast/css/text-rendering-priority.html
LayoutTests/fast/events/ondrop-text-html-expected.txt
LayoutTests/platform/chromium-linux/fast/css/ignore-text-zoom-expected.png [deleted file]
LayoutTests/platform/chromium-win/fast/css/ignore-text-zoom-expected.txt [deleted file]
LayoutTests/platform/chromium/fast/css/ignore-text-zoom-expected.txt [deleted file]
LayoutTests/platform/efl/fast/css/ignore-text-zoom-expected.txt [deleted file]
LayoutTests/platform/gtk/fast/css/ignore-text-zoom-expected.txt [deleted file]
LayoutTests/platform/mac/fast/css/ignore-text-zoom-expected.txt [deleted file]
LayoutTests/platform/qt/fast/css/ignore-text-zoom-expected.txt [deleted file]
Source/WebCore/ChangeLog
Source/WebCore/css/CSSComputedStyleDeclaration.cpp
Source/WebCore/css/CSSParser.cpp
Source/WebCore/css/CSSPrimitiveValue.cpp
Source/WebCore/css/CSSProperty.cpp
Source/WebCore/css/CSSPropertyNames.in
Source/WebCore/css/StyleBuilder.cpp
Source/WebCore/css/StyleResolver.cpp
Source/WebCore/css/StyleResolver.h
Source/WebCore/css/svg.css
Source/WebCore/editing/EditingStyle.cpp
Source/WebCore/inspector/front-end/inspector.css
Source/WebCore/inspector/front-end/resourcesPanel.css
Source/WebCore/rendering/style/RenderStyle.cpp
Source/WebCore/rendering/style/RenderStyle.h
Source/WebCore/rendering/style/StyleRareInheritedData.cpp
Source/WebCore/rendering/style/StyleRareInheritedData.h

index 9e21384..3a71670 100644 (file)
@@ -1,3 +1,37 @@
+2013-03-07  Andreas Kling  <akling@apple.com>
+
+        Remove desktop version of -webkit-text-size-adjust property.
+        <http://webkit.org/b/56543>
+        <rdar://problem/9150203>
+
+        Reviewed by Simon Fraser.
+
+        * 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.
+
 2013-03-07  Aaron Colwell  <acolwell@chromium.org>
 
         Fix commented out code in LayoutTests/http/tests/misc/delete-frame-during-readystatechange-with-gc-after-video-removal.html
index 7b23a9b..e98797d 100644 (file)
@@ -7,5 +7,5 @@ if (window.testRunner)
     
 var div = document.getElementById("div");
 div.focus();
-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>");
+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>");
 </script>
index 4c4d92b..43ac56a 100644 (file)
@@ -21,5 +21,5 @@ DataTransferItem accessed outside event handler!
 copy: items[0] value: Hello World!
 copy: items[1] value: <b>Hello World!
 paste: items[0] value: This file tests the basic functionality and properties of DataTransferItems. This test requires DRT.
-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>
+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>
 
index 4d8413f..9c048b8 100644 (file)
@@ -1,5 +1,5 @@
 CONSOLE MESSAGE: line 21: text/plain: This test verifies that we can get text/html from the clipboard during an onpaste event. 
-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>
+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>
 This test verifies that we can get text/html from the clipboard during an onpaste event. This test requires DRT.
 Paste content in this div.This test verifies that we can get text/html from the clipboard during an onpaste event. 
 PASS
index 6773258..1b46422 100644 (file)
@@ -5,7 +5,7 @@ if (window.testRunner)
     testRunner.dumpAsText();
 </script>
 </head>
-<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>
+<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>
 <div>PASS: WebKit doesn't crash.</div>
 <textarea style="border-image: url() 212 57 14584936043161189249 63/75px stretch stretch; "></textarea></emptycustomtag></samp>
 </html>
index 510e1e5..19dd7e2 100644 (file)
@@ -257,5 +257,4 @@ border-spacing: 0px 0px;
 overflow: visible;
 -webkit-mask-position-x: 0%;
 -webkit-mask-position-y: 0%;
--webkit-text-size-adjust: auto;
 
index 8eca106..e2a8b74 100644 (file)
@@ -253,7 +253,6 @@ border-spacing: 0px 0px
 overflow: visible
 -webkit-mask-position-x: 0%
 -webkit-mask-position-y: 0%
--webkit-text-size-adjust: auto
 
 After changing grandparent's 'color' and the parent's 'font-size' inherited properties:
 border-top-width: 18px
index 5098bdc..3e78954 100644 (file)
@@ -262,5 +262,4 @@ var hiddenComputedStyleProperties = [
     "overflow",
     "-webkit-mask-position-x",
     "-webkit-mask-position-y",
-    "-webkit-text-size-adjust",
 ];
diff --git a/LayoutTests/fast/css/ignore-text-zoom.html b/LayoutTests/fast/css/ignore-text-zoom.html
deleted file mode 100644 (file)
index 6016f1a..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<head>
-<style>
-.ignore {
--webkit-text-size-adjust: none;
-}
-</style>
-</head>
-<div class="ignore">This text should have default font size</div>
-<div>This text should have larger than default font size</div>
-<script>
-if (window.eventSender) {
-    eventSender.textZoomIn();
-    eventSender.textZoomIn();
-}
-</script>
index 2e739f3..a972214 100644 (file)
@@ -12,7 +12,6 @@
         #target { font-weight: 900; }
         #target { text-rendering: optimizelegibility; }
         #target { -webkit-font-smoothing: none; }
-        #target { -webkit-text-size-adjust: none; }
         #target { zoom: 2; }
     </style>
 </head>
index 2d06394..c622027 100644 (file)
@@ -1,4 +1,4 @@
 CONSOLE MESSAGE: line 21: text/plain: This test verifies that we can get text/html from the drag object during an ondrop event. 
-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>
+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>
 This test verifies that we can get text/html from the drag object during an ondrop event. This test requires DRT.
 PASS
diff --git a/LayoutTests/platform/chromium-linux/fast/css/ignore-text-zoom-expected.png b/LayoutTests/platform/chromium-linux/fast/css/ignore-text-zoom-expected.png
deleted file mode 100644 (file)
index e602306..0000000
Binary files a/LayoutTests/platform/chromium-linux/fast/css/ignore-text-zoom-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/ignore-text-zoom-expected.txt b/LayoutTests/platform/chromium-win/fast/css/ignore-text-zoom-expected.txt
deleted file mode 100644 (file)
index 7bfb9d5..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {DIV} at (0,0) size 784x20
-        RenderText {#text} at (0,0) size 223x19
-          text run at (0,0) width 223: "This text should have default font size"
-      RenderBlock {DIV} at (0,20) size 784x27
-        RenderText {#text} at (0,0) size 458x26
-          text run at (0,0) width 458: "This text should have larger than default font size"
diff --git a/LayoutTests/platform/chromium/fast/css/ignore-text-zoom-expected.txt b/LayoutTests/platform/chromium/fast/css/ignore-text-zoom-expected.txt
deleted file mode 100644 (file)
index 7d31858..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {DIV} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 239x18
-          text run at (0,0) width 239: "This text should have default font size"
-      RenderBlock {DIV} at (0,18) size 784x26
-        RenderText {#text} at (0,0) size 461x26
-          text run at (0,0) width 461: "This text should have larger than default font size"
diff --git a/LayoutTests/platform/efl/fast/css/ignore-text-zoom-expected.txt b/LayoutTests/platform/efl/fast/css/ignore-text-zoom-expected.txt
deleted file mode 100644 (file)
index 1117f78..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {DIV} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 239x17
-          text run at (0,0) width 239: "This text should have default font size"
-      RenderBlock {DIV} at (0,18) size 784x26
-        RenderText {#text} at (0,0) size 461x26
-          text run at (0,0) width 461: "This text should have larger than default font size"
diff --git a/LayoutTests/platform/gtk/fast/css/ignore-text-zoom-expected.txt b/LayoutTests/platform/gtk/fast/css/ignore-text-zoom-expected.txt
deleted file mode 100644 (file)
index e2bebd0..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {DIV} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 239x19
-          text run at (0,0) width 239: "This text should have default font size"
-      RenderBlock {DIV} at (0,18) size 784x26
-        RenderText {#text} at (0,0) size 461x26
-          text run at (0,0) width 461: "This text should have larger than default font size"
diff --git a/LayoutTests/platform/mac/fast/css/ignore-text-zoom-expected.txt b/LayoutTests/platform/mac/fast/css/ignore-text-zoom-expected.txt
deleted file mode 100644 (file)
index 7d31858..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {DIV} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 239x18
-          text run at (0,0) width 239: "This text should have default font size"
-      RenderBlock {DIV} at (0,18) size 784x26
-        RenderText {#text} at (0,0) size 461x26
-          text run at (0,0) width 461: "This text should have larger than default font size"
diff --git a/LayoutTests/platform/qt/fast/css/ignore-text-zoom-expected.txt b/LayoutTests/platform/qt/fast/css/ignore-text-zoom-expected.txt
deleted file mode 100644 (file)
index 1b25804..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {DIV} at (0,0) size 784x19
-        RenderText {#text} at (0,0) size 223x19
-          text run at (0,0) width 223: "This text should have default font size"
-      RenderBlock {DIV} at (0,19) size 784x26
-        RenderText {#text} at (0,0) size 458x26
-          text run at (0,0) width 458: "This text should have larger than default font size"
index 7b8bd92..520d99c 100644 (file)
@@ -1,3 +1,49 @@
+2013-03-07  Andreas Kling  <akling@apple.com>
+
+        Remove desktop version of -webkit-text-size-adjust property.
+        <http://webkit.org/b/56543>
+        <rdar://problem/9150203>
+
+        Reviewed by Simon Fraser.
+
+        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):
+
 2013-03-07  Joshua Bell  <jsbell@chromium.org>
 
         IndexedDB: Use WeakPtr for Factory-to-BackingStore reference
index ca61764..58b2293 100644 (file)
@@ -2196,10 +2196,6 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
             return cssValuePool().createIdentifierValue(CSSValueClip);
         case CSSPropertyWebkitTextSecurity:
             return cssValuePool().createValue(style->textSecurity());
-        case CSSPropertyWebkitTextSizeAdjust:
-            if (style->textSizeAdjust())
-                return cssValuePool().createIdentifierValue(CSSValueAuto);
-            return cssValuePool().createIdentifierValue(CSSValueNone);
         case CSSPropertyWebkitTextStrokeColor:
             return currentColorOrValidColor(style.get(), style->textStrokeColor());
         case CSSPropertyWebkitTextStrokeWidth:
index 7c3602b..d48f61f 100644 (file)
@@ -988,10 +988,6 @@ static inline bool isValidKeywordPropertyAndValue(CSSPropertyID propertyId, int
         if (valueID == CSSValueDisc || valueID == CSSValueCircle || valueID == CSSValueSquare || valueID == CSSValueNone)
             return true;
         break;
-    case CSSPropertyWebkitTextSizeAdjust:
-        if (valueID == CSSValueAuto || valueID == CSSValueNone)
-            return true;
-        break;
     case CSSPropertyWebkitTransformStyle:
         if (valueID == CSSValueFlat || valueID == CSSValuePreserve3d)
             return true;
@@ -1143,7 +1139,6 @@ static inline bool isKeywordPropertyID(CSSPropertyID propertyId)
     case CSSPropertyWebkitTextCombine:
     case CSSPropertyWebkitTextEmphasisPosition:
     case CSSPropertyWebkitTextSecurity:
-    case CSSPropertyWebkitTextSizeAdjust:
     case CSSPropertyWebkitTransformStyle:
     case CSSPropertyWebkitUserDrag:
     case CSSPropertyWebkitUserModify:
@@ -3032,7 +3027,6 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important)
     case CSSPropertyWebkitTextCombine:
     case CSSPropertyWebkitTextEmphasisPosition:
     case CSSPropertyWebkitTextSecurity:
-    case CSSPropertyWebkitTextSizeAdjust:
     case CSSPropertyWebkitTransformStyle:
     case CSSPropertyWebkitUserDrag:
     case CSSPropertyWebkitUserModify:
index 3f65663..acd7877 100644 (file)
@@ -580,8 +580,7 @@ double CSSPrimitiveValue::computeLengthDouble(RenderStyle* style, RenderStyle* r
 
     // We do not apply the zoom factor when we are computing the value of the font-size property. The zooming
     // for font sizes is much more complicated, since we have to worry about enforcing the minimum font size preference
-    // as well as enforcing the implicit "smart minimum." In addition the CSS property text-size-adjust is used to
-    // prevent text from zooming at all. Therefore we will not apply the zoom here if we are computing font-size.
+    // as well as enforcing the implicit "smart minimum."
     double result = getDoubleValue() * factor;
     if (computingFontSize || isFontRelativeLength())
         return result;
index af8345e..5b84db5 100644 (file)
@@ -341,7 +341,6 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID)
     case CSSPropertyWebkitTextFillColor:
     case CSSPropertyWebkitTextOrientation:
     case CSSPropertyWebkitTextSecurity:
-    case CSSPropertyWebkitTextSizeAdjust:
     case CSSPropertyWebkitTextStroke:
     case CSSPropertyWebkitTextStrokeColor:
     case CSSPropertyWebkitTextStrokeWidth:
index d07a3cf..c0c30aa 100644 (file)
@@ -27,7 +27,6 @@ text-rendering
 -webkit-locale
 -webkit-text-orientation
 -epub-text-orientation = -webkit-text-orientation
--webkit-text-size-adjust
 -webkit-writing-mode
 -epub-writing-mode = -webkit-writing-mode
 zoom
index 7d7ee9f..d62d6e0 100644 (file)
@@ -1163,10 +1163,8 @@ public:
             lineHeight = RenderStyle::initialLineHeight();
         else if (primitiveValue->isLength()) {
             double multiplier = styleResolver->style()->effectiveZoom();
-            if (styleResolver->style()->textSizeAdjust()) {
-                if (Frame* frame = styleResolver->document()->frame())
-                    multiplier *= frame->textZoomFactor();
-            }
+            if (Frame* frame = styleResolver->document()->frame())
+                multiplier *= frame->textZoomFactor();
             lineHeight = primitiveValue->computeLength<Length>(styleResolver->style(), styleResolver->rootElementStyle(), multiplier);
         } else if (primitiveValue->isPercentage()) {
             // FIXME: percentage should not be restricted to an integer here.
index 38ba839..138a9ab 100644 (file)
@@ -2044,7 +2044,6 @@ void StyleResolver::updateFont()
     if (!m_state.fontDirty())
         return;
 
-    checkForTextSizeAdjust();
     RenderStyle* style = m_state.style();
     checkForGenericFamilyChange(style, m_state.parentStyle());
     checkForZoomChange(style, m_state.parentStyle());
@@ -2197,7 +2196,7 @@ void StyleResolver::applyProperties(const StylePropertySet* properties, StyleRul
 #endif
         case HighPriorityProperties:
             COMPILE_ASSERT(firstCSSProperty == CSSPropertyColor, CSS_color_is_first_property);
-            COMPILE_ASSERT(CSSPropertyZoom == CSSPropertyColor + 18, CSS_zoom_is_end_of_first_prop_range);
+            COMPILE_ASSERT(CSSPropertyZoom == CSSPropertyColor + 17, CSS_zoom_is_end_of_first_prop_range);
             COMPILE_ASSERT(CSSPropertyLineHeight == CSSPropertyZoom + 1, CSS_line_height_is_after_zoom);
 #if ENABLE(CSS_VARIABLES)
             if (property == CSSPropertyVariable)
@@ -3279,13 +3278,6 @@ void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
         setFontDescription(fontDescription);
         return;
     }
-    case CSSPropertyWebkitTextSizeAdjust: {
-        HANDLE_INHERIT_AND_INITIAL(textSizeAdjust, TextSizeAdjust)
-        if (!primitiveValue || !primitiveValue->getIdent())
-            return;
-        setTextSizeAdjust(primitiveValue->getIdent() == CSSValueAuto);
-        return;
-    }
 #if ENABLE(DASHBOARD_SUPPORT)
     case CSSPropertyWebkitDashboardRegion:
     {
@@ -3921,18 +3913,6 @@ PassRefPtr<StyleImage> StyleResolver::cursorOrPendingFromValue(CSSPropertyID pro
     return image.release();
 }
 
-void StyleResolver::checkForTextSizeAdjust()
-{
-    RenderStyle* style = m_state.style();
-
-    if (style->textSizeAdjust())
-        return;
-
-    FontDescription newFontDescription(style->fontDescription());
-    newFontDescription.setComputedSize(newFontDescription.specifiedSize());
-    style->setFontDescription(newFontDescription);
-}
-
 void StyleResolver::checkForZoomChange(RenderStyle* style, RenderStyle* parentStyle)
 {
     if (style->effectiveZoom() == parentStyle->effectiveZoom())
index 42c95c9..5584d87 100644 (file)
@@ -329,7 +329,6 @@ private:
     // This function fixes up the default font size if it detects that the current generic font family has changed. -dwh
     void checkForGenericFamilyChange(RenderStyle*, RenderStyle* parentStyle);
     void checkForZoomChange(RenderStyle*, RenderStyle* parentStyle);
-    void checkForTextSizeAdjust();
 
     void adjustRenderStyle(RenderStyle* styleToAdjust, RenderStyle* parentStyle, Element*);
 
@@ -522,7 +521,6 @@ public:
         void setFontDescription(const FontDescription& fontDescription) { m_fontDirty |= m_style->setFontDescription(fontDescription); }
         void setZoom(float f) { m_fontDirty |= m_style->setZoom(f); }
         void setEffectiveZoom(float f) { m_fontDirty |= m_style->setEffectiveZoom(f); }
-        void setTextSizeAdjust(bool b) { m_fontDirty |= m_style->setTextSizeAdjust(b); }
         void setWritingMode(WritingMode writingMode) { m_fontDirty |= m_style->setWritingMode(writingMode); }
         void setTextOrientation(TextOrientation textOrientation) { m_fontDirty |= m_style->setTextOrientation(textOrientation); }
 
@@ -599,7 +597,6 @@ public:
     void setFontDescription(const FontDescription& fontDescription) { m_state.setFontDescription(fontDescription); }
     void setZoom(float f) { m_state.setZoom(f); }
     void setEffectiveZoom(float f) { m_state.setEffectiveZoom(f); }
-    void setTextSizeAdjust(bool b) { m_state.setTextSizeAdjust(b); }
     void setWritingMode(WritingMode writingMode) { m_state.setWritingMode(writingMode); }
     void setTextOrientation(TextOrientation textOrientation) { m_state.setTextOrientation(textOrientation); }
     
index 6ec4b23..3975ab4 100644 (file)
@@ -55,10 +55,6 @@ text, tspan, textPath {
    white-space: nowrap
 }
 
-text, tspan, tref {
-   -webkit-text-size-adjust: none;
-}
-
 /* states */
 
 :focus {
index b348f60..a30f800 100644 (file)
@@ -78,7 +78,6 @@ static const CSSPropertyID editingProperties[] = {
     CSSPropertyWordSpacing,
     CSSPropertyWebkitTextDecorationsInEffect,
     CSSPropertyWebkitTextFillColor,
-    CSSPropertyWebkitTextSizeAdjust,
     CSSPropertyWebkitTextStrokeColor,
     CSSPropertyWebkitTextStrokeWidth,
 };
index 91da4c7..0cf9d09 100644 (file)
@@ -942,7 +942,6 @@ body.platform-linux .monospace, body.platform-linux .source-code {
     overflow-y: overlay;
     word-wrap: break-word;
     -webkit-user-select: text;
-    -webkit-text-size-adjust: auto;
 }
 
 #console-prompt {
index 21627cd..a95a5da 100644 (file)
@@ -131,7 +131,6 @@ li.selected .base-storage-tree-element-subtitle {
     padding: 2px 0;
     overflow-y: overlay;
     overflow-x: hidden;
-    -webkit-text-size-adjust: auto;
 }
 
 .database-query-prompt {
index ba5d660..1e249b7 100644 (file)
@@ -482,7 +482,6 @@ StyleDifference RenderStyle::diff(const RenderStyle* other, unsigned& changedCon
         if (rareInheritedData->highlight != other->rareInheritedData->highlight
             || rareInheritedData->indent != other->rareInheritedData->indent
             || rareInheritedData->m_effectiveZoom != other->rareInheritedData->m_effectiveZoom
-            || rareInheritedData->textSizeAdjust != other->rareInheritedData->textSizeAdjust
             || rareInheritedData->wordBreak != other->rareInheritedData->wordBreak
             || rareInheritedData->overflowWrap != other->rareInheritedData->overflowWrap
             || rareInheritedData->nbspMode != other->rareInheritedData->nbspMode
index 32819ad..23ac792 100644 (file)
@@ -925,7 +925,6 @@ public:
 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
     bool useTouchOverflowScrolling() const { return rareInheritedData->useTouchOverflowScrolling; }
 #endif
-    bool textSizeAdjust() const { return rareInheritedData->textSizeAdjust; }
     ETextSecurity textSecurity() const { return static_cast<ETextSecurity>(rareInheritedData->textSecurity); }
 
     WritingMode writingMode() const { return static_cast<WritingMode>(inherited_flags.m_writingMode); }
@@ -1394,7 +1393,6 @@ public:
 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
     void setUseTouchOverflowScrolling(bool v) { SET_VAR(rareInheritedData, useTouchOverflowScrolling, v); }
 #endif
-    bool setTextSizeAdjust(bool);
     void setTextSecurity(ETextSecurity aTextSecurity) { SET_VAR(rareInheritedData, textSecurity, aTextSecurity); }
 
 #if ENABLE(SVG)
@@ -1704,7 +1702,6 @@ public:
 
     // Keep these at the end.
     static LineClampValue initialLineClamp() { return LineClampValue(); }
-    static bool initialTextSizeAdjust() { return true; }
     static ETextSecurity initialTextSecurity() { return TSNONE; }
 #if ENABLE(TOUCH_EVENTS)
     static Color initialTapHighlightColor();
@@ -1841,14 +1838,6 @@ inline bool RenderStyle::setEffectiveZoom(float f)
     return true;
 }
 
-inline bool RenderStyle::setTextSizeAdjust(bool b)
-{
-    if (compareEqual(rareInheritedData->textSizeAdjust, b))
-        return false;
-    rareInheritedData.access()->textSizeAdjust = b;
-    return true;
-}
-
 inline bool RenderStyle::setTextOrientation(TextOrientation textOrientation)
 {
     if (compareEqual(rareInheritedData->m_textOrientation, textOrientation))
index b215ab3..181aab3 100644 (file)
@@ -78,7 +78,6 @@ StyleRareInheritedData::StyleRareInheritedData()
     , overflowWrap(RenderStyle::initialOverflowWrap())
     , nbspMode(NBNORMAL)
     , lineBreak(LineBreakAuto)
-    , textSizeAdjust(RenderStyle::initialTextSizeAdjust())
     , resize(RenderStyle::initialResize())
     , userSelect(RenderStyle::initialUserSelect())
     , colorSpace(ColorSpaceDeviceRGB)
@@ -148,7 +147,6 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
     , overflowWrap(o.overflowWrap)
     , nbspMode(o.nbspMode)
     , lineBreak(o.lineBreak)
-    , textSizeAdjust(o.textSizeAdjust)
     , resize(o.resize)
     , userSelect(o.userSelect)
     , colorSpace(o.colorSpace)
@@ -239,7 +237,6 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const
 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
         && useTouchOverflowScrolling == o.useTouchOverflowScrolling
 #endif
-        && textSizeAdjust == o.textSizeAdjust
         && resize == o.resize
         && userSelect == o.userSelect
         && colorSpace == o.colorSpace
index b2281f7..e43af39 100644 (file)
@@ -91,7 +91,6 @@ public:
     unsigned overflowWrap : 1; // EOverflowWrap
     unsigned nbspMode : 1; // ENBSPMode
     unsigned lineBreak : 3; // LineBreak
-    unsigned textSizeAdjust : 1; // An Apple extension.
     unsigned resize : 2; // EResize
     unsigned userSelect : 2; // EUserSelect
     unsigned colorSpace : 1; // ColorSpace