diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-11 23:28:29 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-11 23:28:29 +0200 |
| commit | 1ecc0516ab6fa6db148c6ea917320db303d0bdf0 (patch) | |
| tree | cc39405f341b66fe5cecae6f1d604f669f8e66be | |
| parent | 95be58fdcf23bb20dbde16dcb64f080256a4586d (diff) | |
| parent | 42a16bccb1750f0e4094d9d6366200a5deae9184 (diff) | |
| download | qtwebkit-1ecc0516ab6fa6db148c6ea917320db303d0bdf0.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I14418995f8602db318ae29e02089cab194354246
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | Source/WTF/wtf/text/StringImpl.cpp | 7 | ||||
| -rw-r--r-- | Source/WebCore/platform/qt/RenderThemeQStyle.cpp | 3 |
3 files changed, 23 insertions, 1 deletions
@@ -1,3 +1,17 @@ +2013-03-19 David Rosca <nowrep@gmail.com> + + [Qt] QStyle: Set State_Enabled by default when painting style widgets. + https://bugs.webkit.org/show_bug.cgi?id=112688 + + Reviewed by Jocelyn Turcotte. + + All Qt style widgets were painted with a disabled state, even when + they actually were enabled. + This change fixes it by setting State_Enabled as a default state, + which is then correctly removed when element is disabled. + + * Source/WebCore/platform/qt/RenderThemeQStyle.cpp: + 2012-12-13 Jerome Pasion <Jerome.Pasion@digia.com> [Qt] Fix missing doc dependency to examples diff --git a/Source/WTF/wtf/text/StringImpl.cpp b/Source/WTF/wtf/text/StringImpl.cpp index f995c6414..0c8da50ff 100644 --- a/Source/WTF/wtf/text/StringImpl.cpp +++ b/Source/WTF/wtf/text/StringImpl.cpp @@ -480,7 +480,14 @@ PassRefPtr<StringImpl> StringImpl::upper() for (int i = 0; i < length; ++i) { LChar c = m_data8[i]; ored |= c; +#if CPU(X86) && defined(_MSC_VER) && _MSC_VER >=1700 + // Workaround for an MSVC 2012 x86 optimizer bug. Remove once the bug is fixed. + // See https://connect.microsoft.com/VisualStudio/feedback/details/780362/optimization-bug-of-range-comparison + // for more details. + data8[i] = c >= 'a' && c <= 'z' ? c & ~0x20 : c; +#else data8[i] = toASCIIUpper(c); +#endif } if (!(ored & ~0x7F)) return newImpl.release(); diff --git a/Source/WebCore/platform/qt/RenderThemeQStyle.cpp b/Source/WebCore/platform/qt/RenderThemeQStyle.cpp index f7e8bf5c9..e55c75c6e 100644 --- a/Source/WebCore/platform/qt/RenderThemeQStyle.cpp +++ b/Source/WebCore/platform/qt/RenderThemeQStyle.cpp @@ -538,8 +538,9 @@ bool RenderThemeQStyle::paintInnerSpinButton(RenderObject* o, const PaintInfo& p ControlPart RenderThemeQStyle::initializeCommonQStyleOptions(QStyleFacadeOption &option, RenderObject* o) const { - // Default bits: no focus, no mouse over + // Default bits: no focus, no mouse over, enabled option.state &= ~(QStyleFacade::State_HasFocus | QStyleFacade::State_MouseOver); + option.state |= QStyleFacade::State_Enabled; if (isReadOnlyControl(o)) // Readonly is supported on textfields. |