diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-15 20:02:30 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-15 20:04:19 (GMT) |
| commit | 082a1594910d294c638c571fc79f3318891387eb (patch) | |
| tree | f594552d40bafb5db9d4136f103ea1275b65731f /src/3rdparty/webkit/WebCore/html | |
| parent | 6100e83f3cbf40199da3078c1954a4dc1f77cb8f (diff) | |
| download | Qt-082a1594910d294c638c571fc79f3318891387eb.zip Qt-082a1594910d294c638c571fc79f3318891387eb.tar.gz Qt-082a1594910d294c638c571fc79f3318891387eb.tar.bz2 | |
Updated WebKit to 3d774b9df1f963452b1cfe34f9fafad0d399372a
Integrated changes:
|| <https://webkit.org/b/37665> || [Qt] Rename QtLauncher to QtTestBrowser ||
|| <https://webkit.org/b/37381> || [Qt] animations/dynamic-stylesheet-loading.html fails with accelerated compositing ||
|| <https://webkit.org/b/38630> || VS2010 asserts a null iterator passed to std::copy in Vector::operator= ||
|| <https://webkit.org/b/38440> || [Qt] use QT_MOBILE_THEME in Symbian ||
|| <https://webkit.org/b/39031> || CSSParser::parseColor() shouldn't alter 'color' unless passed a valid color string. ||
|| <https://webkit.org/b/38949> || JavaScript unable to invoke methods declared in QML ||
Diffstat (limited to 'src/3rdparty/webkit/WebCore/html')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/html/canvas/CanvasRenderingContext2D.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/html/canvas/CanvasRenderingContext2D.cpp b/src/3rdparty/webkit/WebCore/html/canvas/CanvasRenderingContext2D.cpp index 823ab59..398e4d8 100644 --- a/src/3rdparty/webkit/WebCore/html/canvas/CanvasRenderingContext2D.cpp +++ b/src/3rdparty/webkit/WebCore/html/canvas/CanvasRenderingContext2D.cpp @@ -873,8 +873,6 @@ void CanvasRenderingContext2D::setShadow(float width, float height, float blur, return; RGBA32 rgba = makeRGBA32FromFloats(r, g, b, a); // default is transparent black - if (!state().m_shadowColor.isEmpty()) - CSSParser::parseColor(rgba, state().m_shadowColor); c->setShadow(IntSize(width, -height), state().m_shadowBlur, Color(rgba), DeviceColorSpace); } |