Changeset 244683 in webkit

Timestamp:

Apr 25, 2019, 11:39:30 PM (7 years ago)

Author:

mmaxfield@apple.com

Message:

[iOS] Add internal setting to force -webkit-text-size-adjust to "auto"
​https://bugs.webkit.org/show_bug.cgi?id=197275
<rdar://problem/50211019>

Reviewed by Simon Fraser.

Source/WebCore:

This setting makes it easier to investigate the autosizing work we've been doing
in ​https://bugs.webkit.org/show_bug.cgi?id=197250.

• page/Settings.yaml:
• rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::adjustComputedFontSizes):

• rendering/TextAutoSizing.cpp:

(WebCore::TextAutoSizingValue::adjustTextNodeSizes):

Source/WebKit:

• Shared/WebPreferences.yaml:
• UIProcess/WebPreferences.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/Settings.yaml (modified) (1 diff)
• WebCore/rendering/RenderBlockFlow.cpp (modified) (1 diff)
• WebCore/rendering/TextAutoSizing.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/WebPreferences.yaml (modified) (2 diffs)
• WebKit/UIProcess/WebPreferences.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-25  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [iOS] Add internal setting to force -webkit-text-size-adjust to "auto"
+        https://bugs.webkit.org/show_bug.cgi?id=197275
+        <rdar://problem/50211019>
+
+        Reviewed by Simon Fraser.
+
+        This setting makes it easier to investigate the autosizing work we've been doing
+        in https://bugs.webkit.org/show_bug.cgi?id=197250.
+
+        * page/Settings.yaml:
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::adjustComputedFontSizes):
+        * rendering/TextAutoSizing.cpp:
+        (WebCore::TextAutoSizingValue::adjustTextNodeSizes):
+
 2019-04-25  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/page/Settings.yaml

@@ -445 +445 @@
   onChange: setNeedsRecalcStyleInAllFrames
   conditional: TEXT_AUTOSIZING
+forceAutoBehaviorForTextSizeAdjust:
+  initial: false
+  onChange: setNeedsRecalcStyleInAllFrames
+  conditional: TEXT_AUTOSIZING
 
 subpixelAntialiasedLayerTextEnabled:

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -3816 +3816 @@
             }
 
-            if (candidateNewSize > specifiedSize && candidateNewSize != fontDescription.computedSize() && text.textNode() && oldStyle.textSizeAdjust().isAuto())
+            if (candidateNewSize > specifiedSize && candidateNewSize != fontDescription.computedSize() && text.textNode() && (text.document().settings().forceAutoBehaviorForTextSizeAdjust() || oldStyle.textSizeAdjust().isAuto()))
                 document().textAutoSizing().addTextNode(*text.textNode(), candidateNewSize);
         }

trunk/Source/WebCore/rendering/TextAutoSizing.cpp

@@ -77 +77 @@
     for (auto& textNode : m_autoSizedNodes) {
         auto* renderer = textNode->renderer();
-        if (!renderer || !renderer->style().textSizeAdjust().isAuto() || !renderer->candidateComputedTextSize())
+        if (!renderer || (!textNode->document().settings().forceAutoBehaviorForTextSizeAdjust() && !renderer->style().textSizeAdjust().isAuto()) || !renderer->candidateComputedTextSize())
             nodesForRemoval.append(textNode.get());
     }

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-04-25  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [iOS] Add internal setting to force -webkit-text-size-adjust to "auto"
+        https://bugs.webkit.org/show_bug.cgi?id=197275
+        <rdar://problem/50211019>
+
+        Reviewed by Simon Fraser.
+
+        * Shared/WebPreferences.yaml:
+        * UIProcess/WebPreferences.h:
+
 2019-04-25  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebKit/Shared/WebPreferences.yaml

@@ -433 +433 @@
   type: bool
   defaultValue: false
-
-TextAutosizingEnabled:
-  type: bool
-  defaultValue: WebCore::Settings::defaultTextAutosizingEnabled()
-  condition: ENABLE(TEXT_AUTOSIZING)
 
 AggressiveTileRetentionEnabled:
@@ -1651 +1646 @@
   type: bool
 
+TextAutosizingEnabled:
+  type: bool
+  defaultValue: WebCore::Settings::defaultTextAutosizingEnabled()
+  condition: ENABLE(TEXT_AUTOSIZING)
+  humanReadableName: "Text Autosizing"
+  humanReadableDescription: "Enable text autosizing, which increases text size so as to be more easily read"
+  category: internal
+
+ForceAutoBehaviorForTextSizeAdjust:
+  type: bool
+  defaultValue: false
+  condition: ENABLE(TEXT_AUTOSIZING)
+  humanReadableName: "Force text-size-adjust to auto"
+  humanReadableDescription: "Force -webkit-text-size-adjust to behave like auto, which means web authors can't opt-out of text autosizing heuristics"
+  category: internal
+
 # Deprecated
 

trunk/Source/WebKit/UIProcess/WebPreferences.h

@@ -31 +31 @@
 #include "WebPreferencesDefinitions.h"
 #include "WebPreferencesStore.h"
+#include <WebCore/Settings.h>
 #include <wtf/HashSet.h>
 #include <wtf/RefPtr.h>