Changeset 244702 in webkit

Timestamp:

Apr 26, 2019, 11:32:41 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r244683.
​https://bugs.webkit.org/show_bug.cgi?id=197320

Causing crash on iOS Simulator and EWS failures (Requested by
sroberts on #webkit).

Reverted changeset:

"[iOS] Add internal setting to force -webkit-text-size-adjust
to "auto""
​https://bugs.webkit.org/show_bug.cgi?id=197275
​https://trac.webkit.org/changeset/244683

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-26  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r244683.
+        https://bugs.webkit.org/show_bug.cgi?id=197320
+
+        Causing crash on iOS Simulator and EWS failures (Requested by
+        sroberts on #webkit).
+
+        Reverted changeset:
+
+        "[iOS] Add internal setting to force -webkit-text-size-adjust
+        to "auto""
+        https://bugs.webkit.org/show_bug.cgi?id=197275
+        https://trac.webkit.org/changeset/244683
+
 2019-04-26  Youenn Fablet  <youenn@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() && (text.document().settings().forceAutoBehaviorForTextSizeAdjust() || oldStyle.textSizeAdjust().isAuto()))
+            if (candidateNewSize > specifiedSize && candidateNewSize != fontDescription.computedSize() && text.textNode() && 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 || (!textNode->document().settings().forceAutoBehaviorForTextSizeAdjust() && !renderer->style().textSizeAdjust().isAuto()) || !renderer->candidateComputedTextSize())
+        if (!renderer || !renderer->style().textSizeAdjust().isAuto() || !renderer->candidateComputedTextSize())
             nodesForRemoval.append(textNode.get());
     }

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-04-26  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r244683.
+        https://bugs.webkit.org/show_bug.cgi?id=197320
+
+        Causing crash on iOS Simulator and EWS failures (Requested by
+        sroberts on #webkit).
+
+        Reverted changeset:
+
+        "[iOS] Add internal setting to force -webkit-text-size-adjust
+        to "auto""
+        https://bugs.webkit.org/show_bug.cgi?id=197275
+        https://trac.webkit.org/changeset/244683
+
 2019-04-26  Youenn Fablet  <youenn@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:
@@ -1646 +1651 @@
   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>