Title: [270889] trunk/Source/WebKit
- Revision
- 270889
- Author
- [email protected]
- Date
- 2020-12-16 08:03:29 -0800 (Wed, 16 Dec 2020)
Log Message
Calls to setFixedLayoutSize() should not be inside ENABLE(TEXT_AUTOSIZING)
https://bugs.webkit.org/show_bug.cgi?id=219932
Reviewed by Wenson Hsieh.
We always want to call setFixedLayoutSize(), whether or not ENABLE(TEXT_AUTOSIZING) is defined.
For code simplicity, make resetTextAutosizing() an empty function when ENABLE(TEXT_AUTOSIZING)
is not defined.
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::dynamicViewportSizeUpdate):
(WebKit::WebPage::resetTextAutosizing):
(WebKit::WebPage::viewportConfigurationChanged):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (270888 => 270889)
--- trunk/Source/WebKit/ChangeLog 2020-12-16 13:47:49 UTC (rev 270888)
+++ trunk/Source/WebKit/ChangeLog 2020-12-16 16:03:29 UTC (rev 270889)
@@ -1,3 +1,21 @@
+2020-12-15 Simon Fraser <[email protected]>
+
+ Calls to setFixedLayoutSize() should not be inside ENABLE(TEXT_AUTOSIZING)
+ https://bugs.webkit.org/show_bug.cgi?id=219932
+
+ Reviewed by Wenson Hsieh.
+
+ We always want to call setFixedLayoutSize(), whether or not ENABLE(TEXT_AUTOSIZING) is defined.
+
+ For code simplicity, make resetTextAutosizing() an empty function when ENABLE(TEXT_AUTOSIZING)
+ is not defined.
+
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::dynamicViewportSizeUpdate):
+ (WebKit::WebPage::resetTextAutosizing):
+ (WebKit::WebPage::viewportConfigurationChanged):
+
2020-12-16 Per Arne Vollan <[email protected]>
[macOS] Add sandbox parameter for message filter entitlement status
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (270888 => 270889)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2020-12-16 13:47:49 UTC (rev 270888)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2020-12-16 16:03:29 UTC (rev 270889)
@@ -1435,9 +1435,9 @@
#if ENABLE(TEXT_AUTOSIZING)
void textAutoSizingAdjustmentTimerFired();
- void resetTextAutosizing();
void resetIdempotentTextAutosizingIfNeeded(double previousInitialScale);
#endif
+ void resetTextAutosizing();
#if ENABLE(VIEWPORT_RESIZING)
void shrinkToFitContent(ZoomToInitialScale = ZoomToInitialScale::No);
Modified: trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (270888 => 270889)
--- trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2020-12-16 13:47:49 UTC (rev 270888)
+++ trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2020-12-16 16:03:29 UTC (rev 270889)
@@ -3313,10 +3313,9 @@
IntSize newLayoutSize = m_viewportConfiguration.layoutSize();
-#if ENABLE(TEXT_AUTOSIZING)
if (setFixedLayoutSize(newLayoutSize))
resetTextAutosizing();
-#endif
+
setMaximumUnobscuredSize(maximumUnobscuredSize);
m_page->setUnobscuredSafeAreaInsets(targetUnobscuredSafeAreaInsets);
@@ -3518,9 +3517,11 @@
// We don't need to update text sizing eagerly. There might be multiple incoming dynamic viewport changes.
m_textAutoSizingAdjustmentTimer.startOneShot(textAutoSizingDelay());
}
+#endif // ENABLE(TEXT_AUTOSIZING)
void WebPage::resetTextAutosizing()
{
+#if ENABLE(TEXT_AUTOSIZING)
for (Frame* frame = &m_page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
Document* document = frame->document();
if (!document || !document->renderView())
@@ -3527,8 +3528,8 @@
continue;
document->renderView()->resetTextAutosizing();
}
+#endif
}
-#endif
#if ENABLE(VIEWPORT_RESIZING)
@@ -3619,10 +3620,10 @@
double previousInitialScaleIgnoringContentSize = m_page->initialScaleIgnoringContentSize();
m_page->setInitialScaleIgnoringContentSize(initialScaleIgnoringContentSize);
resetIdempotentTextAutosizingIfNeeded(previousInitialScaleIgnoringContentSize);
-
+#endif
if (setFixedLayoutSize(m_viewportConfiguration.layoutSize()))
resetTextAutosizing();
-#endif
+
double scale;
if (m_userHasChangedPageScaleFactor && zoomToInitialScale == ZoomToInitialScale::No)
scale = std::max(std::min(pageScaleFactor(), m_viewportConfiguration.maximumScale()), m_viewportConfiguration.minimumScale());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
