Changeset 246327 in webkit

Timestamp:

Jun 11, 2019, 12:02:31 PM (7 years ago)

Author:

Simon Fraser

Message:

Add logging for UI-side compositing hit-testing
​https://bugs.webkit.org/show_bug.cgi?id=198739

Reviewed by Antti Koivisto.

Source/WebCore:

Export the TextStream output operator.

• platform/TouchAction.h:

Source/WebKit:

Make it easier to debug UI-side compositing hit-testing issues with a UIHitTesting log
channel, which logs information about the UIView hierarchy, which views are found by
hit-testing, and what touch-actions apply.

This log channel can be set by passing the argument '-WebKit2Logging "UIHitTesting"' when
launching a debug iOS MobileSafari instance.

• Platform/Logging.h:
• UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm:

(-[UIView _web_findDescendantViewAtPoint:withEvent:]):

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView hitTest:withEvent:]):
(-[WKContentView _handleTouchActionsForTouchEvent:]):

Source/WTF:

Make it possible to output an Objective-C object to TextStream, which will
log its -description.

Also add a template for OptionSet<> printing.

• WTF.xcodeproj/project.pbxproj:
• wtf/text/TextStream.h:

(WTF::operator<<):

• wtf/text/cocoa/TextStreamCocoa.mm: Added.

(WTF::TextStream::operator<<):

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/WTF.xcodeproj/project.pbxproj (modified) (4 diffs)
• WTF/wtf/text/TextStream.h (modified) (2 diffs)
• WTF/wtf/text/cocoa/TextStreamCocoa.mm (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/TouchAction.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Platform/Logging.h (modified) (1 diff)
• WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm (modified) (3 diffs)
• WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-06-10  Simon Fraser  <simon.fraser@apple.com>
+
+        Add logging for UI-side compositing hit-testing
+        https://bugs.webkit.org/show_bug.cgi?id=198739
+
+        Reviewed by Antti Koivisto.
+
+        Make it possible to output an Objective-C object to TextStream, which will
+        log its -description.
+
+        Also add a template for OptionSet<> printing.
+
+        * WTF.xcodeproj/project.pbxproj:
+        * wtf/text/TextStream.h:
+        (WTF::operator<<):
+        * wtf/text/cocoa/TextStreamCocoa.mm: Added.
+        (WTF::TextStream::operator<<):
+
 2019-06-11  Saam Barati  <sbarati@apple.com>
 

trunk/Source/WTF/WTF.xcodeproj/project.pbxproj

@@ -24 +24 @@
                 0F30BA901E78708E002CA847 /* GlobalVersion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F30BA8A1E78708E002CA847 /* GlobalVersion.cpp */; };
                 0F30CB5A1FCDF134004B5323 /* ConcurrentPtrHashSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F30CB581FCDF133004B5323 /* ConcurrentPtrHashSet.cpp */; };
+                0F3492D722AF431C004F85FC /* TextStreamCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F3492D622AF42F1004F85FC /* TextStreamCocoa.mm */; };
                 0F43D8F11DB5ADDC00108FB6 /* AutomaticThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F43D8EF1DB5ADDC00108FB6 /* AutomaticThread.cpp */; };
                 0F5BF1761F23D49A0029D91D /* Gigacage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F5BF1741F23D49A0029D91D /* Gigacage.cpp */; };
@@ -203 +204 @@
                 0F30CB591FCDF133004B5323 /* ConcurrentPtrHashSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConcurrentPtrHashSet.h; sourceTree = "<group>"; };
                 0F31DD701F1308BC0072EB4A /* LockAlgorithmInlines.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LockAlgorithmInlines.h; sourceTree = "<group>"; };
+                0F3492D622AF42F1004F85FC /* TextStreamCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = TextStreamCocoa.mm; sourceTree = "<group>"; };
                 0F3501631BB258C800F0A2A3 /* WeakRandom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeakRandom.h; sourceTree = "<group>"; };
                 0F43D8EF1DB5ADDC00108FB6 /* AutomaticThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AutomaticThread.cpp; sourceTree = "<group>"; };
@@ -832 +834 @@
                                 93934BD218A1E8C300D0D6A1 /* StringViewCocoa.mm */,
                                 1C181C951D30800A00F5FA16 /* TextBreakIteratorInternalICUCocoa.cpp */,
+                                0F3492D622AF42F1004F85FC /* TextStreamCocoa.mm */,
                         );
                         path = cocoa;
@@ -1621 +1624 @@
                                 1C181C961D30800A00F5FA16 /* TextBreakIteratorInternalICUCocoa.cpp in Sources */,
                                 A3E4DD931F3A803400DED0B4 /* TextStream.cpp in Sources */,
+                                0F3492D722AF431C004F85FC /* TextStreamCocoa.mm in Sources */,
                                 E311FB171F0A568B003C08DE /* ThreadGroup.cpp in Sources */,
                                 A8A4744A151A825B004123FF /* Threading.cpp in Sources */,

trunk/Source/WTF/wtf/text/TextStream.h

@@ -71 +71 @@
     WTF_EXPORT_PRIVATE TextStream& operator<<(const FormatNumberRespectingIntegers&);
 
+#ifdef __OBJC__
+    WTF_EXPORT_PRIVATE TextStream& operator<<(id<NSObject>);
+#endif
+
     FormattingFlags formattingFlags() const { return m_formattingFlags; }
     void setFormattingFlags(FormattingFlags flags) { m_formattingFlags = flags; }
@@ -181 +185 @@
 }
 
+template<typename Option>
+TextStream& operator<<(TextStream& ts, const OptionSet<Option>& options)
+{
+    ts << "[";
+    bool needComma = false;
+    for (auto option : options) {
+        if (needComma)
+            ts << ", ";
+        needComma = true;
+        ts << option;
+    }
+    return ts << "]";
+}
+
 // Deprecated. Use TextStream::writeIndent() instead.
 WTF_EXPORT_PRIVATE void writeIndent(TextStream&, int indent);

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-10  Simon Fraser  <simon.fraser@apple.com>
+
+        Add logging for UI-side compositing hit-testing
+        https://bugs.webkit.org/show_bug.cgi?id=198739
+
+        Reviewed by Antti Koivisto.
+
+        Export the TextStream output operator.
+
+        * platform/TouchAction.h:
+
 2019-06-11  Greg Doolittle  <gr3g@apple.com>
 

trunk/Source/WebCore/platform/TouchAction.h

@@ -41 +41 @@
 };
 
-TextStream& operator<<(TextStream&, TouchAction);
+WEBCORE_EXPORT TextStream& operator<<(TextStream&, TouchAction);
 
 }

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-06-10  Simon Fraser  <simon.fraser@apple.com>
+
+        Add logging for UI-side compositing hit-testing
+        https://bugs.webkit.org/show_bug.cgi?id=198739
+
+        Reviewed by Antti Koivisto.
+
+        Make it easier to debug UI-side compositing hit-testing issues with a UIHitTesting log
+        channel, which logs information about the UIView hierarchy, which views are found by
+        hit-testing, and what touch-actions apply.
+
+        This log channel can be set by passing the argument '-WebKit2Logging "UIHitTesting"' when
+        launching a debug iOS MobileSafari instance.
+
+        * Platform/Logging.h:
+        * UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm:
+        (-[UIView _web_findDescendantViewAtPoint:withEvent:]):
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView hitTest:withEvent:]):
+        (-[WKContentView _handleTouchActionsForTouchEvent:]):
+
 2019-06-11  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebKit/Platform/Logging.h

@@ -85 +85 @@
     M(StorageAPI) \
     M(TextInput) \
+    M(UIHitTesting) \
     M(ViewGestures) \
     M(ViewState) \

trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm

@@ -29 +29 @@
 #if PLATFORM(IOS_FAMILY)
 
+#import "Logging.h"
 #import "RemoteLayerTreeHost.h"
 #import "RemoteLayerTreeNode.h"
@@ -137 +138 @@
     WebKit::collectDescendantViewsAtPoint(viewsAtPoint, self, point, event);
 
+    LOG_WITH_STREAM(UIHitTesting, stream << (void*)self << "_web_findDescendantViewAtPoint " << WebCore::FloatPoint(point) << " found " << viewsAtPoint.size() << " views");
+
     for (auto *view : WTF::makeReversedRange(viewsAtPoint)) {
         if ([view conformsToProtocol:@protocol(WKNativelyInteractible)]) {
+            LOG_WITH_STREAM(UIHitTesting, stream << " " << (void*)view << " is natively interactible");
             CGPoint subviewPoint = [view convertPoint:point fromView:self];
             return [view hitTest:subviewPoint withEvent:event];
@@ -144 +148 @@
 
         if ([view isKindOfClass:[WKChildScrollView class]]) {
-            if (WebKit::isScrolledBy((WKChildScrollView *)view, viewsAtPoint.last()))
+            if (WebKit::isScrolledBy((WKChildScrollView *)view, viewsAtPoint.last())) {
+                LOG_WITH_STREAM(UIHitTesting, stream << " " << (void*)view << " is child scroll view and scrolled by " << (void*)viewsAtPoint.last());
                 return view;
-        }
-    }
+            }
+        }
+
+        LOG_WITH_STREAM(UIHitTesting, stream << " ignoring " << [view class] << " " << (void*)view);
+    }
+
+    LOG_WITH_STREAM(UIHitTesting, stream << (void*)self << "_web_findDescendantViewAtPoint found no interactive views");
     return nil;
 }

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -1078 +1078 @@
     for (UIView *subView in [_interactionViewsContainerView.get() subviews]) {
         UIView *hitView = [subView hitTest:[subView convertPoint:point fromView:self] withEvent:event];
-        if (hitView)
+        if (hitView) {
+            LOG_WITH_STREAM(UIHitTesting, stream << self << "hitTest at " << WebCore::FloatPoint(point) << " found interaction view " << hitView);
             return hitView;
-    }
-    return [super hitTest:point withEvent:event];
+        }
+    }
+
+    LOG_WITH_STREAM(UIHitTesting, stream << "hit-testing WKContentView subviews " << [[self recursiveDescription] UTF8String]);
+    UIView* hitView = [super hitTest:point withEvent:event];
+    LOG_WITH_STREAM(UIHitTesting, stream << " found view " << [hitView class] << " " << (void*)hitView);
+    return hitView;
 }
 
@@ -1349 +1355 @@
         if (phase == WebKit::WebPlatformTouchPoint::TouchPressed) {
             auto touchActions = WebKit::touchActionsForPoint(self, touchPoint.location());
+            LOG_WITH_STREAM(UIHitTesting, stream << "touchActionsForPoint " << touchPoint.location() << " found " << touchActions);
             if (!touchActions || touchActions.containsAny({ WebCore::TouchAction::Auto, WebCore::TouchAction::Manipulation }))
                 continue;
+
             scrollingCoordinator->setTouchActionsForTouchIdentifier(touchActions, touchPoint.identifier());