From 082a1594910d294c638c571fc79f3318891387eb Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Sat, 15 May 2010 22:02:30 +0200 Subject: Updated WebKit to 3d774b9df1f963452b1cfe34f9fafad0d399372a Integrated changes: || || [Qt] Rename QtLauncher to QtTestBrowser || || || [Qt] animations/dynamic-stylesheet-loading.html fails with accelerated compositing || || || VS2010 asserts a null iterator passed to std::copy in Vector::operator= || || || [Qt] use QT_MOBILE_THEME in Symbian || || || CSSParser::parseColor() shouldn't alter 'color' unless passed a valid color string. || || || JavaScript unable to invoke methods declared in QML || --- src/3rdparty/webkit/.tag | 2 +- src/3rdparty/webkit/ChangeLog | 9 +++++ src/3rdparty/webkit/JavaScriptCore/ChangeLog | 12 +++++++ src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h | 12 +++++++ src/3rdparty/webkit/VERSION | 2 +- src/3rdparty/webkit/WebCore/ChangeLog | 40 ++++++++++++++++++++++ src/3rdparty/webkit/WebCore/WebCore.pro | 2 +- .../webkit/WebCore/bridge/qt/qt_instance.cpp | 2 +- .../webkit/WebCore/bridge/qt/qt_runtime.cpp | 2 +- src/3rdparty/webkit/WebCore/css/CSSParser.cpp | 1 - .../webkit/WebCore/editing/ApplyStyleCommand.cpp | 2 +- .../html/canvas/CanvasRenderingContext2D.cpp | 2 -- src/3rdparty/webkit/WebKit.pro | 2 +- 13 files changed, 80 insertions(+), 10 deletions(-) diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag index 9d754a4..2fc5867 100644 --- a/src/3rdparty/webkit/.tag +++ b/src/3rdparty/webkit/.tag @@ -1 +1 @@ -3d774b9df1f963452b1cfe34f9fafad0d399372a +4696beb87359fe9236d23e0791526eb38dab341d diff --git a/src/3rdparty/webkit/ChangeLog b/src/3rdparty/webkit/ChangeLog index a0cf2d0..8f9c7ac 100644 --- a/src/3rdparty/webkit/ChangeLog +++ b/src/3rdparty/webkit/ChangeLog @@ -1,3 +1,12 @@ +2010-05-14 Simon Hausmann + + Rubber-stamped by Antti Koivisto. + + [Qt] Rename QtLauncher to QtTestBrowser + https://bugs.webkit.org/show_bug.cgi?id=37665 + + * WebKit.pro: + 2010-05-12 Laszlo Gombos Reviewed by Kenneth Rohde Christiansen. diff --git a/src/3rdparty/webkit/JavaScriptCore/ChangeLog b/src/3rdparty/webkit/JavaScriptCore/ChangeLog index a3e6586..af5ef5c 100644 --- a/src/3rdparty/webkit/JavaScriptCore/ChangeLog +++ b/src/3rdparty/webkit/JavaScriptCore/ChangeLog @@ -1,3 +1,15 @@ +2010-05-10 Jocelyn Turcotte + + Reviewed by Alexey Proskuryakov. + + Fix a VS2010 assert in std::copy + https://bugs.webkit.org/show_bug.cgi?id=38630 + + The assert complains that the output iterator is null. + + * wtf/Vector.h: + (WTF::::operator): + 2010-05-12 Laszlo Gombos Reviewed by Kenneth Rohde Christiansen. diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h index e495067..4d9ea61 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h @@ -686,6 +686,12 @@ namespace WTF { return *this; } +// Works around an assert in VS2010. See https://connect.microsoft.com/VisualStudio/feedback/details/558044/std-copy-should-not-check-dest-when-first-last +#if COMPILER(MSVC) && defined(_ITERATOR_DEBUG_LEVEL) && _ITERATOR_DEBUG_LEVEL + if (!begin()) + return *this; +#endif + std::copy(other.begin(), other.begin() + size(), begin()); TypeOperations::uninitializedCopy(other.begin() + size(), other.end(), end()); m_size = other.size(); @@ -709,6 +715,12 @@ namespace WTF { return *this; } +// Works around an assert in VS2010. See https://connect.microsoft.com/VisualStudio/feedback/details/558044/std-copy-should-not-check-dest-when-first-last +#if COMPILER(MSVC) && defined(_ITERATOR_DEBUG_LEVEL) && _ITERATOR_DEBUG_LEVEL + if (!begin()) + return *this; +#endif + std::copy(other.begin(), other.begin() + size(), begin()); TypeOperations::uninitializedCopy(other.begin() + size(), other.end(), end()); m_size = other.size(); diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index a440c03..5cda8f8 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from and has the sha1 checksum - 5cf023650a8da206a8cf3130e9d4820b95e1bc7c + 3d774b9df1f963452b1cfe34f9fafad0d399372a diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index 93d00e4..a8c4c76 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,43 @@ +2010-05-06 Luiz Agostini + + Rubber-stamped by Simon Hausmann. + + [Qt] use QT_MOBILE_THEME in Symbian + https://bugs.webkit.org/show_bug.cgi?id=38440 + + Putting QT_MOBILE_THEME into use for Symbian. + + * WebCore.pro: + +2010-05-14 Andreas Kling + + Reviewed by Darin Adler. + + CSSParser::parseColor() shouldn't alter 'color' unless passed a valid color string. + https://bugs.webkit.org/show_bug.cgi?id=39031 + + * css/CSSParser.cpp: + (WebCore::CSSParser::parseColor): + * editing/ApplyStyleCommand.cpp: + (WebCore::StyleChange::extractTextStyles): Don't depend on old behavior. + * html/canvas/CanvasRenderingContext2D.cpp: + (WebCore::CanvasRenderingContext2D::setShadow): Remove dead code. + +2010-05-14 Aaron Kennedy + + Reviewed by Simon Hausmann. + + [Qt] JavaScript unable to invoke methods declared in QML + https://bugs.webkit.org/show_bug.cgi?id=38949 + + JavaScript code executed by webkit cannot call into QML declared + methods, as it does not check for dynamic meta objects. + + * bridge/qt/qt_instance.cpp: + (JSC::Bindings::QtInstance::stringValue): Use QMetaObject::metacall. + * bridge/qt/qt_runtime.cpp: + (JSC::Bindings::QtRuntimeMetaMethod::call): Ditto. + 2010-05-12 Laszlo Gombos Reviewed by Kenneth Rohde Christiansen. diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 689c5ff..5def728 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -125,7 +125,7 @@ maemo5|symbian|embedded { DEFINES += ENABLE_FAST_MOBILE_SCROLLING=1 } -maemo5 { +maemo5|symbian { DEFINES += WTF_USE_QT_MOBILE_THEME=1 } diff --git a/src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp b/src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp index f6f368b..d40ab0b 100644 --- a/src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp +++ b/src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp @@ -287,7 +287,7 @@ JSValue QtInstance::stringValue(ExecState* exec) const void * qargs[1]; qargs[0] = ret.data(); - if (obj->qt_metacall(QMetaObject::InvokeMetaMethod, index, qargs) < 0) { + if (QMetaObject::metacall(obj, QMetaObject::InvokeMetaMethod, index, qargs) < 0) { if (ret.isValid() && ret.canConvert(QVariant::String)) { buf = ret.toString().toLatin1().constData(); // ### Latin 1? Ascii? useDefault = false; diff --git a/src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.cpp b/src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.cpp index 1775815..4524d97 100644 --- a/src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.cpp +++ b/src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.cpp @@ -1397,7 +1397,7 @@ JSValue QtRuntimeMetaMethod::call(ExecState* exec, JSObject* functionObject, JSV int methodIndex; JSObject* errorObj = 0; if ((methodIndex = findMethodIndex(exec, obj->metaObject(), d->m_signature, d->m_allowPrivate, args, vargs, (void **)qargs, &errorObj)) != -1) { - if (obj->qt_metacall(QMetaObject::InvokeMetaMethod, methodIndex, qargs) >= 0) + if (QMetaObject::metacall(obj, QMetaObject::InvokeMetaMethod, methodIndex, qargs) >= 0) return jsUndefined(); if (vargs[0].isValid()) diff --git a/src/3rdparty/webkit/WebCore/css/CSSParser.cpp b/src/3rdparty/webkit/WebCore/css/CSSParser.cpp index 214fc51..a5a8b5c 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSParser.cpp +++ b/src/3rdparty/webkit/WebCore/css/CSSParser.cpp @@ -279,7 +279,6 @@ bool CSSParser::parseValue(CSSMutableStyleDeclaration* declaration, int id, cons // possible to set up a default color. bool CSSParser::parseColor(RGBA32& color, const String& string, bool strict) { - color = 0; CSSParser parser(true); // First try creating a color specified by name or the "#" syntax. diff --git a/src/3rdparty/webkit/WebCore/editing/ApplyStyleCommand.cpp b/src/3rdparty/webkit/WebCore/editing/ApplyStyleCommand.cpp index 1c739ec..529d9d3 100644 --- a/src/3rdparty/webkit/WebCore/editing/ApplyStyleCommand.cpp +++ b/src/3rdparty/webkit/WebCore/editing/ApplyStyleCommand.cpp @@ -212,7 +212,7 @@ void StyleChange::extractTextStyles(CSSMutableStyleDeclaration* style) if (RefPtr colorValue = style->getPropertyCSSValue(CSSPropertyColor)) { ASSERT(colorValue->isPrimitiveValue()); CSSPrimitiveValue* primitiveColor = static_cast(colorValue.get()); - RGBA32 rgba; + RGBA32 rgba = 0; if (primitiveColor->primitiveType() != CSSPrimitiveValue::CSS_RGBCOLOR) { CSSParser::parseColor(rgba, colorValue->cssText()); // Need to take care of named color such as green and black 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); } diff --git a/src/3rdparty/webkit/WebKit.pro b/src/3rdparty/webkit/WebKit.pro index 6d466e2..84fcb56 100644 --- a/src/3rdparty/webkit/WebKit.pro +++ b/src/3rdparty/webkit/WebKit.pro @@ -8,7 +8,7 @@ SUBDIRS += \ WebCore # If the source exists, built it -exists($$PWD/WebKitTools/QtLauncher): SUBDIRS += WebKitTools/QtLauncher +exists($$PWD/WebKitTools/QtTestBrowser): SUBDIRS += WebKitTools/QtTestBrowser exists($$PWD/JavaScriptCore/jsc.pro): SUBDIRS += JavaScriptCore/jsc.pro exists($$PWD/WebKit/qt/tests): SUBDIRS += WebKit/qt/tests exists($$PWD/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro): SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro -- cgit v0.12