Unreviewed, rolling out r244683.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 26 Apr 2019 18:32:41 +0000 (18:32 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 26 Apr 2019 18:32:41 +0000 (18:32 +0000)
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

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

Source/WebCore/ChangeLog
Source/WebCore/page/Settings.yaml
Source/WebCore/rendering/RenderBlockFlow.cpp
Source/WebCore/rendering/TextAutoSizing.cpp
Source/WebKit/ChangeLog
Source/WebKit/Shared/WebPreferences.yaml
Source/WebKit/UIProcess/WebPreferences.h

index 4593a44..1639639 100644 (file)
@@ -1,3 +1,18 @@
+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>
 
         Use normal loading path for ping loads
index c07efd3..e47d7eb 100644 (file)
@@ -444,10 +444,6 @@ textAutosizingUsesIdempotentMode:
   initial: defaultTextAutosizingUsesIdempotentMode()
   onChange: setNeedsRecalcStyleInAllFrames
   conditional: TEXT_AUTOSIZING
-forceAutoBehaviorForTextSizeAdjust:
-  initial: false
-  onChange: setNeedsRecalcStyleInAllFrames
-  conditional: TEXT_AUTOSIZING
 
 subpixelAntialiasedLayerTextEnabled:
   initial: false
index af5ce7c..766591c 100644 (file)
@@ -3815,7 +3815,7 @@ void RenderBlockFlow::adjustComputedFontSizes(float size, float visibleWidth, fl
                 candidateNewSize = roundf(std::min(minFontSize, specifiedSize * lineTextMultiplier));
             }
 
-            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);
         }
 
index a15efa0..3ba130d 100644 (file)
@@ -76,7 +76,7 @@ auto TextAutoSizingValue::adjustTextNodeSizes() -> StillHasNodes
     Vector<Text*> nodesForRemoval;
     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());
     }
 
index f10cb92..5c973d5 100644 (file)
@@ -1,3 +1,18 @@
+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>
 
         Use normal loading path for ping loads
index 82deda8..ff9da3b 100644 (file)
@@ -433,6 +433,11 @@ UsesEncodingDetector:
   type: bool
   defaultValue: false
 
+TextAutosizingEnabled:
+  type: bool
+  defaultValue: WebCore::Settings::defaultTextAutosizingEnabled()
+  condition: ENABLE(TEXT_AUTOSIZING)
+
 AggressiveTileRetentionEnabled:
   type: bool
   defaultValue: false
@@ -1645,22 +1650,6 @@ ApplePayRemoteUIEnabled:
   humanReadableName: "Apple Pay Remote UI"
   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
 
 ICECandidateFilteringEnabled:
index e7f7f8a..317f740 100644 (file)
@@ -30,7 +30,6 @@
 #include "APIObject.h"
 #include "WebPreferencesDefinitions.h"
 #include "WebPreferencesStore.h"
-#include <WebCore/Settings.h>
 #include <wtf/HashSet.h>
 #include <wtf/RefPtr.h>