Title: [233952] branches/safari-606-branch/Source/WebCore
- Revision
- 233952
- Author
- [email protected]
- Date
- 2018-07-18 18:59:42 -0700 (Wed, 18 Jul 2018)
Log Message
Cherry-pick r233870. rdar://problem/42344023
Unreviewed attempt to fix the build.
* rendering/RenderThemeMac.mm:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@233870 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-606-branch/Source/WebCore/ChangeLog (233951 => 233952)
--- branches/safari-606-branch/Source/WebCore/ChangeLog 2018-07-19 01:59:38 UTC (rev 233951)
+++ branches/safari-606-branch/Source/WebCore/ChangeLog 2018-07-19 01:59:42 UTC (rev 233952)
@@ -1,5 +1,21 @@
2018-07-18 Babak Shafiei <[email protected]>
+ Cherry-pick r233870. rdar://problem/42344023
+
+ Unreviewed attempt to fix the build.
+
+ * rendering/RenderThemeMac.mm:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@233870 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-07-16 Ryan Haddad <[email protected]>
+
+ Unreviewed attempt to fix the build.
+
+ * rendering/RenderThemeMac.mm:
+
+2018-07-18 Babak Shafiei <[email protected]>
+
Cherry-pick r233869. rdar://problem/42344023
Allow removal of white backgrounds
Modified: branches/safari-606-branch/Source/WebCore/rendering/RenderThemeMac.mm (233951 => 233952)
--- branches/safari-606-branch/Source/WebCore/rendering/RenderThemeMac.mm 2018-07-19 01:59:38 UTC (rev 233951)
+++ branches/safari-606-branch/Source/WebCore/rendering/RenderThemeMac.mm 2018-07-19 01:59:42 UTC (rev 233952)
@@ -2778,7 +2778,6 @@
#endif // ENABLE(ATTACHMENT_ELEMENT)
-<<<<<<< HEAD
static CGColorRef colorForStyle(DocumentMarkerLineStyle style, bool useDarkMode)
{
switch (style) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
