diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-07-26 14:31:43 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-07-26 14:31:43 (GMT) |
| commit | 9f657356f897d8bf4c92965a8bc1af82107e2379 (patch) | |
| tree | da6f852e71921af3126ed5b0c1e949db11b3857b /src/3rdparty/webkit/WebCore/platform | |
| parent | 2268c602cacc7efe5fa54dd026d1c3455ec76c47 (diff) | |
| download | Qt-9f657356f897d8bf4c92965a8bc1af82107e2379.zip Qt-9f657356f897d8bf4c92965a8bc1af82107e2379.tar.gz Qt-9f657356f897d8bf4c92965a8bc1af82107e2379.tar.bz2 | |
Updated WebKit to 0be9ff9f2b1ec2b748885ac15299bc1c65aca590
Integrated changes:
|| <https://webkit.org/b/42474> || Spatial navigation: do not consider outline for focusable element boundaries ||
|| <https://webkit.org/b/41484> || [Qt] Clamp color stops passed to QGradient to 1.0 ||
|| <https://webkit.org/b/29381> || [Qt] [Regression] QWebView::setHtml() executes script body twice ||
|| <https://webkit.org/b/30879> || Loading HTML with a JS alert() when the DocumentLoader has been set to not defer data load results in ASSERT ||
Diffstat (limited to 'src/3rdparty/webkit/WebCore/platform')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/platform/graphics/qt/GradientQt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GradientQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GradientQt.cpp index 8b9e2d7..1ec3203 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GradientQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GradientQt.cpp @@ -65,7 +65,7 @@ QGradient* Gradient::platformGradient() lastStop = stopIterator->stop; if (m_radial && m_r0) lastStop = m_r0 / m_r1 + lastStop * (1.0f - m_r0 / m_r1); - m_gradient->setColorAt(lastStop, stopColor); + m_gradient->setColorAt(qMin(lastStop, qreal(1.0f)), stopColor); // Keep the lastStop as orginal value, since the following stopColor depend it lastStop = stopIterator->stop; ++stopIterator; |