diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-02-10 11:18:39 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-02-10 11:18:39 (GMT) |
| commit | 72b510e78973e47c31ae60070cb74b41f291b1ec (patch) | |
| tree | 4a803faa536d1ee8ed5780b016516f80bd797572 /src/3rdparty/webkit | |
| parent | caf93a2b6d3df012055ab70ad4bba1bb7b29141d (diff) | |
| download | Qt-72b510e78973e47c31ae60070cb74b41f291b1ec.zip Qt-72b510e78973e47c31ae60070cb74b41f291b1ec.tar.gz Qt-72b510e78973e47c31ae60070cb74b41f291b1ec.tar.bz2 | |
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ffae5e11181a3961193fa21ea405851cad714d4b )
Changes in WebKit/qt since the last update:
* https://bugs.webkit.org/show_bug.cgi?id=34170 -- [Qt] Javascript undefined > 0 returns true on Symbian
Diffstat (limited to 'src/3rdparty/webkit')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/ChangeLog | 13 | ||||
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp | 4 | ||||
| -rw-r--r-- | src/3rdparty/webkit/VERSION | 2 |
3 files changed, 18 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/ChangeLog b/src/3rdparty/webkit/JavaScriptCore/ChangeLog index b943840..6446773 100644 --- a/src/3rdparty/webkit/JavaScriptCore/ChangeLog +++ b/src/3rdparty/webkit/JavaScriptCore/ChangeLog @@ -1,3 +1,16 @@ +2010-02-09 Janne Koskinen <janne.p.koskinen@digia.com> + + Reviewed by Laszlo Gombos. + + [Qt] use nanval() for Symbian as nonInlineNaN + https://bugs.webkit.org/show_bug.cgi?id=34170 + + numeric_limits<double>::quiet_NaN is broken in Symbian + causing NaN to be evaluated as a number. + + * runtime/JSValue.cpp: + (JSC::nonInlineNaN): + 2010-01-07 Norbert Leser <norbert.leser@nokia.com> Reviewed by NOBODY (OOPS!). diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp index 699c1cd..502312c 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp @@ -174,7 +174,11 @@ uint32_t toUInt32SlowCase(double d, bool& ok) NEVER_INLINE double nonInlineNaN() { +#if OS(SYMBIAN) + return nanval(); +#else return std::numeric_limits<double>::quiet_NaN(); +#endif } } // namespace JSC diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index 2b39e81..cc0e04f 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -8,4 +8,4 @@ The commit imported was from the and has the sha1 checksum - 36fe058a9001e6d47f0fd41c6304cdfdf3a735ed + ffae5e11181a3961193fa21ea405851cad714d4b |