Title: [283356] trunk/Source/WebKit
- Revision
- 283356
- Author
- wei...@apple.com
- Date
- 2021-09-30 20:24:27 -0700 (Thu, 30 Sep 2021)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (283355 => 283356)
--- trunk/Source/WebKit/ChangeLog 2021-10-01 01:30:29 UTC (rev 283355)
+++ trunk/Source/WebKit/ChangeLog 2021-10-01 03:24:27 UTC (rev 283356)
@@ -1,3 +1,19 @@
+2021-09-30 Sam Weinig <wei...@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.fra...@apple.com>
Simplify some scrolling-related code in WebKit with use of RectEdges<bool>
Modified: trunk/Source/WebKit/UIProcess/API/ios/WKWebViewTestingIOS.mm (283355 => 283356)
--- trunk/Source/WebKit/UIProcess/API/ios/WKWebViewTestingIOS.mm 2021-10-01 01:30:29 UTC (rev 283355)
+++ trunk/Source/WebKit/UIProcess/API/ios/WKWebViewTestingIOS.mm 2021-10-01 03:24:27 UTC (rev 283356)
@@ -1,5 +1,5 @@
/*
- * 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
* modification, are permitted provided that the following conditions
@@ -44,6 +44,14 @@
#import <wtf/SortedArrayMap.h>
#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)
- (void)_requestTextInputContextsInRect:(CGRect)rect completionHandler:(void (^)(NSArray<_WKTextInputContext *> *))completionHandler
@@ -234,7 +242,7 @@
"WKModelView",
"WKRemoteView",
"WKScrollView",
- "WKSeparatedModelView"
+ "WKSeparatedModelView",
"WKShapeView",
"WKSimpleBackdropView",
"WKTransformView",
@@ -247,8 +255,7 @@
String classString { NSStringFromClass(view.class) };
if (allowedClasses.contains(classString))
return classString;
-
- ASSERT(classString != "WKCompositingView");
+
return makeString("<class not in allowed list of classes>");
}
@@ -279,6 +286,14 @@
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) {
TextStream::GroupScope scope(ts);
ts << "subviews";
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
