Title: [174980] releases/WebKitGTK/webkit-2.6
- Revision
- 174980
- Author
- [email protected]
- Date
- 2014-10-21 09:50:48 -0700 (Tue, 21 Oct 2014)
Log Message
Merge r174807 - REGRESSION (r169024): Undetermined text is not displayed in the search field of Adobe Help Website
https://bugs.webkit.org/show_bug.cgi?id=137679
rdar://problem/18450335
Reviewed by Enrica Casucci.
Source/WebCore:
Test: platform/mac/editing/input/selected-composed-text-painting.html
* rendering/InlineTextBox.cpp: (WebCore::InlineTextBox::paint): We do not paint
selection beckground for unconfirmed text with underlines, so we should use a regular
style for text painting, as well.
LayoutTests:
* platform/mac/editing/input/selected-composed-text-painting-expected.html: Added.
* platform/mac/editing/input/selected-composed-text-painting.html: Added.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog (174979 => 174980)
--- releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2014-10-21 16:48:29 UTC (rev 174979)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2014-10-21 16:50:48 UTC (rev 174980)
@@ -1,3 +1,14 @@
+2014-10-16 Alexey Proskuryakov <[email protected]>
+
+ REGRESSION (r169024): Undetermined text is not displayed in the search field of Adobe Help Website
+ https://bugs.webkit.org/show_bug.cgi?id=137679
+ rdar://problem/18450335
+
+ Reviewed by Enrica Casucci.
+
+ * platform/mac/editing/input/selected-composed-text-painting-expected.html: Added.
+ * platform/mac/editing/input/selected-composed-text-painting.html: Added.
+
2014-10-14 Zalan Bujtas <[email protected]>
REGRESSION (Safari 7.1/8.0): Border-radius and overflow hidden renders incorrectly.
Added: releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac/editing/input/selected-composed-text-painting-expected.html (0 => 174980)
--- releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac/editing/input/selected-composed-text-painting-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac/editing/input/selected-composed-text-painting-expected.html 2014-10-21 16:50:48 UTC (rev 174980)
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<meta charset="utf-8">
+<body>
+<p>Test that selected unconfirmed text ignores ::selection rules.
+To test manually, type anything using Kotoeri Hiragana, and press down arrow. The text should not become invisible.</p>
+<input id="test" type="text">
+<script>
+
+var test = document.getElementById('test');
+test.focus();
+
+var markedText = textInputController.makeAttributedString("ひらがな");
+markedText.addAttribute("NSUnderline", 2);
+textInputController.setMarkedText(markedText, 0, 4);
+
+</script>
+</body>
+</html>
Added: releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac/editing/input/selected-composed-text-painting.html (0 => 174980)
--- releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac/editing/input/selected-composed-text-painting.html (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac/editing/input/selected-composed-text-painting.html 2014-10-21 16:50:48 UTC (rev 174980)
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<meta charset="utf-8">
+<body>
+<style>
+::selection {
+ background: #447099;
+ color: #fff
+}
+
+</style>
+<p>Test that selected unconfirmed text ignores ::selection rules.
+To test manually, type anything using Kotoeri Hiragana, and press down arrow. The text should not become invisible.</p>
+<input id="test" type="text">
+<script>
+
+var test = document.getElementById('test');
+test.focus();
+
+var markedText = textInputController.makeAttributedString("ひらがな");
+markedText.addAttribute("NSUnderline", 2);
+textInputController.setMarkedText(markedText, 0, 4);
+
+</script>
+</body>
+</html>
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (174979 => 174980)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-10-21 16:48:29 UTC (rev 174979)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-10-21 16:50:48 UTC (rev 174980)
@@ -1,3 +1,17 @@
+2014-10-16 Alexey Proskuryakov <[email protected]>
+
+ REGRESSION (r169024): Undetermined text is not displayed in the search field of Adobe Help Website
+ https://bugs.webkit.org/show_bug.cgi?id=137679
+ rdar://problem/18450335
+
+ Reviewed by Enrica Casucci.
+
+ Test: platform/mac/editing/input/selected-composed-text-painting.html
+
+ * rendering/InlineTextBox.cpp: (WebCore::InlineTextBox::paint): We do not paint
+ selection beckground for unconfirmed text with underlines, so we should use a regular
+ style for text painting, as well.
+
2014-10-14 Jer Noble <[email protected]>
REGRESSION (r159208): Crash when clicking scrubber after navigating away/back to video
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/InlineTextBox.cpp (174979 => 174980)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/InlineTextBox.cpp 2014-10-21 16:48:29 UTC (rev 174979)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/InlineTextBox.cpp 2014-10-21 16:50:48 UTC (rev 174980)
@@ -537,6 +537,10 @@
const ShadowData* selectionShadow;
TextPaintStyle selectionPaintStyle = computeTextSelectionPaintStyle(textPaintStyle, renderer(), lineStyle, paintInfo, paintSelectedTextOnly, paintSelectedTextSeparately, selectionShadow);
+ // Text with custom underlines does not have selection background painted, so selection paint style is not appropriate for it.
+ if (useCustomUnderlines)
+ selectionPaintStyle = textPaintStyle;
+
// Set our font.
const Font& font = fontToUse(lineStyle, renderer());
// 1. Paint backgrounds behind text if needed. Examples of such backgrounds include selection
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
