Title: [248635] trunk/Source/WebCore
- Revision
- 248635
- Author
- [email protected]
- Date
- 2019-08-13 15:12:19 -0700 (Tue, 13 Aug 2019)
Log Message
[ContentChangeObserver] setShouldObserveDOMTimerScheduling and setShouldObserveTransitions are always called in pairs.
https://bugs.webkit.org/show_bug.cgi?id=200685
<rdar://problem/54269778>
Reviewed by Simon Fraser.
Let's merge these 2 functions.
* page/ios/ContentChangeObserver.cpp:
(WebCore::ContentChangeObserver::stopObservingPendingActivities):
(WebCore::ContentChangeObserver::adjustObservedState):
* page/ios/ContentChangeObserver.h:
(WebCore::ContentChangeObserver::isObservingDOMTimerScheduling const):
(WebCore::ContentChangeObserver::isObservingContentChanges const):
(WebCore::ContentChangeObserver::setShouldObserveDOMTimerSchedulingAndTransitions):
(WebCore::ContentChangeObserver::setShouldObserveDOMTimerScheduling): Deleted.
(WebCore::ContentChangeObserver::setShouldObserveTransitions): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (248634 => 248635)
--- trunk/Source/WebCore/ChangeLog 2019-08-13 21:00:49 UTC (rev 248634)
+++ trunk/Source/WebCore/ChangeLog 2019-08-13 22:12:19 UTC (rev 248635)
@@ -1,5 +1,25 @@
2019-08-13 Zalan Bujtas <[email protected]>
+ [ContentChangeObserver] setShouldObserveDOMTimerScheduling and setShouldObserveTransitions are always called in pairs.
+ https://bugs.webkit.org/show_bug.cgi?id=200685
+ <rdar://problem/54269778>
+
+ Reviewed by Simon Fraser.
+
+ Let's merge these 2 functions.
+
+ * page/ios/ContentChangeObserver.cpp:
+ (WebCore::ContentChangeObserver::stopObservingPendingActivities):
+ (WebCore::ContentChangeObserver::adjustObservedState):
+ * page/ios/ContentChangeObserver.h:
+ (WebCore::ContentChangeObserver::isObservingDOMTimerScheduling const):
+ (WebCore::ContentChangeObserver::isObservingContentChanges const):
+ (WebCore::ContentChangeObserver::setShouldObserveDOMTimerSchedulingAndTransitions):
+ (WebCore::ContentChangeObserver::setShouldObserveDOMTimerScheduling): Deleted.
+ (WebCore::ContentChangeObserver::setShouldObserveTransitions): Deleted.
+
+2019-08-13 Zalan Bujtas <[email protected]>
+
[ContentChangeObserver] Scope events in adjustObservedState
https://bugs.webkit.org/show_bug.cgi?id=200679
<rdar://problem/54266172>
Modified: trunk/Source/WebCore/page/ios/ContentChangeObserver.cpp (248634 => 248635)
--- trunk/Source/WebCore/page/ios/ContentChangeObserver.cpp 2019-08-13 21:00:49 UTC (rev 248634)
+++ trunk/Source/WebCore/page/ios/ContentChangeObserver.cpp 2019-08-13 22:12:19 UTC (rev 248635)
@@ -367,8 +367,7 @@
void ContentChangeObserver::stopObservingPendingActivities()
{
setShouldObserveNextStyleRecalc(false);
- setShouldObserveDOMTimerScheduling(false);
- setShouldObserveTransitions(false);
+ setShouldObserveDOMTimerSchedulingAndTransitions(false);
clearObservedDOMTimers();
clearObservedTransitions();
}
@@ -490,8 +489,7 @@
clearObservedTransitions();
setIsBetweenTouchEndAndMouseMoved(false);
setShouldObserveNextStyleRecalc(false);
- setShouldObserveDOMTimerScheduling(false);
- setShouldObserveTransitions(false);
+ setShouldObserveDOMTimerSchedulingAndTransitions(false);
ASSERT(!m_isInObservedStyleRecalc);
ASSERT(!m_observedDomTimerIsBeingExecuted);
};
@@ -524,13 +522,11 @@
{
if (event == Event::StartedTouchStartEventDispatching) {
resetToStartObserving();
- setShouldObserveDOMTimerScheduling(true);
- setShouldObserveTransitions(true);
+ setShouldObserveDOMTimerSchedulingAndTransitions(true);
return;
}
if (event == Event::EndedTouchStartEventDispatching) {
- setShouldObserveDOMTimerScheduling(false);
- setShouldObserveTransitions(false);
+ setShouldObserveDOMTimerSchedulingAndTransitions(false);
setIsBetweenTouchEndAndMouseMoved(true);
return;
}
@@ -539,13 +535,11 @@
if (!isBetweenTouchEndAndMouseMoved())
resetToStartObserving();
setIsBetweenTouchEndAndMouseMoved(false);
- setShouldObserveDOMTimerScheduling(!hasVisibleChangeState());
- setShouldObserveTransitions(!hasVisibleChangeState());
+ setShouldObserveDOMTimerSchedulingAndTransitions(!hasVisibleChangeState());
return;
}
if (event == Event::EndedMouseMovedEventDispatching) {
- setShouldObserveDOMTimerScheduling(false);
- setShouldObserveTransitions(false);
+ setShouldObserveDOMTimerSchedulingAndTransitions(false);
return;
}
}
Modified: trunk/Source/WebCore/page/ios/ContentChangeObserver.h (248634 => 248635)
--- trunk/Source/WebCore/page/ios/ContentChangeObserver.h 2019-08-13 21:00:49 UTC (rev 248634)
+++ trunk/Source/WebCore/page/ios/ContentChangeObserver.h 2019-08-13 22:12:19 UTC (rev 248635)
@@ -137,9 +137,8 @@
void contentVisibilityDidChange();
- void setShouldObserveDOMTimerScheduling(bool observe) { m_isObservingDOMTimerScheduling = observe; }
+ void setShouldObserveDOMTimerSchedulingAndTransitions(bool);
bool isObservingDOMTimerScheduling() const { return m_isObservingDOMTimerScheduling; }
- void setShouldObserveTransitions(bool observe) { m_isObservingTransitions = observe; }
bool isObservingTransitions() const { return m_isObservingTransitions; }
bool isObservedPropertyForTransition(CSSPropertyID propertyId) const { return propertyId == CSSPropertyLeft || propertyId == CSSPropertyOpacity; }
void domTimerExecuteDidStart(const DOMTimer&);
@@ -231,7 +230,13 @@
|| m_observedDomTimerIsBeingExecuted
|| m_isInObservedStyleRecalc
|| m_contentObservationTimer.isActive();
- }
}
+inline void ContentChangeObserver::setShouldObserveDOMTimerSchedulingAndTransitions(bool observe)
+{
+ m_isObservingDOMTimerScheduling = observe;
+ m_isObservingTransitions = observe;
+}
+
+}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
