Title: [242094] trunk/Source
- Revision
- 242094
- Author
- [email protected]
- Date
- 2019-02-26 10:37:09 -0800 (Tue, 26 Feb 2019)
Log Message
[ContentChangeObserver] Simplify content observation API by removing explicit DOMTimer observation.
https://bugs.webkit.org/show_bug.cgi?id=195023
<rdar://problem/48381885>
Reviewed by Tim Horton.
Source/WebCore:
In the future we might decide that certain activities don't require DOMTimer observation, but that should
be internal to ContentChangeObserver.
* page/ios/ContentChangeObserver.h:
* page/ios/ContentChangeObserver.mm:
(WebCore::ContentChangeObserver::startObservingContentChanges):
(WebCore::ContentChangeObserver::stopObservingContentChanges):
* page/ios/EventHandlerIOS.mm:
(WebCore::EventHandler::mouseMoved):
Source/WebKit:
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::handleSyntheticClick):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (242093 => 242094)
--- trunk/Source/WebCore/ChangeLog 2019-02-26 18:28:42 UTC (rev 242093)
+++ trunk/Source/WebCore/ChangeLog 2019-02-26 18:37:09 UTC (rev 242094)
@@ -1,5 +1,23 @@
2019-02-26 Zalan Bujtas <[email protected]>
+ [ContentChangeObserver] Simplify content observation API by removing explicit DOMTimer observation.
+ https://bugs.webkit.org/show_bug.cgi?id=195023
+ <rdar://problem/48381885>
+
+ Reviewed by Tim Horton.
+
+ In the future we might decide that certain activities don't require DOMTimer observation, but that should
+ be internal to ContentChangeObserver.
+
+ * page/ios/ContentChangeObserver.h:
+ * page/ios/ContentChangeObserver.mm:
+ (WebCore::ContentChangeObserver::startObservingContentChanges):
+ (WebCore::ContentChangeObserver::stopObservingContentChanges):
+ * page/ios/EventHandlerIOS.mm:
+ (WebCore::EventHandler::mouseMoved):
+
+2019-02-26 Zalan Bujtas <[email protected]>
+
[ContentChangeObserver] Move observing logic from Document::updateStyleIfNeeded to ContentChangeObserver
https://bugs.webkit.org/show_bug.cgi?id=195032
<rdar://problem/48388063>
Modified: trunk/Source/WebCore/page/ios/ContentChangeObserver.h (242093 => 242094)
--- trunk/Source/WebCore/page/ios/ContentChangeObserver.h 2019-02-26 18:28:42 UTC (rev 242093)
+++ trunk/Source/WebCore/page/ios/ContentChangeObserver.h 2019-02-26 18:37:09 UTC (rev 242094)
@@ -49,9 +49,6 @@
WEBCORE_EXPORT void startObservingContentChanges();
WEBCORE_EXPORT void stopObservingContentChanges();
- WEBCORE_EXPORT void startObservingDOMTimerScheduling();
- WEBCORE_EXPORT void stopObservingDOMTimerScheduling();
-
bool isObservingStyleRecalcScheduling();
void setShouldObserveNextStyleRecalc(bool);
@@ -77,6 +74,9 @@
};
private:
+ void startObservingDOMTimerScheduling();
+ void stopObservingDOMTimerScheduling();
+
void addObservedDOMTimer(const DOMTimer&);
bool isObservingDOMTimerScheduling();
void removeObservedDOMTimer(const DOMTimer&);
Modified: trunk/Source/WebCore/page/ios/ContentChangeObserver.mm (242093 => 242094)
--- trunk/Source/WebCore/page/ios/ContentChangeObserver.mm 2019-02-26 18:28:42 UTC (rev 242093)
+++ trunk/Source/WebCore/page/ios/ContentChangeObserver.mm 2019-02-26 18:37:09 UTC (rev 242094)
@@ -122,11 +122,13 @@
void ContentChangeObserver::startObservingContentChanges()
{
+ startObservingDOMTimerScheduling();
WKStartObservingContentChanges();
}
void ContentChangeObserver::stopObservingContentChanges()
{
+ stopObservingDOMTimerScheduling();
WKStopObservingContentChanges();
}
Modified: trunk/Source/WebCore/page/ios/EventHandlerIOS.mm (242093 => 242094)
--- trunk/Source/WebCore/page/ios/EventHandlerIOS.mm 2019-02-26 18:28:42 UTC (rev 242093)
+++ trunk/Source/WebCore/page/ios/EventHandlerIOS.mm 2019-02-26 18:37:09 UTC (rev 242094)
@@ -497,7 +497,6 @@
auto& contentChangeObserver = document.page()->contentChangeObserver();
contentChangeObserver.startObservingContentChanges();
- contentChangeObserver.startObservingDOMTimerScheduling();
CurrentEventScope scope(event);
event.wasHandled = mouseMoved(currentPlatformMouseEvent());
@@ -504,7 +503,6 @@
// Run style recalc to be able to capture content changes as the result of the mouse move event.
document.updateStyleIfNeeded();
- contentChangeObserver.stopObservingDOMTimerScheduling();
contentChangeObserver.stopObservingContentChanges();
END_BLOCK_OBJC_EXCEPTIONS;
Modified: trunk/Source/WebKit/ChangeLog (242093 => 242094)
--- trunk/Source/WebKit/ChangeLog 2019-02-26 18:28:42 UTC (rev 242093)
+++ trunk/Source/WebKit/ChangeLog 2019-02-26 18:37:09 UTC (rev 242094)
@@ -1,3 +1,14 @@
+2019-02-26 Zalan Bujtas <[email protected]>
+
+ [ContentChangeObserver] Simplify content observation API by removing explicit DOMTimer observation.
+ https://bugs.webkit.org/show_bug.cgi?id=195023
+ <rdar://problem/48381885>
+
+ Reviewed by Tim Horton.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::handleSyntheticClick):
+
2019-02-26 Takashi Komori <[email protected]>
[Curl] Load HTTP body of 401 response when AuthenticationChange is cancelled.
Modified: trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (242093 => 242094)
--- trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2019-02-26 18:28:42 UTC (rev 242093)
+++ trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2019-02-26 18:37:09 UTC (rev 242094)
@@ -543,7 +543,6 @@
LOG_WITH_STREAM(ContentObservation, stream << "handleSyntheticClick: node(" << nodeRespondingToClick << ") " << location);
contentChangeObserver.startObservingContentChanges();
- contentChangeObserver.startObservingDOMTimerScheduling();
// FIXME: Pass caps lock state.
bool shiftKey = modifiers.contains(WebEvent::Modifier::ShiftKey);
@@ -553,7 +552,6 @@
mainframe.eventHandler().mouseMoved(PlatformMouseEvent(roundedAdjustedPoint, roundedAdjustedPoint, NoButton, PlatformEvent::MouseMoved, 0, shiftKey, ctrlKey, altKey, metaKey, WallTime::now(), WebCore::ForceAtClick, WebCore::NoTap));
mainframe.document()->updateStyleIfNeeded();
- contentChangeObserver.stopObservingDOMTimerScheduling();
contentChangeObserver.stopObservingContentChanges();
m_pendingSyntheticClickNode = nullptr;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
