Changeset 233945 in webkit

Timestamp:

Jul 18, 2018 6:19:40 PM (6 years ago)

Author:

Ricky Mondello

Message:

Let clients override _WKThumbnailView's background color

​https://bugs.webkit.org/show_bug.cgi?id=187788

Reviewed by Tim Horton.

• UIProcess/API/Cocoa/_WKThumbnailView.h: Declare a property.
• UIProcess/API/Cocoa/_WKThumbnailView.mm: Define an ivar.

(-[_WKThumbnailView updateLayer]): Consult the background color.
(-[_WKThumbnailView setOverrideBackgroundColor:]): Notably, call -updateLayer.
(-[_WKThumbnailView overrideBackgroundColor]): Added.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/_WKThumbnailView.h (modified) (1 diff)
• UIProcess/API/Cocoa/_WKThumbnailView.mm (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-07-18  Ricky Mondello  <rmondello@apple.com>
+
+        Let clients override _WKThumbnailView's background color
+
+        https://bugs.webkit.org/show_bug.cgi?id=187788
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/Cocoa/_WKThumbnailView.h: Declare a property.
+        * UIProcess/API/Cocoa/_WKThumbnailView.mm: Define an ivar.
+        (-[_WKThumbnailView updateLayer]): Consult the background color.
+        (-[_WKThumbnailView setOverrideBackgroundColor:]): Notably, call -updateLayer.
+        (-[_WKThumbnailView overrideBackgroundColor]): Added.
+
 2018-07-18  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/_WKThumbnailView.h

@@ -49 +49 @@
 @property (nonatomic) BOOL shouldKeepSnapshotWhenRemovedFromSuperview;
 
+@property (strong, nonatomic) NSColor *overrideBackgroundColor;
+
 // This should be removed when all clients go away; it is always YES now.
 @property (nonatomic) BOOL usesSnapshot;

trunk/Source/WebKit/UIProcess/API/Cocoa/_WKThumbnailView.mm

@@ -58 +58 @@
     CGFloat _lastSnapshotScale;
     CGSize _lastSnapshotMaximumSize;
+
+    RetainPtr<NSColor *> _overrideBackgroundColor;
 }
 
@@ -112 +114 @@
     [super updateLayer];
 
-    self.layer.backgroundColor = [NSColor quaternaryLabelColor].CGColor;
+    NSColor *backgroundColor = self.overrideBackgroundColor ?: [NSColor quaternaryLabelColor];
+    self.layer.backgroundColor = backgroundColor.CGColor;
 }
 
@@ -146 +149 @@
         [thumbnailView _didTakeSnapshot:cgImage.get()];
     });
+}
+
+- (void)setOverrideBackgroundColor:(NSColor *)overrideBackgroundColor
+{
+    if ([_overrideBackgroundColor isEqual:overrideBackgroundColor])
+        return;
+
+    _overrideBackgroundColor = overrideBackgroundColor;
+    [self setNeedsDisplay:YES];
+}
+
+- (NSColor *)overrideBackgroundColor
+{
+    return _overrideBackgroundColor.get();
 }