summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
* 2010-04-14 Kent Hansen <kent.hansen@nokia.com>Kent Hansen2010-05-042-8/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by Maciej Stachowiak. Mac OS X: Use deployment target to determine whether memory tagging should be enabled https://bugs.webkit.org/show_bug.cgi?id=34888 When building on (Snow) Leopard but targeting Tiger (TARGETING_TIGER defined, BUILDING_ON_TIGER not defined), WebKit would crash on Tiger because the tags passed to mmap caused those function calls to fail. Conversely, when building on Tiger but targeting Leopard (BUILDING_ON_TIGER defined, TARGETING_LEOPARD defined), WebKit would crash on Leopard because the tags passed to vm_map and vm_allocate caused those function calls to fail. Solution: Use TARGETING_TIGER rather than BUILDING_ON_TIGER to govern the tag definitions. Use the same tags for vm_map and vm_allocate regardless of target, since they work on both. Fall back to the mmap tags that work on Tiger (that is, "no tags") if targeting Tiger, since those tags also work on Leopard. * wtf/VMTags.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@57583 268f45cc-cd09-0410-ab3c-d52691b4dbfc
* DEF file fixJanne Koskinen2010-04-241-25/+24
| | | | | | | Open C unnecessarily exports inlined getloc. entry removed. Reviewed-by: Shane Kearns (cherry picked from commit 02c65146610cdd5bfe1f3ee4656ba07af82afcc7)
* QtWebkit WINS DEF file freezeJanne Koskinen2010-04-231-1/+27
| | | | | | | Freeze against previous release 4.6.2 to maintain BC. Reviewed-by: Miikka Heikkinen (cherry picked from commit 9cc9da431fd99869a83b91f5be4911e0ead2f15f)
* QtWebKit: Fixes compilation on MSVC 64Jocelyn Turcotte2010-04-223-4/+4
| | | | | | | This patch should be overwritten by the next import of QtWebKit trunk Reviewed-by: TrustMe (cherry picked from commit 594f81c553d52901209c079e2887fb13990ecba4)
* Remove overloaded placement new operatorsJanne Koskinen2010-04-212-2/+0
| | | | | | | WINSCW and Sun OS build fix. placement new is already defined in NonCopyable, no need for overloading. Reviewed-by: Simon Hausmann (cherry picked from commit cc26a3ec5c6bfde206c7354f87bebd36b70e1205)
* WINSCW compiler fix, too eager to solve inlinesJanne Koskinen2010-04-211-2/+4
| | | | | | | | WINSCW tries immediately solve inlines causing forward declared classes to be used before they are defined. Reviewed-by: Simon Hausmann (cherry picked from commit 0d1739197015a651b88d710c9c961eb0f20278f9)
* WINSCW boolean fix for XPATHJanne Koskinen2010-04-212-2/+16
| | | | | | | | WINSCW cannot determine boolean type unless it is explicitly defined. This fix needs to be re-applied always when files are regenerated. Reviewed-by: Simon Hausmann (cherry picked from commit 07aa94196e5ab6827099c683c0be96edbc62e6c0)
* WINSCW compile fix for HashMapJanne Koskinen2010-04-211-4/+4
| | | | | | | | WINSCW with templates function declarations and definitions will have to use same names for variables or you get 'undefined identifier' Reviewed-by: Miikka Heikkinen (cherry picked from commit c16ca6d08d7e3e7a0972aa1975a72882559edb26)
* WINSCW compile fix for WebCoreJanne Koskinen2010-04-211-2/+3
| | | | | | | | WINSCW fails to parse function pointer name if it is not introduced before use. Reviewed-by: Miikka Heikkinen (cherry picked from commit e0314fa999e58a057604cdbd4bd6fdfe5248d75e)
* WebKit; build with change to mediaservices.Justin McPherson2010-04-161-3/+3
| | | | | Reviewed-by: Dmytro Poplavskiy (cherry picked from commit 690e0f27ae23189200d98e9300b63914d8e1fe30)
* Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-161-2/+2
| | | | (cherry picked from commit e85223d233c0e1d6beca748332b8fbaba3ebbf2d)
* Attempt again to fix minGW compile error, while not breaking WinCEJason McDonald2010-04-161-1/+1
| | | | Reviewed-by: Andrew den Exter
* Revert "Revert "Update Phonon ds9 backend to 4.4.0.""Jason McDonald2010-04-1633-999/+624
| | | | This reverts commit 1d267f33d179abbac753a72c2235e7fb07c4def7.
* Revert "Fix previous merge commit."Jason McDonald2010-04-161-3/+0
| | | | This reverts commit ab31654127d7a6e9a06a2c75bc8b2832d68cdfc0.
* Fix compilation: StringImpl has no public, default constructorThiago Macieira2010-04-152-0/+3
| | | | | | | | Error was: platform/text/AtomicStringImpl.h:29: error: base `WebCore::StringImpl' with only non-default constructor in class without a constructor Reviewed-by: Janne Koskinen (cherry picked from commit 42bbbfb3cd36a935d30e7f49f87ab8d7f1d2b53e)
* Fix previous merge commit.Jason McDonald2010-04-151-0/+3
|
* Revert "Update Phonon ds9 backend to 4.4.0."Jason McDonald2010-04-1533-624/+999
| | | | | | | | | | | | | | This reverts commit 19a3fc3bd817628070e5637caf158b0be79eee82. The phonon backend in 4.4.0 is outdated. Qt has the most recent one. Conflicts: src/3rdparty/phonon/ds9/iodevicereader.cpp (cherry picked from commit 6253ced81bcd60c04803f1a52bc59a239022b9c4) Conflicts: src/3rdparty/phonon/ds9/mediaobject.cpp
* QtWebKit: Corrects symbols visibility for JavaScriptCore.Jocelyn Turcotte2010-04-131-0/+4
| | | | | | | | Since it is now a static library, this configuration has to be added explicitely. This patch should be overwritten by the next WebKit import. Reviewed-by: Simon Hausmann
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-133626-151601/+318224
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: QtWebKit: Fix the QWebHistory serialization auto-test Mark QWebFrame::overloadedSlots autotest as expected failure QtWebKit: Fix autotests .qrc file paths when built from tests/auto/qweb* QtWebKit: Build fix for WinCE. Fix the build of webkit examples on platforms without OpenGL and Multimedia QtWebKit: Fix build on mac. QtWebKit: Fix build on WinCE, adding missing include path. QtWebKit: Add missing namespace wrapper temporarily until next import. QtWebKit: fix build with qws temporarily until next import. Update src/3rdparty/webkit from trunk. Fix failing assertions in debug builds Fix the build of webkit examples on platforms without OpenGL and Multimedia QtWebKit: Fix build on mac. QtWebKit: Build fix for WinCE. QtWebKit: Fix build on WinCE, adding missing include path. QtWebKit: Change the dependency from phonon to QtMultimedia. QtWebKit: Add missing namespace wrapper temporarily until next import. QtWebKit: fix build with qws temporarily until next import. Update src/3rdparty/webkit from trunk. QtWebKit: Re-add the dependency to the static linked JavaScriptCore
| * QtWebKit: Fix the QWebHistory serialization auto-testJocelyn Turcotte2010-04-132-9/+16
| | | | | | | | | | | | This patch should be overwritten by the next WebKit import. Reviewed-by: Kent Hansen
| * Mark QWebFrame::overloadedSlots autotest as expected failureKent Hansen2010-04-131-0/+1
| | | | | | | | | | | | | | | | | | It's been failing in WebKit trunk for a long time (forever?), and the fix is not entirely trivial. The expected failure message has the link to the upstream issue, which has more detailed comments. Reviewed-by: Jocelyn Turcotte
| * QtWebKit: Fix autotests .qrc file paths when built from tests/auto/qweb*Jocelyn Turcotte2010-04-1312-10/+20
| | | | | | | | Reviewed-by: TrustMe
| * QtWebKit: Build fix for WinCE.Jocelyn Turcotte2010-04-121-2/+2
| | | | | | | | | | | | | | | | Moved the include of an incompatible header inside platform guard macros. This commit should be overwritten with the next WebKit import. Reviewed-by: Simon Hausmann
| * Fix the build of webkit examples on platforms without OpenGL and MultimediaSimon Hausmann2010-04-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | The QtWebKit module header unconditionally includes QtOpenGL, due to a syncqt bug. Apply the same workaround as in http://trac.webkit.org/changeset/53627 for OpenGL and Multimedia as link time dependencies for QtWebKit. Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
| * QtWebKit: Fix build on mac.Jocelyn Turcotte2010-04-122-8/+14
| | | | | | | | | | | | | | | | | | | | - Enables debug_and_release explicitely since qbase.pri does - Make DESTDIR always go in JavaScriptCore/<configuration>, not dependent on the debug_and_release config - Use different targets for debug and release to prevent file clashes This commit should be overwritten on the next WebKit import Reviewed-by: TrustMe
| * QtWebKit: Fix build on WinCE, adding missing include path.Jocelyn Turcotte2010-04-122-9/+3
| | | | | | | | | | | | This patch should be overwritten on next import from WebKit. Reviewed-by: TrustMe
| * QtWebKit: Add missing namespace wrapper temporarily until next import.Jocelyn Turcotte2010-04-126-0/+13
| | | | | | | | Rubber-stamped-by: Simon Hausmann
| * QtWebKit: fix build with qws temporarily until next import.Jocelyn Turcotte2010-04-122-8/+4
| | | | | | | | Reviewed-by: Simon Hausmann
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qtwebkitStaging-4.7Jocelyn Turcotte2010-04-124-7/+16
| |\
| * | Update src/3rdparty/webkit from trunk.Jocelyn Turcotte2010-04-1264-1038/+1800
| | | | | | | | | | | | | | | | | | | | | | | | Imported from 862268aeb7150d3795d05bfc05f661bb5c598a27 in branch qtwebkit-2.0 of repository git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git Reviewed-by: TrustMe
| * | Fix failing assertions in debug buildsSimon Hausmann2010-04-093-5/+2
| | | | | | | | | | | | | | | | | | Cherry-pick of http://trac.webkit.org/changeset/57320 Don't mix NDEBUG and DEBUG between JSC and WebCore.
| * | Fix the build of webkit examples on platforms without OpenGL and MultimediaSimon Hausmann2010-04-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QtWebKit module header unconditionally includes QtOpenGL, due to a syncqt bug. Apply the same workaround as in http://trac.webkit.org/changeset/53627 for OpenGL and Multimedia as link time dependencies for QtWebKit. Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
| * | QtWebKit: Fix build on mac.Jocelyn Turcotte2010-04-082-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Enables debug_and_release explicitely since qbase.pri does - Make DESTDIR always go in JavaScriptCore/<configuration>, not dependent on the debug_and_release config - Use different targets for debug and release to prevent file clashes This commit should be overwritten on the next WebKit import Reviewed-by: TrustMe
| * | QtWebKit: Build fix for WinCE.Jocelyn Turcotte2010-04-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Moved the include of an incompatible header inside platform guard macros. This commit should be overwritten with the next WebKit import. Reviewed-by: Simon Hausmann
| * | QtWebKit: Fix build on WinCE, adding missing include path.Jocelyn Turcotte2010-04-072-9/+3
| | | | | | | | | | | | | | | | | | This patch should be overwritten on next import from WebKit. Reviewed-by: TrustMe
| * | QtWebKit: Add missing namespace wrapper temporarily until next import.Jocelyn Turcotte2010-04-066-0/+13
| | | | | | | | | | | | Rubber-stamped-by: Simon Hausmann
| * | QtWebKit: fix build with qws temporarily until next import.Jocelyn Turcotte2010-04-062-8/+4
| | | | | | | | | | | | Reviewed-by: Simon Hausmann
| * | Update src/3rdparty/webkit from trunk.Jocelyn Turcotte2010-04-063624-151389/+317257
| | | | | | | | | | | | | | | | | | | | | | | | Imported from 839d8709327f925aacb3b6362c06152594def97e in branch qtwebkit-2.0 of repository git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git Rubber-stamped-by: Simon Hausmann
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-1227-401/+1147
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (54 commits) Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too. Autotest: add some debugging, just in case there's something wrong Autotest: fix the fix for the rounding error. Fix compile error with QT_NO_LIBRARY in QtMultimedia the _setmode() prototype is different on win ce qdoc: Changed qdoc to output the new doc format. Doc: update 'developing on mac' fcntl.h doesn't seem to exist, either - contrary to an example on msdn Autotest: fix paths on the test server after update. Force the repaint during a window resize. fix compile on wince remove CONFIG += ordered again Assistant: Check namespace and virtual folder syntax of help projects. QtHelp: Fix auto tests. Fix a crash when unloading libQtCore Introduce a qconfig feature for QtDBus Fix build after MR 543 merged. Compile on 10.4. revert "Fix the Qt build on Mac OS X/Cocoa 64-bit" Remove expected failures after JavaScriptCore bug fix ...
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-1027-401/+1147
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (54 commits) Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too. Autotest: add some debugging, just in case there's something wrong Autotest: fix the fix for the rounding error. Fix compile error with QT_NO_LIBRARY in QtMultimedia the _setmode() prototype is different on win ce qdoc: Changed qdoc to output the new doc format. Doc: update 'developing on mac' fcntl.h doesn't seem to exist, either - contrary to an example on msdn Autotest: fix paths on the test server after update. Force the repaint during a window resize. fix compile on wince remove CONFIG += ordered again Assistant: Check namespace and virtual folder syntax of help projects. QtHelp: Fix auto tests. Fix a crash when unloading libQtCore Introduce a qconfig feature for QtDBus Fix build after MR 543 merged. Compile on 10.4. revert "Fix the Qt build on Mac OS X/Cocoa 64-bit" Remove expected failures after JavaScriptCore bug fix ...
| | * | revert "Fix the Qt build on Mac OS X/Cocoa 64-bit"Kent Hansen2010-04-081-1/+0
| | | | | | | | | | | | | | | | | | | | It actually broke the build on Mac; another cherry-pick missing maybe. Reverted for now.
| | * | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-073-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-07042010 ( 475f8c67522d8b3f3163dc3a6b24d6083fd0ac19 ) https://bugs.webkit.org/show_bug.cgi?id=36742 gcc for Symbian doesn't support gcc extensions like atomicity.h - disable
| | * | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-073-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-07042010 ( 3b44f0650780e009764ddc0aa6eba7234a85aa72 ) Corrected name of (u)int64_t compile time assert. https://bugs.webkit.org/show_bug.cgi?id=36739
| | * | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-073-8/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-07042010 ( 42ad198e900e439f01d2062ad93d03043c68a309 ) https://bugs.webkit.org/show_bug.cgi?id=36511 <rdar://problem/7753498> Safari freezes when using SPUTNIK JavaScript conformance check
| | * | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-078-359/+823
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-07042010 ( 499bdb98708eba4bd40532c70179bf45b43ad068 ) Fixed <rdar://problem/7728196> REGRESSION (r46701): -(-2147483648) evaluates to -2147483648 on 32 bit (35842)
| | * | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-073-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-07042010 ( d4f1bc6ca356cc64e8991533ee293b4a0b196a3a ) Build fix for SPARC. Fix missing macro value.
| | * | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-074-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-07042010 ( f62e6e4f8e3b3a966543f93ad1cb9030ac2988e6 ) Add virtual memory tags for TCMalloc and WebCore's purgeable buffers.
| | * | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-0711-10/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-07042010 ( 706b04f3796e60078c28335beb5f24a7b27cd328 ) Fix the Qt build on Mac OS X/Cocoa 64-bit [Qt] Symbian specific getCPUTime implemetation https://bugs.webkit.org/show_bug.cgi?id=34742 Fix the SP at ctiOpThrowNotCaught on Thumb2 (JSVALUE32) https://bugs.webkit.org/show_bug.cgi?id=34939 Add missing cast for !YARR (PPC) builds. Implement NEVER_INLINE and NO_RETURN for RVCT https://bugs.webkit.org/show_bug.cgi?id=34740 Typedef both JSChar and UChar to wchar_t in RVCT. https://bugs.webkit.org/show_bug.cgi?id=34560 Get rid of WINSCW hack for UnSpecifiedBoolType https://bugs.webkit.org/show_bug.cgi?id=28054 [Qt] use nanval() for Symbian as nonInlineNaN https://bugs.webkit.org/show_bug.cgi?id=34170
| | * | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-073-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-07042010 ( a24c08469482ad26321d0d4b777747b3ae33963c ) Date.UTC() should apply TimeClip operation. https://bugs.webkit.org/show_bug.cgi?id=34461
| | * | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-073-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-07042010 ( b620465e6f809ddb0f8ed0fb732e9f8498d94755 ) Fix a bug that Math.round() retunrs incorrect results for huge integers https://bugs.webkit.org/show_bug.cgi?id=34462