Changeset 261314 in webkit
- Timestamp:
- May 7, 2020 11:01:01 AM (4 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r261304 r261314 1 2020-05-07 Antti Koivisto <antti@apple.com> 2 3 [Wheel event region] Include listeners on Window 4 https://bugs.webkit.org/show_bug.cgi?id=211577 5 6 Reviewed by Simon Fraser. 7 8 * fast/scrolling/mac/wheel-event-listener-region-window-expected.txt: Added. 9 * fast/scrolling/mac/wheel-event-listener-region-window.html: Added. 10 1 11 2020-05-07 Chris Dumez <cdumez@apple.com> 2 12 -
trunk/Source/WebCore/ChangeLog
r261306 r261314 1 2020-05-07 Antti Koivisto <antti@apple.com> 2 3 [Wheel event region] Include listeners on Window 4 https://bugs.webkit.org/show_bug.cgi?id=211577 5 6 Reviewed by Simon Fraser. 7 8 Test: fast/scrolling/mac/wheel-event-listener-region-window.html 9 10 * dom/EventTarget.h: 11 * dom/Node.h: 12 * style/StyleAdjuster.cpp: 13 (WebCore::Style::Adjuster::computeEventListenerRegionTypes): 14 15 Take EventTarget so this can be used with DOMWindow. 16 17 * style/StyleAdjuster.h: 18 * style/StyleResolveForDocument.cpp: 19 (WebCore::Style::resolveForDocument): 20 1 21 2020-05-07 Simon Fraser <simon.fraser@apple.com> 2 22 -
trunk/Source/WebCore/dom/EventTarget.h
r260243 r261314 117 117 void invalidateJSEventListeners(JSC::JSObject*); 118 118 119 const EventTargetData* eventTargetData() const; 120 119 121 protected: 120 122 virtual ~EventTarget() = default; … … 123 125 virtual EventTargetData* eventTargetDataConcurrently() = 0; 124 126 virtual EventTargetData& ensureEventTargetData() = 0; 125 const EventTargetData* eventTargetData() const;126 127 127 128 virtual void eventListenersDidChange() { } -
trunk/Source/WebCore/dom/Node.h
r261279 r261314 483 483 #endif 484 484 485 using EventTarget::eventTargetData;486 485 EventTargetData* eventTargetData() final; 487 486 EventTargetData* eventTargetDataConcurrently() final; -
trunk/Source/WebCore/style/StyleAdjuster.cpp
r261297 r261314 194 194 } 195 195 196 OptionSet<EventListenerRegionType> Adjuster::computeEventListenerRegionTypes(const Node& node, OptionSet<EventListenerRegionType> parentTypes)196 OptionSet<EventListenerRegionType> Adjuster::computeEventListenerRegionTypes(const EventTarget& eventTarget, OptionSet<EventListenerRegionType> parentTypes) 197 197 { 198 198 #if !PLATFORM(IOS_FAMILY) 199 if (! node.hasEventListeners())199 if (!eventTarget.hasEventListeners()) 200 200 return parentTypes; 201 201 … … 203 203 204 204 auto findListeners = [&](auto& eventName, auto type, auto nonPassiveType) { 205 auto* eventListenerVector = node.eventTargetData()->eventListenerMap.find(eventName);205 auto* eventListenerVector = eventTarget.eventTargetData()->eventListenerMap.find(eventName); 206 206 if (!eventListenerVector) 207 207 return; … … 226 226 return types; 227 227 #else 228 UNUSED_PARAM( node);228 UNUSED_PARAM(eventTarget); 229 229 UNUSED_PARAM(parentTypes); 230 230 return { }; -
trunk/Source/WebCore/style/StyleAdjuster.h
r261297 r261314 49 49 static void adjustAnimatedStyle(RenderStyle&, const RenderStyle* parentBoxStyle, OptionSet<AnimationImpact>); 50 50 51 static OptionSet<EventListenerRegionType> computeEventListenerRegionTypes(const Node&, OptionSet<EventListenerRegionType>);51 static OptionSet<EventListenerRegionType> computeEventListenerRegionTypes(const EventTarget&, OptionSet<EventListenerRegionType>); 52 52 53 53 #if ENABLE(TEXT_AUTOSIZING) -
trunk/Source/WebCore/style/StyleResolveForDocument.cpp
r261297 r261314 31 31 32 32 #include "CSSFontSelector.h" 33 #include "DOMWindow.h" 33 34 #include "Document.h" 34 35 #include "FontCascade.h" … … 74 75 #endif 75 76 76 documentStyle.setEventListenerRegionTypes(Adjuster::computeEventListenerRegionTypes(document, { })); 77 auto regionTypes = Adjuster::computeEventListenerRegionTypes(document, { }); 78 if (auto* window = document.domWindow()) 79 regionTypes.add(Adjuster::computeEventListenerRegionTypes(*window, { })); 80 81 documentStyle.setEventListenerRegionTypes(regionTypes); 77 82 78 83 Element* docElement = document.documentElement();
Note: See TracChangeset
for help on using the changeset viewer.