Title: [110755] branches/safari-534.55-branch/Source/WebCore
Diff
Modified: branches/safari-534.55-branch/Source/WebCore/ChangeLog (110754 => 110755)
--- branches/safari-534.55-branch/Source/WebCore/ChangeLog 2012-03-14 21:34:23 UTC (rev 110754)
+++ branches/safari-534.55-branch/Source/WebCore/ChangeLog 2012-03-14 21:35:10 UTC (rev 110755)
@@ -1,5 +1,27 @@
2012-03-14 Lucas Forschler <[email protected]>
+ Merge 110480
+
+ 2012-03-12 Beth Dakin <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=80888
+ Clear background for NSTextFieldCell is unreliable and not necessary
+ -and corresponding-
+ <rdar://problem/10663710>
+
+ Reviewed by Dan Bernstein.
+
+ With http://trac.webkit.org/changeset/104240 I thought it was necessary to
+ make NSTextFieldCells draw with a clear background in order to allow styled
+ text fields. That is not actually necessary; we just had a different bug
+ where isControlStyled() was only checking for styled borders on text fields.
+ Text fields can also be styled with backgrounds, so they need the full check.
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::isControlStyled):
+ (WebCore::RenderThemeMac::textField):
+
+2012-03-14 Lucas Forschler <[email protected]>
+
Merge 104240
2012-01-05 Beth Dakin <[email protected]>
Modified: branches/safari-534.55-branch/Source/WebCore/rendering/RenderThemeMac.mm (110754 => 110755)
--- branches/safari-534.55-branch/Source/WebCore/rendering/RenderThemeMac.mm 2012-03-14 21:34:23 UTC (rev 110754)
+++ branches/safari-534.55-branch/Source/WebCore/rendering/RenderThemeMac.mm 2012-03-14 21:35:10 UTC (rev 110755)
@@ -481,7 +481,7 @@
bool RenderThemeMac::isControlStyled(const RenderStyle* style, const BorderData& border,
const FillLayer& background, const Color& backgroundColor) const
{
- if (style->appearance() == TextFieldPart || style->appearance() == TextAreaPart || style->appearance() == ListboxPart)
+ if (style->appearance() == TextAreaPart || style->appearance() == ListboxPart)
return style->border() != border;
// FIXME: This is horrible, but there is not much else that can be done. Menu lists cannot draw properly when
@@ -2050,11 +2050,6 @@
[m_textField.get() setBezeled:YES];
[m_textField.get() setEditable:YES];
[m_textField.get() setFocusRingType:NSFocusRingTypeExterior];
-
- // Setting a clear background on the cell is necessary for CSS-styled backgrounds
- // to show through. Ideally, there would be a better way to do this.
- [m_textField.get() setDrawsBackground:YES];
- [m_textField.get() setBackgroundColor:[NSColor clearColor]];
}
return m_textField.get();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
