diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-01-07 12:19:02 (GMT) |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-01-07 12:19:02 (GMT) |
commit | 0abf84be1a715db1d6adc5bf21e150e949e0e9e9 (patch) | |
tree | 128297f3532e4c33ebbb6233399bb09f5ed411fb /src/3rdparty/webkit/JavaScriptCore | |
parent | f16556359c24b04afe5af53ddbb80c4392d6dabb (diff) | |
download | Qt-0abf84be1a715db1d6adc5bf21e150e949e0e9e9.zip Qt-0abf84be1a715db1d6adc5bf21e150e949e0e9e9.tar.gz Qt-0abf84be1a715db1d6adc5bf21e150e949e0e9e9.tar.bz2 |
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( b217cdfedc7b5e7581325bda718192247f03dd5d )
Changes in WebKit/qt since the last update:
++ b/WebKit/qt/ChangeLog
2010-01-07 Yongjun Zhang <yongjun.zhang@nokia.com>, Laszlo Gombos <laszlo.1.gombos@nokia.com>
Reviewed by Simon Hausmann.
[Qt] need an API to suspend and resume active Javascript DOM objects.
https://bugs.webkit.org/show_bug.cgi?id=31673
Add suspend and resume DOM objects private API to QWebFrame.
* Api/qwebframe.cpp:
(qt_suspendActiveDOMObjects):
(qt_resumeActiveDOMObjects):
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore')
-rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/ChangeLog | 8 | ||||
-rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h | 10 |
2 files changed, 18 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/ChangeLog b/src/3rdparty/webkit/JavaScriptCore/ChangeLog index a559d9b..1694966 100644 --- a/src/3rdparty/webkit/JavaScriptCore/ChangeLog +++ b/src/3rdparty/webkit/JavaScriptCore/ChangeLog @@ -1,3 +1,11 @@ +2009-11-19 Thiago Macieira <thiago.macieira@nokia.com> + + Reviewed by Simon Hausmann. + + Build fix for 32-bit Sparc machines: these machines are big-endian. + + * wtf/Platform.h: + 2009-12-08 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> Reviewed by Darin Adler. diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h index 3e1093b..4a008cc 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h @@ -218,6 +218,16 @@ #define WTF_PLATFORM_BIG_ENDIAN 1 #endif +/* PLATFORM(SPARC32) */ +#if defined(__sparc) && !defined(__arch64__) || defined(__sparcv8) +#define WTF_PLATFORM_SPARC32 1 +#define WTF_PLATFORM_BIG_ENDIAN 1 +#endif + +#if PLATFORM(SPARC32) || PLATFORM(SPARC64) +#define WTF_PLATFORM_SPARC +#endif + /* PLATFORM(PPC64) */ #if defined(__ppc64__) \ || defined(__PPC64__) |