[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
commit-queue at webkit.org
commit-queue at webkit.org
Fri Jan 21 14:59:47 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 77eb884c5c864b95750351b4ed01be9ccf2542ad
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 6 02:16:55 2011 +0000
2011-01-05 Helder Correia <helder at sencha.com>
Reviewed by Ariya Hidayat.
[Qt] Default focus ring is too wide
https://bugs.webkit.org/show_bug.cgi?id=51854
This is an intermediate step to solve this bug. Use QPalette::Highlight
instead of default half-transparent black as the focus ring color.
* platform/qt/editing/selection/caret-and-focus-ring-expected.checksum: Added.
* platform/qt/editing/selection/caret-and-focus-ring-expected.png: Added.
* platform/qt/editing/selection/caret-and-focus-ring-expected.txt: Added.
* platform/qt/fast/css/focus-ring-outline-color-expected.checksum:
* platform/qt/fast/css/focus-ring-outline-color-expected.png:
* platform/qt/fast/css/focus-ring-outline-offset-expected.checksum:
* platform/qt/fast/css/focus-ring-outline-offset-expected.png:
* platform/qt/fast/css/focus-ring-outline-width-expected.checksum:
* platform/qt/fast/css/focus-ring-outline-width-expected.png:
2011-01-05 Helder Correia <helder at sencha.com>
Reviewed by Ariya Hidayat.
[Qt] Default focus ring is too wide
https://bugs.webkit.org/show_bug.cgi?id=51854
This is an intermediate step to solve this bug. Use QPalette::Highlight
instead of default half-transparent black as the focus ring color.
* platform/graphics/qt/GraphicsContextQt.cpp:
(WebCore::drawFocusRingForPath):
* platform/qt/RenderThemeQt.cpp:
(WebCore::RenderThemeQt::platformFocusRingColor):
* platform/qt/RenderThemeQt.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75126 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d6dd7b5..54686e3 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,23 @@
+2011-01-05 Helder Correia <helder at sencha.com>
+
+ Reviewed by Ariya Hidayat.
+
+ [Qt] Default focus ring is too wide
+ https://bugs.webkit.org/show_bug.cgi?id=51854
+
+ This is an intermediate step to solve this bug. Use QPalette::Highlight
+ instead of default half-transparent black as the focus ring color.
+
+ * platform/qt/editing/selection/caret-and-focus-ring-expected.checksum: Added.
+ * platform/qt/editing/selection/caret-and-focus-ring-expected.png: Added.
+ * platform/qt/editing/selection/caret-and-focus-ring-expected.txt: Added.
+ * platform/qt/fast/css/focus-ring-outline-color-expected.checksum:
+ * platform/qt/fast/css/focus-ring-outline-color-expected.png:
+ * platform/qt/fast/css/focus-ring-outline-offset-expected.checksum:
+ * platform/qt/fast/css/focus-ring-outline-offset-expected.png:
+ * platform/qt/fast/css/focus-ring-outline-width-expected.checksum:
+ * platform/qt/fast/css/focus-ring-outline-width-expected.png:
+
2011-01-05 James Simonsen <simonjam at chromium.org>
Reviewed by Darin Fisher.
diff --git a/LayoutTests/platform/qt/editing/selection/caret-and-focus-ring-expected.checksum b/LayoutTests/platform/qt/editing/selection/caret-and-focus-ring-expected.checksum
new file mode 100644
index 0000000..6adba1f
--- /dev/null
+++ b/LayoutTests/platform/qt/editing/selection/caret-and-focus-ring-expected.checksum
@@ -0,0 +1 @@
+7cdb1801b3edf82c7fe1f6983d816da6
\ No newline at end of file
diff --git a/LayoutTests/platform/qt/editing/selection/caret-and-focus-ring-expected.png b/LayoutTests/platform/qt/editing/selection/caret-and-focus-ring-expected.png
new file mode 100644
index 0000000..884fc02
Binary files /dev/null and b/LayoutTests/platform/qt/editing/selection/caret-and-focus-ring-expected.png differ
diff --git a/LayoutTests/platform/qt/editing/selection/caret-and-focus-ring-expected.txt b/LayoutTests/platform/qt/editing/selection/caret-and-focus-ring-expected.txt
new file mode 100644
index 0000000..94eef46
--- /dev/null
+++ b/LayoutTests/platform/qt/editing/selection/caret-and-focus-ring-expected.txt
@@ -0,0 +1,19 @@
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+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 742x42
+ text run at (0,0) width 742: "This tests that the caret and the focus halo are not displayed when the WebView is not focused (using the pixel"
+ text run at (0,21) width 221: "output from DumpRenderTree)."
+ RenderBlock {DIV} at (0,58) size 784x21
+ RenderText {#text} at (0,0) size 69x21
+ text run at (0,0) width 69: "This is an "
+ RenderInline {SPAN} at (0,0) size 53x21
+ RenderText {#text} at (69,0) size 53x21
+ text run at (69,0) width 53: "editable"
+ RenderText {#text} at (122,0) size 434x21
+ text run at (122,0) width 434: " region. No caret or focus ring should appear in the pixel results."
+caret: position 11 of child 0 {#text} of child 3 {DIV} of body
diff --git a/LayoutTests/platform/qt/fast/css/focus-ring-outline-color-expected.checksum b/LayoutTests/platform/qt/fast/css/focus-ring-outline-color-expected.checksum
index cd6218e..d1e5669 100644
--- a/LayoutTests/platform/qt/fast/css/focus-ring-outline-color-expected.checksum
+++ b/LayoutTests/platform/qt/fast/css/focus-ring-outline-color-expected.checksum
@@ -1 +1 @@
-7759257f4cac5223d159e526b686039e
\ No newline at end of file
+59b8dff13c003bee9fa17ee9b3c2d5ba
\ No newline at end of file
diff --git a/LayoutTests/platform/qt/fast/css/focus-ring-outline-color-expected.png b/LayoutTests/platform/qt/fast/css/focus-ring-outline-color-expected.png
index fafddfb..82cee7f 100644
Binary files a/LayoutTests/platform/qt/fast/css/focus-ring-outline-color-expected.png and b/LayoutTests/platform/qt/fast/css/focus-ring-outline-color-expected.png differ
diff --git a/LayoutTests/platform/qt/fast/css/focus-ring-outline-offset-expected.checksum b/LayoutTests/platform/qt/fast/css/focus-ring-outline-offset-expected.checksum
index dc80620..9c366df 100644
--- a/LayoutTests/platform/qt/fast/css/focus-ring-outline-offset-expected.checksum
+++ b/LayoutTests/platform/qt/fast/css/focus-ring-outline-offset-expected.checksum
@@ -1 +1 @@
-0a55a6bc900700bf741b499eb6c6d4fb
\ No newline at end of file
+092bcfee9c21e5721cf4b5f11ba49f18
\ No newline at end of file
diff --git a/LayoutTests/platform/qt/fast/css/focus-ring-outline-offset-expected.png b/LayoutTests/platform/qt/fast/css/focus-ring-outline-offset-expected.png
index a8a69c6..db61df8 100644
Binary files a/LayoutTests/platform/qt/fast/css/focus-ring-outline-offset-expected.png and b/LayoutTests/platform/qt/fast/css/focus-ring-outline-offset-expected.png differ
diff --git a/LayoutTests/platform/qt/fast/css/focus-ring-outline-width-expected.checksum b/LayoutTests/platform/qt/fast/css/focus-ring-outline-width-expected.checksum
index ae1aed1..48a2474 100644
--- a/LayoutTests/platform/qt/fast/css/focus-ring-outline-width-expected.checksum
+++ b/LayoutTests/platform/qt/fast/css/focus-ring-outline-width-expected.checksum
@@ -1 +1 @@
-33ecc1f39c5084e7c66642b18f3ae11e
\ No newline at end of file
+072ae38d8a6b708e67b76975a93149e0
\ No newline at end of file
diff --git a/LayoutTests/platform/qt/fast/css/focus-ring-outline-width-expected.png b/LayoutTests/platform/qt/fast/css/focus-ring-outline-width-expected.png
index 862563b..f8fae5a 100644
Binary files a/LayoutTests/platform/qt/fast/css/focus-ring-outline-width-expected.png and b/LayoutTests/platform/qt/fast/css/focus-ring-outline-width-expected.png differ
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c7cbac4..9d5b022 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2011-01-05 Helder Correia <helder at sencha.com>
+
+ Reviewed by Ariya Hidayat.
+
+ [Qt] Default focus ring is too wide
+ https://bugs.webkit.org/show_bug.cgi?id=51854
+
+ This is an intermediate step to solve this bug. Use QPalette::Highlight
+ instead of default half-transparent black as the focus ring color.
+
+ * platform/graphics/qt/GraphicsContextQt.cpp:
+ (WebCore::drawFocusRingForPath):
+ * platform/qt/RenderThemeQt.cpp:
+ (WebCore::RenderThemeQt::platformFocusRingColor):
+ * platform/qt/RenderThemeQt.h:
+
2011-01-05 James Simonsen <simonjam at chromium.org>
Reviewed by Darin Fisher.
diff --git a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index 8ecb666..78a14f4 100644
--- a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -794,7 +794,7 @@ void drawFocusRingForPath(QPainter* p, const QPainterPath& path, int width, cons
const QBrush oldBrush = p->brush();
QPen nPen = p->pen();
- nPen.setColor(QColor(color.red(), color.green(), color.blue(), 127));
+ nPen.setColor(color);
nPen.setWidth(width);
p->setBrush(Qt::NoBrush);
nPen.setStyle(Qt::SolidLine);
diff --git a/WebCore/platform/qt/RenderThemeQt.cpp b/WebCore/platform/qt/RenderThemeQt.cpp
index 789abb6..6841882 100644
--- a/WebCore/platform/qt/RenderThemeQt.cpp
+++ b/WebCore/platform/qt/RenderThemeQt.cpp
@@ -61,7 +61,6 @@
#include <QApplication>
#include <QColor>
-#include <QDebug>
#include <QFile>
#include <QLineEdit>
#include <QPainter>
@@ -375,6 +374,12 @@ Color RenderThemeQt::platformInactiveSelectionForegroundColor() const
return pal.brush(QPalette::Inactive, QPalette::HighlightedText).color();
}
+Color RenderThemeQt::platformFocusRingColor() const
+{
+ QPalette pal = QApplication::palette();
+ return pal.brush(QPalette::Active, QPalette::Highlight).color();
+}
+
void RenderThemeQt::systemFont(int, FontDescription&) const
{
// no-op
diff --git a/WebCore/platform/qt/RenderThemeQt.h b/WebCore/platform/qt/RenderThemeQt.h
index 7ab6769..3648abc 100644
--- a/WebCore/platform/qt/RenderThemeQt.h
+++ b/WebCore/platform/qt/RenderThemeQt.h
@@ -70,6 +70,8 @@ public:
virtual Color platformActiveSelectionForegroundColor() const;
virtual Color platformInactiveSelectionForegroundColor() const;
+ virtual Color platformFocusRingColor() const;
+
virtual void systemFont(int propId, FontDescription&) const;
virtual int minimumMenuListSize(RenderStyle*) const;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list