[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
yael.aharon at nokia.com
yael.aharon at nokia.com
Wed Dec 22 15:51:26 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit a7bfb14f3cb6b23359ce9635c2d4a25f9916d7d2
Author: yael.aharon at nokia.com <yael.aharon at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 15 13:32:13 2010 +0000
2010-11-15 Yael Aharon <yael.aharon at nokia.com>
Reviewed by Antonio Gomes.
[Qt] Focus ring does not show on focused links.
https://bugs.webkit.org/show_bug.cgi?id=49515
* platform/qt/fast/inline/inline-focus-ring-expected.checksum: Added.
* platform/qt/fast/inline/inline-focus-ring-expected.png: Added.
* platform/qt/fast/inline/inline-focus-ring-expected.txt: Added.
2010-11-15 Yael Aharon <yael.aharon at nokia.com>
Reviewed by Antonio Gomes.
[Qt] Focus ring does not show on focused links.
https://bugs.webkit.org/show_bug.cgi?id=49515
After http://trac.webkit.org/changeset/69766 the focus ring on links is no longer
visible in Qt.
The reason is that Qt always returned true in RenderTheme::supportsFocusRing(),
but until r69766, we did not check that for links. Qt draws its own focus ring
for controls that it draws, but not for links.
Change the return value to false if the style's appearance is not something that Qt
draws by itself or does not support.
Added a Qt specific test result for the new test added in r69766.
* platform/qt/RenderThemeQt.cpp:
(WebCore::RenderThemeQt::supportsFocusRing):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72004 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b4ee8ea..f4eba38 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-15 Yael Aharon <yael.aharon at nokia.com>
+
+ Reviewed by Antonio Gomes.
+
+ [Qt] Focus ring does not show on focused links.
+ https://bugs.webkit.org/show_bug.cgi?id=49515
+
+ * platform/qt/fast/inline/inline-focus-ring-expected.checksum: Added.
+ * platform/qt/fast/inline/inline-focus-ring-expected.png: Added.
+ * platform/qt/fast/inline/inline-focus-ring-expected.txt: Added.
+
2010-11-15 Dai Mikurube <dmikurube at google.com>
Reviewed by Kent Tamura.
diff --git a/LayoutTests/platform/qt/fast/inline/inline-focus-ring-expected.checksum b/LayoutTests/platform/qt/fast/inline/inline-focus-ring-expected.checksum
new file mode 100644
index 0000000..8ae5260
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/inline/inline-focus-ring-expected.checksum
@@ -0,0 +1 @@
+d5722520a530b8ed21581ade35b2f4d0
\ No newline at end of file
diff --git a/LayoutTests/platform/qt/fast/inline/inline-focus-ring-expected.png b/LayoutTests/platform/qt/fast/inline/inline-focus-ring-expected.png
new file mode 100644
index 0000000..f7bf9a4
Binary files /dev/null and b/LayoutTests/platform/qt/fast/inline/inline-focus-ring-expected.png differ
diff --git a/LayoutTests/platform/qt/fast/inline/inline-focus-ring-expected.txt b/LayoutTests/platform/qt/fast/inline/inline-focus-ring-expected.txt
new file mode 100644
index 0000000..5750512
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/inline/inline-focus-ring-expected.txt
@@ -0,0 +1,15 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {P} at (0,0) size 784x42
+ RenderText {#text} at (0,0) size 768x42
+ text run at (0,0) width 768: "Assuming the port-specific theme draws focus rings, this test can be used to ensure that a focus ring is drawn for a"
+ text run at (0,21) width 564: "hyperlink. This test PASSED if a focus ring is drawn around the hyperlink (below)."
+ RenderBlock (anonymous) at (0,58) size 784x21
+ RenderInline {A} at (0,0) size 69x21 [color=#0000EE]
+ RenderText {#text} at (0,0) size 69x21
+ text run at (0,0) width 69: "Hyperlink"
+ RenderText {#text} at (0,0) size 0x0
+caret: position 0 of child 0 {#text} of child 3 {A} of body
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f57fb49..44b40ef 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-11-15 Yael Aharon <yael.aharon at nokia.com>
+
+ Reviewed by Antonio Gomes.
+
+ [Qt] Focus ring does not show on focused links.
+ https://bugs.webkit.org/show_bug.cgi?id=49515
+
+ After http://trac.webkit.org/changeset/69766 the focus ring on links is no longer
+ visible in Qt.
+ The reason is that Qt always returned true in RenderTheme::supportsFocusRing(),
+ but until r69766, we did not check that for links. Qt draws its own focus ring
+ for controls that it draws, but not for links.
+ Change the return value to false if the style's appearance is not something that Qt
+ draws by itself or does not support.
+ Added a Qt specific test result for the new test added in r69766.
+
+ * platform/qt/RenderThemeQt.cpp:
+ (WebCore::RenderThemeQt::supportsFocusRing):
+
2010-11-15 Dai Mikurube <dmikurube at google.com>
Reviewed by Kent Tamura.
diff --git a/WebCore/platform/qt/RenderThemeQt.cpp b/WebCore/platform/qt/RenderThemeQt.cpp
index 7ef4ab7..789abb6 100644
--- a/WebCore/platform/qt/RenderThemeQt.cpp
+++ b/WebCore/platform/qt/RenderThemeQt.cpp
@@ -242,9 +242,32 @@ bool RenderThemeQt::supportsHover(const RenderStyle*) const
return true;
}
-bool RenderThemeQt::supportsFocusRing(const RenderStyle*) const
+bool RenderThemeQt::supportsFocusRing(const RenderStyle* style) const
{
- return true; // Qt provides this through the style
+ switch (style->appearance()) {
+ case CheckboxPart:
+ case RadioPart:
+ case PushButtonPart:
+ case SquareButtonPart:
+ case ButtonPart:
+ case ButtonBevelPart:
+ case ListboxPart:
+ case ListItemPart:
+ case MenulistPart:
+ case MenulistButtonPart:
+ case SliderHorizontalPart:
+ case SliderVerticalPart:
+ case SliderThumbHorizontalPart:
+ case SliderThumbVerticalPart:
+ case SearchFieldPart:
+ case SearchFieldResultsButtonPart:
+ case SearchFieldCancelButtonPart:
+ case TextFieldPart:
+ case TextAreaPart:
+ return true;
+ default:
+ return false;
+ }
}
int RenderThemeQt::baselinePosition(const RenderObject* o) const
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list