Title: [105301] branches/safari-534.54-branch/Source/WebKit/mac
- Revision
- 105301
- Author
- lforsch...@apple.com
- Date
- 2012-01-18 11:24:10 -0800 (Wed, 18 Jan 2012)
Log Message
Merged r105291.
Modified Paths
Diff
Modified: branches/safari-534.54-branch/Source/WebKit/mac/ChangeLog (105300 => 105301)
--- branches/safari-534.54-branch/Source/WebKit/mac/ChangeLog 2012-01-18 18:59:43 UTC (rev 105300)
+++ branches/safari-534.54-branch/Source/WebKit/mac/ChangeLog 2012-01-18 19:24:10 UTC (rev 105301)
@@ -1,3 +1,25 @@
+2011-01-18 Lucas Forschler <lforsch...@apple.com>
+
+ Merge 105291
+
+ 2012-01-17 Enrica Casucci <enr...@apple.com>
+
+ Missing NSForegroundColorAttributeName should be treated as black instead of transparent.
+ https://bugs.webkit.org/show_bug.cgi?id=76490
+ <rdar://problem/9460733>
+
+ Starting with Lion, there is no more NSForegroundColor attribute in the dictionary
+ if the color matches the default (solid black).
+ The fix consists in treating the lack of color as solid black instead of transparent as
+ we did before.
+
+ Added a TestWebKitAPI test.
+
+ Reviewed by Darin Adler and Dan Bernstein.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView _styleForAttributeChange:]):
+
2011-1-13 Lucas Forschler <lforsch...@apple.com>
Merge 104269
Modified: branches/safari-534.54-branch/Source/WebKit/mac/WebView/WebHTMLView.mm (105300 => 105301)
--- branches/safari-534.54-branch/Source/WebKit/mac/WebView/WebHTMLView.mm 2012-01-18 18:59:43 UTC (rev 105300)
+++ branches/safari-534.54-branch/Source/WebKit/mac/WebView/WebHTMLView.mm 2012-01-18 19:24:10 UTC (rev 105301)
@@ -4548,6 +4548,8 @@
ca = [a objectForKey:NSForegroundColorAttributeName];
cb = [b objectForKey:NSForegroundColorAttributeName];
if (ca == cb) {
+ if (!ca)
+ ca = [NSColor blackColor];
[style setColor:[self _colorAsString:ca]];
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
