Attachment 368339 Details for Bug 197320 – ROLLOUT of r244683

[patch] ROLLOUT of r244683

bug-197320-20190426113009.patch (text/plain), 5.96 KB, created by WebKit Commit Bot on 2019-04-26 11:30:09 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2019-04-26 11:30:09 PDT

Size: 5.96 KB

patch

obsolete

>Subversion Revision: 244701
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 4593a44756189b31b1866ba68526d61fe56fc370..16396395a7ca0faba3ca0f94bc3f314eea7ca2c6 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -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
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index f10cb92784ca1513ea44c7f2b9f7bc06c7eb91bd..5c973d5666add9a5725e483bcc8380e9bc46d188 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -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
>diff --git a/Source/WebCore/page/Settings.yaml b/Source/WebCore/page/Settings.yaml
>index c07efd37b60bbfa351026c4f28180cfdb08b4132..e47d7eb4cb5d7c4ab3a121eb3ffe67a3a9accf59 100644
>--- a/Source/WebCore/page/Settings.yaml
>+++ b/Source/WebCore/page/Settings.yaml
>@@ -444,10 +444,6 @@ textAutosizingUsesIdempotentMode:
>   initial: defaultTextAutosizingUsesIdempotentMode()
>   onChange: setNeedsRecalcStyleInAllFrames
>   conditional: TEXT_AUTOSIZING
>-forceAutoBehaviorForTextSizeAdjust:
>-  initial: false
>-  onChange: setNeedsRecalcStyleInAllFrames
>-  conditional: TEXT_AUTOSIZING
> 
> subpixelAntialiasedLayerTextEnabled:
>   initial: false
>diff --git a/Source/WebCore/rendering/RenderBlockFlow.cpp b/Source/WebCore/rendering/RenderBlockFlow.cpp
>index af5ce7c07c298d098906ed92d8e092025fbd9877..766591cc9fecaa23e56374524c81f75c79097510 100644
>--- a/Source/WebCore/rendering/RenderBlockFlow.cpp
>+++ b/Source/WebCore/rendering/RenderBlockFlow.cpp
>@@ -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);
>         }
> 
>diff --git a/Source/WebCore/rendering/TextAutoSizing.cpp b/Source/WebCore/rendering/TextAutoSizing.cpp
>index a15efa0aa70fe4f4fdb5176cff3827025da682fc..3ba130d4559d7292d891f553cf1480f866bb2bad 100644
>--- a/Source/WebCore/rendering/TextAutoSizing.cpp
>+++ b/Source/WebCore/rendering/TextAutoSizing.cpp
>@@ -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());
>     }
> 
>diff --git a/Source/WebKit/Shared/WebPreferences.yaml b/Source/WebKit/Shared/WebPreferences.yaml
>index 82deda83c54007752b64135951c6651e7d74d170..ff9da3b51ae89d7bf38f5f9cd8116fb81b711c1c 100644
>--- a/Source/WebKit/Shared/WebPreferences.yaml
>+++ b/Source/WebKit/Shared/WebPreferences.yaml
>@@ -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:
>diff --git a/Source/WebKit/UIProcess/WebPreferences.h b/Source/WebKit/UIProcess/WebPreferences.h
>index e7f7f8a3ce9948868f8efa026dab0c929670e4ca..317f740afe19f30801bce720cdb64b57d1da66b0 100644
>--- a/Source/WebKit/UIProcess/WebPreferences.h
>+++ b/Source/WebKit/UIProcess/WebPreferences.h
>@@ -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>
>

Actions: View | Formatted Diff | Diff

Attachments on bug 197320: 368339