Title: [278442] trunk/Source/WebKit
- Revision
- 278442
- Author
- [email protected]
- Date
- 2021-06-03 18:53:30 -0700 (Thu, 03 Jun 2021)
Log Message
stopMakingViewBlankDueToLackOfRenderingUpdate logging shows even if we never made the view blank
https://bugs.webkit.org/show_bug.cgi?id=226616
Reviewed by Tim Horton.
stopMakingViewBlankDueToLackOfRenderingUpdate logging was showing even if we never made the view blank.
This was confusing so this fix makes the logging conditional.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didUpdateRenderingAfterCommittingLoad):
(WebKit::WebPageProxy::stopMakingViewBlankDueToLackOfRenderingUpdate):
(WebKit::WebPageProxy::makeViewBlankIfUnpaintedSinceLastLoadCommit):
* UIProcess/WebPageProxy.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (278441 => 278442)
--- trunk/Source/WebKit/ChangeLog 2021-06-04 01:49:26 UTC (rev 278441)
+++ trunk/Source/WebKit/ChangeLog 2021-06-04 01:53:30 UTC (rev 278442)
@@ -1,5 +1,21 @@
2021-06-03 Chris Dumez <[email protected]>
+ stopMakingViewBlankDueToLackOfRenderingUpdate logging shows even if we never made the view blank
+ https://bugs.webkit.org/show_bug.cgi?id=226616
+
+ Reviewed by Tim Horton.
+
+ stopMakingViewBlankDueToLackOfRenderingUpdate logging was showing even if we never made the view blank.
+ This was confusing so this fix makes the logging conditional.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didUpdateRenderingAfterCommittingLoad):
+ (WebKit::WebPageProxy::stopMakingViewBlankDueToLackOfRenderingUpdate):
+ (WebKit::WebPageProxy::makeViewBlankIfUnpaintedSinceLastLoadCommit):
+ * UIProcess/WebPageProxy.h:
+
+2021-06-03 Chris Dumez <[email protected]>
+
Fix thread safety issues in [WKShareSheet presentWithParameters]
https://bugs.webkit.org/show_bug.cgi?id=226611
<rdar://77736001>
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (278441 => 278442)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-06-04 01:49:26 UTC (rev 278441)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-06-04 01:53:30 UTC (rev 278442)
@@ -2515,14 +2515,18 @@
return;
m_hasUpdatedRenderingAfterDidCommitLoad = true;
- stopMakingViewBlankDueToLackOfRenderingUpdate();
+ stopMakingViewBlankDueToLackOfRenderingUpdateIfNecessary();
}
-void WebPageProxy::stopMakingViewBlankDueToLackOfRenderingUpdate()
+void WebPageProxy::stopMakingViewBlankDueToLackOfRenderingUpdateIfNecessary()
{
+ if (!m_madeViewBlankDueToLackOfRenderingUpdate)
+ return;
+
ASSERT(m_hasUpdatedRenderingAfterDidCommitLoad);
- WEBPAGEPROXY_RELEASE_LOG(Process, "stopMakingViewBlankDueToLackOfRenderingUpdate:");
+ WEBPAGEPROXY_RELEASE_LOG(Process, "stopMakingViewBlankDueToLackOfRenderingUpdateIfNecessary:");
pageClient().makeViewBlank(false);
+ m_madeViewBlankDueToLackOfRenderingUpdate = false;
}
// If we have not painted yet since the last load commit, then we are likely still displaying the previous page.
@@ -2539,6 +2543,7 @@
if (shouldMakeViewBlank) {
WEBPAGEPROXY_RELEASE_LOG(Process, "makeViewBlankIfUnpaintedSinceLastLoadCommit: Making the view blank because of a JS prompt before the first paint for its page");
pageClient().makeViewBlank(true);
+ m_madeViewBlankDueToLackOfRenderingUpdate = true;
}
}
}
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (278441 => 278442)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2021-06-04 01:49:26 UTC (rev 278441)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2021-06-04 01:53:30 UTC (rev 278442)
@@ -2237,7 +2237,7 @@
void didPerformDictionaryLookup(const WebCore::DictionaryPopupInfo&);
#endif
- void stopMakingViewBlankDueToLackOfRenderingUpdate();
+ void stopMakingViewBlankDueToLackOfRenderingUpdateIfNecessary();
// Spelling and grammar.
void checkSpellingOfString(const String& text, CompletionHandler<void(int32_t misspellingLocation, int32_t misspellingLength)>&&);
@@ -2857,6 +2857,7 @@
bool m_shouldScaleViewToFitDocument { false };
bool m_shouldSuppressNextAutomaticNavigationSnapshot { false };
+ bool m_madeViewBlankDueToLackOfRenderingUpdate { false };
#if PLATFORM(COCOA)
using TemporaryPDFFileMap = HashMap<String, String>;
Modified: trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm (278441 => 278442)
--- trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2021-06-04 01:49:26 UTC (rev 278441)
+++ trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2021-06-04 01:53:30 UTC (rev 278442)
@@ -344,7 +344,7 @@
if (!m_hasUpdatedRenderingAfterDidCommitLoad) {
if (layerTreeTransaction.transactionID() >= m_firstLayerTreeTransactionIdAfterDidCommitLoad) {
m_hasUpdatedRenderingAfterDidCommitLoad = true;
- stopMakingViewBlankDueToLackOfRenderingUpdate();
+ stopMakingViewBlankDueToLackOfRenderingUpdateIfNecessary();
m_lastVisibleContentRectUpdate = VisibleContentRectUpdateInfo();
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
