Title: [267677] branches/safari-610-branch/Source
- Revision
- 267677
- Author
- [email protected]
- Date
- 2020-09-27 13:00:25 -0700 (Sun, 27 Sep 2020)
Log Message
Cherry-pick r267215. rdar://problem/69594225
Per-app accent color overrides are broken
https://bugs.webkit.org/show_bug.cgi?id=216674
<rdar://problem/67745464>
Reviewed by Wenson Hsieh.
Source/WebCore/PAL:
* pal/spi/mac/NSApplicationSPI.h:
Source/WebKit:
No new tests; I've no idea how to write a test that would have caught this;
any test I can imagine would have also written to _accentColor and worked fine.
* UIProcess/mac/PageClientImplMac.mm:
(WebKit::PageClientImpl::accentColor):
AppKit changed the meaning of the IPI. Use the correct version.
We still write to _accentColor; it is now purely an override.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@267215 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610-branch/Source/WebCore/PAL/ChangeLog (267676 => 267677)
--- branches/safari-610-branch/Source/WebCore/PAL/ChangeLog 2020-09-27 20:00:23 UTC (rev 267676)
+++ branches/safari-610-branch/Source/WebCore/PAL/ChangeLog 2020-09-27 20:00:25 UTC (rev 267677)
@@ -1,3 +1,40 @@
+2020-09-27 Alan Coon <[email protected]>
+
+ Cherry-pick r267215. rdar://problem/69594225
+
+ Per-app accent color overrides are broken
+ https://bugs.webkit.org/show_bug.cgi?id=216674
+ <rdar://problem/67745464>
+
+ Reviewed by Wenson Hsieh.
+
+ Source/WebCore/PAL:
+
+ * pal/spi/mac/NSApplicationSPI.h:
+
+ Source/WebKit:
+
+ No new tests; I've no idea how to write a test that would have caught this;
+ any test I can imagine would have also written to _accentColor and worked fine.
+
+ * UIProcess/mac/PageClientImplMac.mm:
+ (WebKit::PageClientImpl::accentColor):
+ AppKit changed the meaning of the IPI. Use the correct version.
+ We still write to _accentColor; it is now purely an override.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@267215 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-09-17 Tim Horton <[email protected]>
+
+ Per-app accent color overrides are broken
+ https://bugs.webkit.org/show_bug.cgi?id=216674
+ <rdar://problem/67745464>
+
+ Reviewed by Wenson Hsieh.
+
+ * pal/spi/mac/NSApplicationSPI.h:
+
2020-09-14 Alan Coon <[email protected]>
Cherry-pick r266932. rdar://problem/68881008
Modified: branches/safari-610-branch/Source/WebCore/PAL/pal/spi/mac/NSApplicationSPI.h (267676 => 267677)
--- branches/safari-610-branch/Source/WebCore/PAL/pal/spi/mac/NSApplicationSPI.h 2020-09-27 20:00:23 UTC (rev 267676)
+++ branches/safari-610-branch/Source/WebCore/PAL/pal/spi/mac/NSApplicationSPI.h 2020-09-27 20:00:25 UTC (rev 267677)
@@ -37,6 +37,7 @@
// Conditionally define this only for !USE_APPLE_INTERNAL_SDK when <rdar://problem/63864711> is fixed.
@property (copy, setter=_setAccentColor:) NSColor *_accentColor;
+@property (readonly, copy) NSColor *_effectiveAccentColor;
@end
Modified: branches/safari-610-branch/Source/WebKit/ChangeLog (267676 => 267677)
--- branches/safari-610-branch/Source/WebKit/ChangeLog 2020-09-27 20:00:23 UTC (rev 267676)
+++ branches/safari-610-branch/Source/WebKit/ChangeLog 2020-09-27 20:00:25 UTC (rev 267677)
@@ -1,5 +1,48 @@
2020-09-27 Alan Coon <[email protected]>
+ Cherry-pick r267215. rdar://problem/69594225
+
+ Per-app accent color overrides are broken
+ https://bugs.webkit.org/show_bug.cgi?id=216674
+ <rdar://problem/67745464>
+
+ Reviewed by Wenson Hsieh.
+
+ Source/WebCore/PAL:
+
+ * pal/spi/mac/NSApplicationSPI.h:
+
+ Source/WebKit:
+
+ No new tests; I've no idea how to write a test that would have caught this;
+ any test I can imagine would have also written to _accentColor and worked fine.
+
+ * UIProcess/mac/PageClientImplMac.mm:
+ (WebKit::PageClientImpl::accentColor):
+ AppKit changed the meaning of the IPI. Use the correct version.
+ We still write to _accentColor; it is now purely an override.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@267215 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-09-17 Tim Horton <[email protected]>
+
+ Per-app accent color overrides are broken
+ https://bugs.webkit.org/show_bug.cgi?id=216674
+ <rdar://problem/67745464>
+
+ Reviewed by Wenson Hsieh.
+
+ No new tests; I've no idea how to write a test that would have caught this;
+ any test I can imagine would have also written to _accentColor and worked fine.
+
+ * UIProcess/mac/PageClientImplMac.mm:
+ (WebKit::PageClientImpl::accentColor):
+ AppKit changed the meaning of the IPI. Use the correct version.
+ We still write to _accentColor; it is now purely an override.
+
+2020-09-27 Alan Coon <[email protected]>
+
Cherry-pick r267092. rdar://problem/69594199
REGRESSION (r267002): ASSERTION FAILED:[ iOS wk2 Debug ] !HashTranslator::equal(KeyTraits::emptyValue(), key) on compositing/ios/overflow-scroll-update-overlap.html
Modified: branches/safari-610-branch/Source/WebKit/UIProcess/mac/PageClientImplMac.mm (267676 => 267677)
--- branches/safari-610-branch/Source/WebKit/UIProcess/mac/PageClientImplMac.mm 2020-09-27 20:00:23 UTC (rev 267676)
+++ branches/safari-610-branch/Source/WebKit/UIProcess/mac/PageClientImplMac.mm 2020-09-27 20:00:25 UTC (rev 267677)
@@ -941,7 +941,7 @@
#if HAVE(APP_ACCENT_COLORS)
WebCore::Color PageClientImpl::accentColor()
{
- return WebCore::colorFromNSColor([NSApp _accentColor]);
+ return WebCore::colorFromNSColor([NSApp _effectiveAccentColor]);
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
