Title: [233870] trunk/Source/WebCore
- Revision
- 233870
- Author
- [email protected]
- Date
- 2018-07-16 16:46:31 -0700 (Mon, 16 Jul 2018)
Log Message
Unreviewed attempt to fix the build.
* rendering/RenderThemeMac.mm:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (233869 => 233870)
--- trunk/Source/WebCore/ChangeLog 2018-07-16 23:34:42 UTC (rev 233869)
+++ trunk/Source/WebCore/ChangeLog 2018-07-16 23:46:31 UTC (rev 233870)
@@ -1,3 +1,9 @@
+2018-07-16 Ryan Haddad <[email protected]>
+
+ Unreviewed attempt to fix the build.
+
+ * rendering/RenderThemeMac.mm:
+
2018-07-11 Dean Jackson <[email protected]>
Allow removal of white backgrounds
Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (233869 => 233870)
--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2018-07-16 23:34:42 UTC (rev 233869)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2018-07-16 23:46:31 UTC (rev 233870)
@@ -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
