Title: [232356] trunk/Source/WebKit
- Revision
- 232356
- Author
- an...@apple.com
- Date
- 2018-05-31 10:55:43 -0700 (Thu, 31 May 2018)
Log Message
WebKit memory management: Safari jetsams on some websites when zooming and scrolling
https://bugs.webkit.org/show_bug.cgi?id=186091
<rdar://problem/36315010>
Reviewed by Geoff Garen.
When zooming a page rapidly the visible rect and the page zoom level may get momentarily out of sync.
When this happens we may generate tiles for a much larger area than needed and run out of memory
building the next layer tree transaction. Running out of memory is more likely if the page has lots of
tiled layers in addition to the main content layer.
We already have code for dealing with the scale mismatch for zoom-out case (where this would cause
visibly missing tiles). This patch enables the same exact adjustment for zoom-in case (where the
symptom is creating too many tiles).
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::adjustExposedRectForNewScale):
Do some renames to make it clear that this can both expand and contract the visible rect.
Bail out if there is nothing to do.
(WebKit::WebPage::updateVisibleContentRects):
Call adjustExposedRectForNewScale directly and unconditionally.
(WebKit::adjustExposedRectForBoundedScale): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (232355 => 232356)
--- trunk/Source/WebKit/ChangeLog 2018-05-31 17:42:04 UTC (rev 232355)
+++ trunk/Source/WebKit/ChangeLog 2018-05-31 17:55:43 UTC (rev 232356)
@@ -1,3 +1,32 @@
+2018-05-31 Antti Koivisto <an...@apple.com>
+
+ WebKit memory management: Safari jetsams on some websites when zooming and scrolling
+ https://bugs.webkit.org/show_bug.cgi?id=186091
+ <rdar://problem/36315010>
+
+ Reviewed by Geoff Garen.
+
+ When zooming a page rapidly the visible rect and the page zoom level may get momentarily out of sync.
+ When this happens we may generate tiles for a much larger area than needed and run out of memory
+ building the next layer tree transaction. Running out of memory is more likely if the page has lots of
+ tiled layers in addition to the main content layer.
+
+ We already have code for dealing with the scale mismatch for zoom-out case (where this would cause
+ visibly missing tiles). This patch enables the same exact adjustment for zoom-in case (where the
+ symptom is creating too many tiles).
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::adjustExposedRectForNewScale):
+
+ Do some renames to make it clear that this can both expand and contract the visible rect.
+ Bail out if there is nothing to do.
+
+ (WebKit::WebPage::updateVisibleContentRects):
+
+ Call adjustExposedRectForNewScale directly and unconditionally.
+
+ (WebKit::adjustExposedRectForBoundedScale): Deleted.
+
2018-05-30 Yusuke Suzuki <utatane....@gmail.com>
[JSC] Pass VM& parameter as much as possible
Modified: trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (232355 => 232356)
--- trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2018-05-31 17:42:04 UTC (rev 232355)
+++ trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2018-05-31 17:55:43 UTC (rev 232356)
@@ -299,13 +299,15 @@
static inline FloatRect adjustExposedRectForNewScale(const FloatRect& exposedRect, double exposedRectScale, double newScale)
{
- double overscaledWidth = exposedRect.width();
- double missingHorizonalMargin = exposedRect.width() * exposedRectScale / newScale - overscaledWidth;
+ if (exposedRectScale == newScale)
+ return exposedRect;
- double overscaledHeight = exposedRect.height();
- double missingVerticalMargin = exposedRect.height() * exposedRectScale / newScale - overscaledHeight;
+ float horizontalChange = exposedRect.width() * exposedRectScale / newScale - exposedRect.width();
+ float verticalChange = exposedRect.height() * exposedRectScale / newScale - exposedRect.height();
- return FloatRect(exposedRect.x() - missingHorizonalMargin / 2, exposedRect.y() - missingVerticalMargin / 2, exposedRect.width() + missingHorizonalMargin, exposedRect.height() + missingVerticalMargin);
+ auto adjustedRect = exposedRect;
+ adjustedRect.inflate({ horizontalChange / 2, verticalChange / 2 });
+ return adjustedRect;
}
void WebPage::restorePageState(const HistoryItem& historyItem)
@@ -2808,14 +2810,6 @@
scaleChangeRate = 0;
}
-static inline FloatRect adjustExposedRectForBoundedScale(const FloatRect& exposedRect, double exposedRectScale, double newScale)
-{
- if (exposedRectScale < newScale)
- return exposedRect;
-
- return adjustExposedRectForNewScale(exposedRect, exposedRectScale, newScale);
-}
-
std::optional<float> WebPage::scaleFromUIProcess(const VisibleContentRectUpdateInfo& visibleContentRectUpdateInfo) const
{
auto transactionIDForLastScaleSentToUIProcess = downcast<RemoteLayerTreeDrawingArea>(*m_drawingArea).lastCommittedTransactionID();
@@ -2886,7 +2880,7 @@
float scaleToUse = scaleFromUIProcess.value_or(m_page->pageScaleFactor());
FloatRect exposedContentRect = visibleContentRectUpdateInfo.exposedContentRect();
- FloatRect adjustedExposedContentRect = adjustExposedRectForBoundedScale(exposedContentRect, visibleContentRectUpdateInfo.scale(), scaleToUse);
+ FloatRect adjustedExposedContentRect = adjustExposedRectForNewScale(exposedContentRect, visibleContentRectUpdateInfo.scale(), scaleToUse);
m_drawingArea->setExposedContentRect(adjustedExposedContentRect);
IntPoint scrollPosition = roundedIntPoint(visibleContentRectUpdateInfo.unobscuredContentRect().location());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
