Title: [244702] trunk/Source
- Revision
- 244702
- Author
- [email protected]
- Date
- 2019-04-26 11:32:41 -0700 (Fri, 26 Apr 2019)
Log 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
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (244701 => 244702)
--- trunk/Source/WebCore/ChangeLog 2019-04-26 18:25:28 UTC (rev 244701)
+++ trunk/Source/WebCore/ChangeLog 2019-04-26 18:32:41 UTC (rev 244702)
@@ -1,3 +1,18 @@
+2019-04-26 Commit Queue <[email protected]>
+
+ 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 <[email protected]>
Use normal loading path for ping loads
Modified: trunk/Source/WebCore/page/Settings.yaml (244701 => 244702)
--- trunk/Source/WebCore/page/Settings.yaml 2019-04-26 18:25:28 UTC (rev 244701)
+++ trunk/Source/WebCore/page/Settings.yaml 2019-04-26 18:32:41 UTC (rev 244702)
@@ -444,10 +444,6 @@
initial: defaultTextAutosizingUsesIdempotentMode()
onChange: setNeedsRecalcStyleInAllFrames
conditional: TEXT_AUTOSIZING
-forceAutoBehaviorForTextSizeAdjust:
- initial: false
- onChange: setNeedsRecalcStyleInAllFrames
- conditional: TEXT_AUTOSIZING
subpixelAntialiasedLayerTextEnabled:
initial: false
Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (244701 => 244702)
--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2019-04-26 18:25:28 UTC (rev 244701)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2019-04-26 18:32:41 UTC (rev 244702)
@@ -3815,7 +3815,7 @@
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);
}
Modified: trunk/Source/WebCore/rendering/TextAutoSizing.cpp (244701 => 244702)
--- trunk/Source/WebCore/rendering/TextAutoSizing.cpp 2019-04-26 18:25:28 UTC (rev 244701)
+++ trunk/Source/WebCore/rendering/TextAutoSizing.cpp 2019-04-26 18:32:41 UTC (rev 244702)
@@ -76,7 +76,7 @@
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());
}
Modified: trunk/Source/WebKit/ChangeLog (244701 => 244702)
--- trunk/Source/WebKit/ChangeLog 2019-04-26 18:25:28 UTC (rev 244701)
+++ trunk/Source/WebKit/ChangeLog 2019-04-26 18:32:41 UTC (rev 244702)
@@ -1,3 +1,18 @@
+2019-04-26 Commit Queue <[email protected]>
+
+ 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 <[email protected]>
Use normal loading path for ping loads
Modified: trunk/Source/WebKit/Shared/WebPreferences.yaml (244701 => 244702)
--- trunk/Source/WebKit/Shared/WebPreferences.yaml 2019-04-26 18:25:28 UTC (rev 244701)
+++ trunk/Source/WebKit/Shared/WebPreferences.yaml 2019-04-26 18:32:41 UTC (rev 244702)
@@ -433,6 +433,11 @@
type: bool
defaultValue: false
+TextAutosizingEnabled:
+ type: bool
+ defaultValue: WebCore::Settings::defaultTextAutosizingEnabled()
+ condition: ENABLE(TEXT_AUTOSIZING)
+
AggressiveTileRetentionEnabled:
type: bool
defaultValue: false
@@ -1645,22 +1650,6 @@
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:
Modified: trunk/Source/WebKit/UIProcess/WebPreferences.h (244701 => 244702)
--- trunk/Source/WebKit/UIProcess/WebPreferences.h 2019-04-26 18:25:28 UTC (rev 244701)
+++ trunk/Source/WebKit/UIProcess/WebPreferences.h 2019-04-26 18:32:41 UTC (rev 244702)
@@ -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>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
