Title: [193726] branches/safari-601.4-branch
- Revision
- 193726
- Author
- bshaf...@apple.com
- Date
- 2015-12-08 00:40:36 -0800 (Tue, 08 Dec 2015)
Log Message
Merged r192389. rdar://problem/23787083
Modified Paths
Added Paths
Diff
Modified: branches/safari-601.4-branch/LayoutTests/ChangeLog (193725 => 193726)
--- branches/safari-601.4-branch/LayoutTests/ChangeLog 2015-12-08 08:38:37 UTC (rev 193725)
+++ branches/safari-601.4-branch/LayoutTests/ChangeLog 2015-12-08 08:40:36 UTC (rev 193726)
@@ -1,5 +1,20 @@
2015-12-08 Babak Shafiei <bshaf...@apple.com>
+ Merge r192389.
+
+ 2015-11-12 Zalan Bujtas <za...@apple.com>
+
+ Ignore visited background color when deciding if the input renderer needs to be painted natively.
+ https://bugs.webkit.org/show_bug.cgi?id=151211
+ rdar://problem/21449823
+
+ Reviewed by Antti Koivisto.
+
+ * fast/css/pseudo-visited-background-color-on-input-expected.html: Added.
+ * fast/css/pseudo-visited-background-color-on-input.html: Added.
+
+2015-12-08 Babak Shafiei <bshaf...@apple.com>
+
Merge r192369.
2015-11-11 Jon Honeycutt <jhoneyc...@apple.com>
Copied: branches/safari-601.4-branch/LayoutTests/fast/css/pseudo-visited-background-color-on-input-expected.html (from rev 193706, branches/safari-601.1.46.60-branch/LayoutTests/fast/css/pseudo-visited-background-color-on-input-expected.html) (0 => 193726)
--- branches/safari-601.4-branch/LayoutTests/fast/css/pseudo-visited-background-color-on-input-expected.html (rev 0)
+++ branches/safari-601.4-branch/LayoutTests/fast/css/pseudo-visited-background-color-on-input-expected.html 2015-12-08 08:40:36 UTC (rev 193726)
@@ -0,0 +1,21 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<title>This tests that we draw the input natively when :visited background-color is set.</title>
+</head>
+<body>
+<a href="" type="button"></input></a><br>
+<a href="" type="submit"></input></a><br>
+<a href="" type="checkbox"></input></a><br>
+<a href="" type="file"></input></a><br>
+<a href="" type="checkbox"></input></a><br>
+<a href="" type="color"></input></a><br>
+<a href="" type="file"></input></a><br>
+<a href="" type="hidden"></input></a><br>
+<a href="" type="image"></input></a><br>
+<a href="" type="radio"></input></a><br>
+<a href="" type="range"></input></a><br>
+<a href="" type="reset"></input></a><br>
+<a href="" type="search"></input></a><br>
+</body>
+</html>
Copied: branches/safari-601.4-branch/LayoutTests/fast/css/pseudo-visited-background-color-on-input.html (from rev 193706, branches/safari-601.1.46.60-branch/LayoutTests/fast/css/pseudo-visited-background-color-on-input.html) (0 => 193726)
--- branches/safari-601.4-branch/LayoutTests/fast/css/pseudo-visited-background-color-on-input.html (rev 0)
+++ branches/safari-601.4-branch/LayoutTests/fast/css/pseudo-visited-background-color-on-input.html 2015-12-08 08:40:36 UTC (rev 193726)
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<title>This tests that we draw the input natively when :visited background-color is set.</title>
+<style>
+ a:visited input {
+ background-color: red;
+ }
+</style>
+</head>
+<body>
+<a href="" type="button"></input></a><br>
+<a href="" type="submit"></input></a><br>
+<a href="" type="checkbox"></input></a><br>
+<a href="" type="file"></input></a><br>
+<a href="" type="checkbox"></input></a><br>
+<a href="" type="color"></input></a><br>
+<a href="" type="file"></input></a><br>
+<a href="" type="hidden"></input></a><br>
+<a href="" type="image"></input></a><br>
+<a href="" type="radio"></input></a><br>
+<a href="" type="range"></input></a><br>
+<a href="" type="reset"></input></a><br>
+<a href="" type="search"></input></a><br>
+</body>
+</html>
Modified: branches/safari-601.4-branch/Source/WebCore/ChangeLog (193725 => 193726)
--- branches/safari-601.4-branch/Source/WebCore/ChangeLog 2015-12-08 08:38:37 UTC (rev 193725)
+++ branches/safari-601.4-branch/Source/WebCore/ChangeLog 2015-12-08 08:40:36 UTC (rev 193726)
@@ -1,5 +1,23 @@
2015-12-08 Babak Shafiei <bshaf...@apple.com>
+ Merge r192389.
+
+ 2015-11-12 Zalan Bujtas <za...@apple.com>
+
+ Ignore visited background color when deciding if the input renderer needs to be painted natively.
+ https://bugs.webkit.org/show_bug.cgi?id=151211
+ rdar://problem/21449823
+
+ Reviewed by Antti Koivisto.
+
+ Test: fast/css/pseudo-visited-background-color-on-input.html
+
+ * rendering/RenderTheme.cpp:
+ (WebCore::RenderTheme::isControlStyled):
+ * rendering/style/RenderStyle.h:
+
+2015-12-08 Babak Shafiei <bshaf...@apple.com>
+
Merge r192369.
2015-11-11 Jon Honeycutt <jhoneyc...@apple.com>
Modified: branches/safari-601.4-branch/Source/WebCore/rendering/RenderTheme.cpp (193725 => 193726)
--- branches/safari-601.4-branch/Source/WebCore/rendering/RenderTheme.cpp 2015-12-08 08:38:37 UTC (rev 193725)
+++ branches/safari-601.4-branch/Source/WebCore/rendering/RenderTheme.cpp 2015-12-08 08:40:36 UTC (rev 193726)
@@ -703,7 +703,7 @@
// Test the style to see if the UA border and background match.
return (style.border() != border
|| *style.backgroundLayers() != background
- || style.visitedDependentColor(CSSPropertyBackgroundColor) != backgroundColor);
+ || !style.backgroundColorEqualsToColorIgnoringVisited(backgroundColor));
default:
return false;
}
Modified: branches/safari-601.4-branch/Source/WebCore/rendering/style/RenderStyle.h (193725 => 193726)
--- branches/safari-601.4-branch/Source/WebCore/rendering/style/RenderStyle.h 2015-12-08 08:38:37 UTC (rev 193725)
+++ branches/safari-601.4-branch/Source/WebCore/rendering/style/RenderStyle.h 2015-12-08 08:40:36 UTC (rev 193726)
@@ -1843,6 +1843,7 @@
void setLastChildState() { setUnique(); noninherited_flags.setLastChildState(true); }
WEBCORE_EXPORT Color visitedDependentColor(int colorProperty) const;
+ bool backgroundColorEqualsToColorIgnoringVisited(const Color& color) const { return color == backgroundColor(); }
void setHasExplicitlyInheritedProperties() { noninherited_flags.setHasExplicitlyInheritedProperties(true); }
bool hasExplicitlyInheritedProperties() const { return noninherited_flags.hasExplicitlyInheritedProperties(); }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
