Changeset 283356 in webkit

Timestamp:

Sep 30, 2021, 8:24:27 PM (5 years ago)

Author:

weinig@apple.com

Message:

Add dumping for UIViews with separated layers
​https://bugs.webkit.org/show_bug.cgi?id=231056

Reviewed by Tim Horton.

• UIProcess/API/ios/WKWebViewTestingIOS.mm:

(allowListedClassToString):
Fix typo from previous patch where a comma was missed
and remove unnecessary assertion.

(dumpUIView):
Use the new dumpSeparatedLayerProperties when separated layers
are present.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/ios/WKWebViewTestingIOS.mm (modified) (5 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-09-30  Sam Weinig  <weinig@apple.com>
+
+        Add dumping for UIViews with separated layers
+        https://bugs.webkit.org/show_bug.cgi?id=231056
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/ios/WKWebViewTestingIOS.mm:
+        (allowListedClassToString):
+        Fix typo from previous patch where a comma was missed
+        and remove unnecessary assertion.
+
+        (dumpUIView):
+        Use the new dumpSeparatedLayerProperties when separated layers
+        are present.
+
 2021-09-30  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit/UIProcess/API/ios/WKWebViewTestingIOS.mm

@@ -1 +1 @@
 /*
- * Copyright (C) 2014-2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2021 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45 +45 @@
 #import <wtf/text/TextStream.h>
 
+#if HAVE(CORE_ANIMATION_SEPARATED_LAYERS)
+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/SeparatedLayerAdditions.h>
+#else
+static void dumpSeparatedLayerProperties(TextStream&, CALayer *) { }
+#endif
+#endif
+
 @implementation WKWebView (WKTestingIOS)
 
@@ -235 +243 @@
         "WKRemoteView",
         "WKScrollView",
-        "WKSeparatedModelView"
+        "WKSeparatedModelView",
         "WKShapeView",
         "WKSimpleBackdropView",
@@ -248 +256 @@
     if (allowedClasses.contains(classString))
         return classString;
-    
-    ASSERT(classString != "WKCompositingView");
+
     return makeString("<class not in allowed list of classes>");
 }
@@ -279 +286 @@
     if (view.layer.anchorPointZ != 0)
         ts.dumpProperty("layer anchorPointZ", makeString(view.layer.anchorPointZ));
+
+#if HAVE(CORE_ANIMATION_SEPARATED_LAYERS)
+    if (view.layer.separated) {
+        TextStream::GroupScope scope(ts);
+        ts << "separated";
+        dumpSeparatedLayerProperties(ts, view.layer);
+    }
+#endif
 
     if (view.subviews.count > 0) {