Diff
Modified: trunk/Source/WebCore/ChangeLog (247921 => 247922)
--- trunk/Source/WebCore/ChangeLog 2019-07-29 21:21:54 UTC (rev 247921)
+++ trunk/Source/WebCore/ChangeLog 2019-07-29 21:32:16 UTC (rev 247922)
@@ -1,3 +1,20 @@
+2019-07-29 Zalan Bujtas <[email protected]>
+
+ [ContentChangeObserver] ChromeClient::observedContentChange() name is misleading
+ https://bugs.webkit.org/show_bug.cgi?id=200238
+ <rdar://problem/53677038>
+
+ Reviewed by Simon Fraser.
+
+ This function indicates that we've finished observing content changes.
+
+ * loader/EmptyClients.h:
+ * page/ChromeClient.h:
+ * page/ios/ContentChangeObserver.cpp:
+ (WebCore::ContentChangeObserver::adjustObservedState):
+ * page/ios/EventHandlerIOS.mm:
+ (WebCore::EventHandler::mouseMoved):
+
2019-07-29 Sam Weinig <[email protected]>
StringBuilder::append(makeString(...)) is inefficient
Modified: trunk/Source/WebCore/loader/EmptyClients.h (247921 => 247922)
--- trunk/Source/WebCore/loader/EmptyClients.h 2019-07-29 21:21:54 UTC (rev 247921)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2019-07-29 21:32:16 UTC (rev 247922)
@@ -169,7 +169,7 @@
#if PLATFORM(IOS_FAMILY)
void didReceiveMobileDocType(bool) final { }
void setNeedsScrollNotifications(Frame&, bool) final { }
- void observedContentChange(Frame&) final { }
+ void didFinishContentChangeObserving(Frame&) final { }
void notifyRevealedSelectionByScrollingFrame(Frame&) final { }
void didLayout(LayoutType) final { }
void didStartOverflowScroll() final { }
Modified: trunk/Source/WebCore/page/ChromeClient.h (247921 => 247922)
--- trunk/Source/WebCore/page/ChromeClient.h 2019-07-29 21:21:54 UTC (rev 247921)
+++ trunk/Source/WebCore/page/ChromeClient.h 2019-07-29 21:32:16 UTC (rev 247922)
@@ -246,7 +246,7 @@
#if PLATFORM(IOS_FAMILY)
virtual void didReceiveMobileDocType(bool) = 0;
virtual void setNeedsScrollNotifications(Frame&, bool) = 0;
- virtual void observedContentChange(Frame&) = 0;
+ virtual void didFinishContentChangeObserving(Frame&) = 0;
virtual void notifyRevealedSelectionByScrollingFrame(Frame&) = 0;
enum LayoutType { NormalLayout, Scroll };
Modified: trunk/Source/WebCore/page/ios/ContentChangeObserver.cpp (247921 => 247922)
--- trunk/Source/WebCore/page/ios/ContentChangeObserver.cpp 2019-07-29 21:21:54 UTC (rev 247921)
+++ trunk/Source/WebCore/page/ios/ContentChangeObserver.cpp 2019-07-29 21:32:16 UTC (rev 247922)
@@ -491,7 +491,7 @@
LOG_WITH_STREAM(ContentObservation, stream << "adjustStateAndNotifyContentChangeIfNeeded: sending observedContentChange ->" << observedContentChange());
ASSERT(m_document.page());
ASSERT(m_document.frame());
- m_document.page()->chrome().client().observedContentChange(*m_document.frame());
+ m_document.page()->chrome().client().didFinishContentChangeObserving(*m_document.frame());
};
switch (event) {
Modified: trunk/Source/WebCore/page/ios/EventHandlerIOS.mm (247921 => 247922)
--- trunk/Source/WebCore/page/ios/EventHandlerIOS.mm 2019-07-29 21:21:54 UTC (rev 247921)
+++ trunk/Source/WebCore/page/ios/EventHandlerIOS.mm 2019-07-29 21:32:16 UTC (rev 247922)
@@ -501,8 +501,9 @@
// Run style recalc to be able to capture content changes as the result of the mouse move event.
document.updateStyleIfNeeded();
callOnMainThread([protectedFrame = makeRef(m_frame)] {
+ // This is called by WebKitLegacy only.
if (auto* document = protectedFrame->document())
- document->page()->chrome().client().observedContentChange(*document->frame());
+ document->page()->chrome().client().didFinishContentChangeObserving(*document->frame());
});
}
Modified: trunk/Source/WebKit/ChangeLog (247921 => 247922)
--- trunk/Source/WebKit/ChangeLog 2019-07-29 21:21:54 UTC (rev 247921)
+++ trunk/Source/WebKit/ChangeLog 2019-07-29 21:32:16 UTC (rev 247922)
@@ -1,3 +1,20 @@
+2019-07-29 Zalan Bujtas <[email protected]>
+
+ [ContentChangeObserver] ChromeClient::observedContentChange() name is misleading
+ https://bugs.webkit.org/show_bug.cgi?id=200238
+ <rdar://problem/53677038>
+
+ Reviewed by Simon Fraser.
+
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+ * WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm:
+ (WebKit::WebChromeClient::didFinishContentChangeObserving):
+ (WebKit::WebChromeClient::observedContentChange): Deleted.
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::didFinishContentChangeObserving):
+ (WebKit::WebPage::completePendingSyntheticClickForContentChangeObserver): Deleted.
+
2019-07-26 Ryosuke Niwa <[email protected]>
ShareableBitmap::createGraphicsContext() should return nullptr when CGBitmapContextCreateWithData returns nil
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h (247921 => 247922)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h 2019-07-29 21:21:54 UTC (rev 247921)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h 2019-07-29 21:32:16 UTC (rev 247922)
@@ -161,7 +161,7 @@
#if PLATFORM(IOS_FAMILY)
void didReceiveMobileDocType(bool) final;
void setNeedsScrollNotifications(WebCore::Frame&, bool) final;
- void observedContentChange(WebCore::Frame&) final;
+ void didFinishContentChangeObserving(WebCore::Frame&) final;
void notifyRevealedSelectionByScrollingFrame(WebCore::Frame&) final;
bool isStopping() final;
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm (247921 => 247922)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm 2019-07-29 21:21:54 UTC (rev 247921)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm 2019-07-29 21:32:16 UTC (rev 247922)
@@ -66,9 +66,9 @@
notImplemented();
}
-void WebChromeClient::observedContentChange(WebCore::Frame&)
+void WebChromeClient::didFinishContentChangeObserving(WebCore::Frame&)
{
- m_page.completePendingSyntheticClickForContentChangeObserver();
+ m_page.didFinishContentChangeObserving();
}
void WebChromeClient::notifyRevealedSelectionByScrollingFrame(WebCore::Frame&)
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (247921 => 247922)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2019-07-29 21:21:54 UTC (rev 247921)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2019-07-29 21:32:16 UTC (rev 247922)
@@ -956,7 +956,7 @@
void applicationDidFinishSnapshottingAfterEnteringBackground();
void applicationWillEnterForeground(bool isSuspendedUnderLock);
void applicationDidBecomeActive();
- void completePendingSyntheticClickForContentChangeObserver();
+ void didFinishContentChangeObserving();
bool platformPrefersTextLegibilityBasedZoomScaling() const;
const WebCore::ViewportConfiguration& viewportConfiguration() const { return m_viewportConfiguration; }
Modified: trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (247921 => 247922)
--- trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2019-07-29 21:21:54 UTC (rev 247921)
+++ trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2019-07-29 21:32:16 UTC (rev 247922)
@@ -732,9 +732,9 @@
});
}
-void WebPage::completePendingSyntheticClickForContentChangeObserver()
+void WebPage::didFinishContentChangeObserving()
{
- LOG_WITH_STREAM(ContentObservation, stream << "completePendingSyntheticClickForContentChangeObserver: pending target node(" << m_pendingSyntheticClickNode << ")");
+ LOG_WITH_STREAM(ContentObservation, stream << "didFinishContentChangeObserving: pending target node(" << m_pendingSyntheticClickNode << ")");
if (!m_pendingSyntheticClickNode)
return;
auto observedContentChange = m_pendingSyntheticClickNode->document().contentChangeObserver().observedContentChange();
Modified: trunk/Source/WebKitLegacy/ios/ChangeLog (247921 => 247922)
--- trunk/Source/WebKitLegacy/ios/ChangeLog 2019-07-29 21:21:54 UTC (rev 247921)
+++ trunk/Source/WebKitLegacy/ios/ChangeLog 2019-07-29 21:32:16 UTC (rev 247922)
@@ -1,3 +1,16 @@
+2019-07-29 Zalan Bujtas <[email protected]>
+
+ [ContentChangeObserver] ChromeClient::observedContentChange() name is misleading
+ https://bugs.webkit.org/show_bug.cgi?id=200238
+ <rdar://problem/53677038>
+
+ Reviewed by Simon Fraser.
+
+ * WebCoreSupport/WebChromeClientIOS.h:
+ * WebCoreSupport/WebChromeClientIOS.mm:
+ (WebChromeClientIOS::didFinishContentChangeObserving):
+ (WebChromeClientIOS::observedContentChange): Deleted.
+
2019-07-02 Devin Rousso <[email protected]>
Web Inspector: Debug: "Reset Web Inspector" should also clear the saved window size and attachment side
Modified: trunk/Source/WebKitLegacy/ios/WebCoreSupport/WebChromeClientIOS.h (247921 => 247922)
--- trunk/Source/WebKitLegacy/ios/WebCoreSupport/WebChromeClientIOS.h 2019-07-29 21:21:54 UTC (rev 247921)
+++ trunk/Source/WebKitLegacy/ios/WebCoreSupport/WebChromeClientIOS.h 2019-07-29 21:32:16 UTC (rev 247922)
@@ -55,7 +55,7 @@
void didReceiveMobileDocType(bool) final;
void setNeedsScrollNotifications(WebCore::Frame&, bool) final;
- void observedContentChange(WebCore::Frame&) final;
+ void didFinishContentChangeObserving(WebCore::Frame&) final;
WebCore::FloatSize screenSize() const final;
WebCore::FloatSize availableScreenSize() const final;
WebCore::FloatSize overrideScreenSize() const final;
Modified: trunk/Source/WebKitLegacy/ios/WebCoreSupport/WebChromeClientIOS.mm (247921 => 247922)
--- trunk/Source/WebKitLegacy/ios/WebCoreSupport/WebChromeClientIOS.mm 2019-07-29 21:21:54 UTC (rev 247921)
+++ trunk/Source/WebKitLegacy/ios/WebCoreSupport/WebChromeClientIOS.mm 2019-07-29 21:32:16 UTC (rev 247922)
@@ -182,7 +182,7 @@
[[webView() _UIKitDelegateForwarder] webView:webView() needsScrollNotifications:[NSNumber numberWithBool:flag] forFrame:kit(&frame)];
}
-void WebChromeClientIOS::observedContentChange(WebCore::Frame& frame)
+void WebChromeClientIOS::didFinishContentChangeObserving(WebCore::Frame& frame)
{
if (!frame.document())
return;
