Title: [271370] branches/safari-611-branch/Source/WebCore
- Revision
- 271370
- Author
- [email protected]
- Date
- 2021-01-11 11:52:57 -0800 (Mon, 11 Jan 2021)
Log Message
Cherry-pick r271364. rdar://problem/73001152
[LFC][Integration] Factor marked text style collection code out of InlineTextBox
https://bugs.webkit.org/show_bug.cgi?id=220249
<rdar://problem/72976067>
Unreviewed build fix after 271350.
* rendering/MarkedTextStyle.cpp:
(WebCore::resolveStyleForMarkedText):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@271364 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-611-branch/Source/WebCore/ChangeLog (271369 => 271370)
--- branches/safari-611-branch/Source/WebCore/ChangeLog 2021-01-11 19:26:55 UTC (rev 271369)
+++ branches/safari-611-branch/Source/WebCore/ChangeLog 2021-01-11 19:52:57 UTC (rev 271370)
@@ -1,3 +1,31 @@
+2021-01-11 Russell Epstein <[email protected]>
+
+ Cherry-pick r271364. rdar://problem/73001152
+
+ [LFC][Integration] Factor marked text style collection code out of InlineTextBox
+ https://bugs.webkit.org/show_bug.cgi?id=220249
+ <rdar://problem/72976067>
+
+ Unreviewed build fix after 271350.
+
+ * rendering/MarkedTextStyle.cpp:
+ (WebCore::resolveStyleForMarkedText):
+
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@271364 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-01-11 Antti Koivisto <[email protected]>
+
+ [LFC][Integration] Factor marked text style collection code out of InlineTextBox
+ https://bugs.webkit.org/show_bug.cgi?id=220249
+ <rdar://problem/72976067>
+
+ Unreviewed build fix after 271350.
+
+ * rendering/MarkedTextStyle.cpp:
+ (WebCore::resolveStyleForMarkedText):
+
2021-01-11 Kimmo Kinnunen <[email protected]>
WebKit::IPC::Encoder needs definitions of all custom enum values at the Encoder definition time
Modified: branches/safari-611-branch/Source/WebCore/rendering/MarkedTextStyle.cpp (271369 => 271370)
--- branches/safari-611-branch/Source/WebCore/rendering/MarkedTextStyle.cpp 2021-01-11 19:26:55 UTC (rev 271369)
+++ branches/safari-611-branch/Source/WebCore/rendering/MarkedTextStyle.cpp 2021-01-11 19:52:57 UTC (rev 271370)
@@ -74,7 +74,7 @@
#if ENABLE(APP_HIGHLIGHTS)
case MarkedText::AppHighlight: {
OptionSet<StyleColor::Options> styleColorOptions = { StyleColor::Options::UseSystemAppearance };
- style.backgroundColor = renderer().theme().appHighlightColor(styleColorOptions);
+ style.backgroundColor = renderer.theme().appHighlightColor(styleColorOptions);
break;
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
