Title: [233338] trunk/Source/WebCore
- Revision
- 233338
- Author
- [email protected]
- Date
- 2018-06-28 16:23:32 -0700 (Thu, 28 Jun 2018)
Log Message
Don't force black text when TextIndicator draws backgrounds or all content.
https://bugs.webkit.org/show_bug.cgi?id=187161
rdar://problem/40434644
Reviewed by Tim Horton.
* page/TextIndicator.cpp:
(WebCore::snapshotOptionsForTextIndicatorOptions):
Only set SnapshotOptionsForceBlackText when TextIndicatorOptionRespectTextColor and
TextIndicatorOptionPaintBackgrounds are not set.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (233337 => 233338)
--- trunk/Source/WebCore/ChangeLog 2018-06-28 23:01:48 UTC (rev 233337)
+++ trunk/Source/WebCore/ChangeLog 2018-06-28 23:23:32 UTC (rev 233338)
@@ -1,5 +1,18 @@
2018-06-28 Timothy Hatcher <[email protected]>
+ Don't force black text when TextIndicator draws backgrounds or all content.
+ https://bugs.webkit.org/show_bug.cgi?id=187161
+ rdar://problem/40434644
+
+ Reviewed by Tim Horton.
+
+ * page/TextIndicator.cpp:
+ (WebCore::snapshotOptionsForTextIndicatorOptions):
+ Only set SnapshotOptionsForceBlackText when TextIndicatorOptionRespectTextColor and
+ TextIndicatorOptionPaintBackgrounds are not set.
+
+2018-06-28 Timothy Hatcher <[email protected]>
+
Find on page selection color isn't adapted for dark mode.
https://bugs.webkit.org/show_bug.cgi?id=187072
Modified: trunk/Source/WebCore/page/TextIndicator.cpp (233337 => 233338)
--- trunk/Source/WebCore/page/TextIndicator.cpp 2018-06-28 23:01:48 UTC (rev 233337)
+++ trunk/Source/WebCore/page/TextIndicator.cpp 2018-06-28 23:23:32 UTC (rev 233338)
@@ -134,14 +134,16 @@
static SnapshotOptions snapshotOptionsForTextIndicatorOptions(TextIndicatorOptions options)
{
SnapshotOptions snapshotOptions = SnapshotOptionsNone;
- if (!(options & TextIndicatorOptionRespectTextColor))
- snapshotOptions |= SnapshotOptionsForceBlackText;
if (!(options & TextIndicatorOptionPaintAllContent)) {
if (options & TextIndicatorOptionPaintBackgrounds)
snapshotOptions |= SnapshotOptionsPaintSelectionAndBackgroundsOnly;
- else
+ else {
snapshotOptions |= SnapshotOptionsPaintSelectionOnly;
+
+ if (!(options & TextIndicatorOptionRespectTextColor))
+ snapshotOptions |= SnapshotOptionsForceBlackText;
+ }
} else
snapshotOptions |= SnapshotOptionsExcludeSelectionHighlighting;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
