summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit
Commit message (Collapse)AuthorAgeFilesLines
* Updated WebKit to dda59e50379214c098f365a39c4d64b39ced427eAdemar de Souza Reis Jr2011-08-268-78/+69
|
* Updated WebKit to 85d4df147ac7b239497b05979a51fd6fde7580fdAdemar de Souza Reis Jr2011-08-258-2/+14
| | | | | This time also including WebKitLibraries/*.a, needed for the Mac build.
* Updated WebKit to 836fa24be73978fb292e954abb151fb46b1d97e0Ademar de Souza Reis Jr2011-08-2547-71/+1312
|
* Updated WebKit to 4277f8277b1daf3ec33c996f5a760ccd1113af4bAdemar de Souza Reis Jr2011-08-18301-22/+392
| | | | | This time including webkit/include/ files generated on a Mac (thanks to Alexis Menard).
* Updated WebKit to 8ed79cb10ca72b5d240beae674a7932963cbd007Ademar de Souza Reis Jr2011-08-114-2/+12
| | | | Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
* Updated WebKit to 66b76cdb8ef823f27a8229c5cae2d35e7f2d3c59Ademar de Souza Reis Jr2011-08-11139-4752/+8663
| | | | Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
* Updated WebKit to a52dbae362a295e0adfb7ee4fdc21734ae4b7b45Alexis Menard2011-06-296-14/+109
| | | | Reviewed-by: Andreas Kling
* 2011-05-23 Matthew Delaney <mdelaney@apple.com>Alexis Menard2011-06-294-21/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by Simon Fraser. Remove safeFloatToInt() in FloatRect.cpp and replace with working version of clampToInteger() https://bugs.webkit.org/show_bug.cgi?id=58216 * wtf/MathExtras.h: (clampToInteger): (clampToPositiveInteger): 2011-05-23 Matthew Delaney <mdelaney@apple.com> Reviewed by Simon Fraser. Remove safeFloatToInt() in FloatRect.cpp and replace with working version of clampToInteger() https://bugs.webkit.org/show_bug.cgi?id=58216 No new tests. The SVG tests mask-excessive-malloc.svg and pattern-excessive-malloc.svg exercise this code path. * platform/graphics/FloatRect.cpp: (WebCore::enclosingIntRect): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@87103 268f45cc-cd09-0410-ab3c-d52691b4dbfc Signed-off-by: Alexis Menard <alexis.menard@nokia.com>
* 2011-06-28 Alexis Menard <alexis.menard@openbossa.org>Alexis Menard2011-06-283-5/+17
| | | | | | | | | | | | | | | | Reviewed by Andreas Kling. [Qt] Use <QtX/x.h> style of headers for Qt tests which rely on it. https://bugs.webkit.org/show_bug.cgi?id=63562 Some Qt auto-tests rely on <QtX/x.h> types of includes. * Api/qwebkitplatformplugin.h: * symbian/platformplugin/qwebkitplatformplugin.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@89958 268f45cc-cd09-0410-ab3c-d52691b4dbfc Signed-off-by: Alexis Menard <alexis.menard@nokia.com>
* 2011-06-27 Joe Wild <joseph.wild@nokia.com>Alexis Menard2011-06-282-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by Simon Fraser. Crash on www.crave.cnet.com in FrameView::windowClipRect() https://bugs.webkit.org/show_bug.cgi?id=56393 Tests that a plugin of a swf file in a hidden iframe will not crash. This test required more than 1 content file and a timeout or else it would not repeat the error condition. This test will only crash on platforms (like Symbian) that don't allow nonvirtual functions to have a null this pointer. * plugins/hidden-iframe-with-swf-plugin-expected.txt: Added. * plugins/hidden-iframe-with-swf-plugin.html: Added. * plugins/resources/iframe-content-with-swf-plugin.html: Added. 2011-06-27 Joe Wild <joseph.wild@nokia.com> Reviewed by Simon Fraser. Crash on www.crave.cnet.com in FrameView::windowClipRect() https://bugs.webkit.org/show_bug.cgi?id=56393 Check for a null renderer to fix a crash. This situation can arise when external content/plugins is referenced from html elements with style="display:none". Test: plugins/hidden-iframe-with-swf-plugin.html * page/FrameView.cpp: (WebCore::FrameView::windowClipRect): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@89876 268f45cc-cd09-0410-ab3c-d52691b4dbfc Signed-off-by: Alexis Menard <alexis.menard@nokia.com>
* 2011-06-28 Alexis Menard <alexis.menard@openbossa.org>Alexis Menard2011-06-284-3/+17
| | | | | | | | | | | | | | | | | | Reviewed by Andreas Kling. [Qt] Use QtQuick imports in Api tests rather than old deprecated Qt 4.x imports. https://bugs.webkit.org/show_bug.cgi?id=63533 We need to use the new QtQuick 1.x imports rather than the old deprecated version. * tests/qdeclarativewebview/resources/webviewbackgroundcolor.qml: * tests/qdeclarativewebview/resources/webviewtest.qml: * tests/qdeclarativewebview/resources/webviewtestdefault.qml: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@89923 268f45cc-cd09-0410-ab3c-d52691b4dbfc Signed-off-by: Alexis Menard <alexis.menard@nokia.com>
* Updated WebKit to d30a30ac4faadcb8b2e282e343c921f919fbca9bAlexis Menard2011-06-2752-2120/+2901
| | | | | | Beta1 of QtWebkit 2.2. Reviewed-by: Andreas Kling
* Updated WebKit to 631751dee41f81af4daa7821f98b1ce8667c4d90Alexis Menard2011-06-2221-76/+530
| | | | Reviewed-By: Andreas Kling
* Updated WebKit to 0de6fbe7d7714e4d2520f84a7d7e0c5ed9a55114Alexis Menard2011-06-2061-1682/+1556
|
* Attempt to get Symbian building with SQLite.Andreas Kling2011-06-101-0/+9
|
* Make the headers test pass by including QtGui/QColor instead of QColor.Andreas Kling2011-06-101-1/+1
|
* Fix the in-tree build by not letting qtbase.pri add explicitlib or staticlib ↵Andras Becsi2011-06-091-0/+5
| | | | | | to CONFIG. Reviewed by Andreas Kling
* Hack RenderBlock's continuation() and setContinuation() for RVCT 2.x.Andreas Kling2011-06-081-2/+2
|
* Use WTF::notFound instead of -1 to check for Vector::find() errors.Andreas Kling2011-06-081-2/+2
|
* The autotests don't even build on Symbian, skip them for now.Andreas Kling2011-06-081-1/+3
|
* Hack SystemTimeWin.cpp to build on MSVC2005.Andreas Kling2011-06-081-0/+4
|
* Make Float32Array and Int16Array build on RVCT 2.x.Andreas Kling2011-06-082-3/+5
| | | | Partial merge of <http://trac.webkit.org/changeset/88336>.
* Fix build with RVCT 2.xAndreas Kling2011-06-071-1/+2
|
* Updated WebKit to cbc99535043a2abc98d6701943595f52fbaf5b19Andreas Kling2011-06-064-4/+14
| | | | Reviewed-by: Alexis Menard
* Updated WebKit to 4e7dfbab30278b0427e699baaadbf3e5aab88203Alexis Menard2011-06-0365-367/+1772
| | | | Reviewed-by: Andreas Kling
* Updated WebKit to dbda3e9596b836ab6eb88c500766dba6745759beAlexis Menard2011-06-0313-12/+143
|
* Some qmake black magic to pick up the right file.Alexis Menard2011-06-031-1/+0
| | | | | | I deleted the old hack of Andreas, it's not needed. Reviewed-by: Andreas Kling
* Add a dummy Source.pro that simply includes WebKit.proAndreas Kling2011-06-031-0/+1
| | | | | | This is my sneaky attempt at making Symbian build. Reviewed-by: Alexis Menard
* Updated WebKit to 7e7119292e94f55a66d391cd183a4dd6ec1a8d65Alexis Menard2011-06-028-119/+5
| | | | Reviewed by: Andreas Kling
* Updated WebKit to 7e7119292e94f55a66d391cd183a4dd6ec1a8d65Alexis Menard2011-06-0282-4251/+1705
| | | | Reviewed-by: Andreas Kling
* Updated WebKit to efbf910ad7c49e8cdf81411b4ac0abeea0efd8f8Alexis Menard2011-06-0219-58/+324
| | | | Reviewed by: Andreas Kling
* Updated WebKit to 9b4474ac44ee2f3311b435bd45630f5c2c357217Alexis Menard2011-06-012-0/+251
|
* Updated WebKit to 9b4474ac44ee2f3311b435bd45630f5c2c357217Alexis Menard2011-05-3115-131/+58
|
* Make QtWebKit build properly. QtWebKit is not just build by WebCore.pro butAlexis Menard2011-05-312-127/+0
| | | | | | | | by QtWebKit.pro. We should read that one instead. I also removed some files which should not be here. Reviewed by: Andreas Kling
* Updated WebKit to 65360d3d3377f120aecccf1bf9b9ae9444d488e1Alexis Menard2011-05-3127-72/+232
|
* Updated WebKit to af58e9520937cc6fc3e31fe5d6682d19842e044dAlexis Menard2011-05-3119-37/+217
|
* Updated WebKit to d14495f006a09eaee01d155fa57c80537408a835Alexis Menard2011-05-309313-0/+2836062
| | | | Reviewed-by: Andreas Kling
* Remove old QtWebKit.Alexis Menard2011-05-305254-1758183/+0
| | | | Reviewed-by: Andreas Kling
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-182-10/+9
|\ | | | | | | | | | | | | | | | | Conflicts: qmake/generators/makefile.cpp qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/global/qnamespace.h src/gui/text/qtextcontrol.cpp
| * Enable webkit build for the makefile build system with gcceLiang Qi2011-04-072-10/+9
| | | | | | | | | | | | | | Task-number: QTBUG-18484 Task-number: WEBKIT-57841 Reviewed-by: axis Reviewed-by: Janne Koskinen
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-221-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/positioners/layoutdirection/layoutdirection.qml src/corelib/global/qglobal.h src/plugins/qpluginbase.pri src/qbase.pri src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
| * Bump Qt version to 4.7.4Timo Turunen2011-03-211-2/+2
| | | | | | | | Reviewed-by: Trust Me
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-2/+2
|\ \ | |/ | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * Bump Qt version to 4.7.3Timo Turunen2011-03-091-2/+2
| | | | | | | | Reviewed-by: Trust Me
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-231-2/+2
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac.mm src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def src/testlib/qtestcase.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-201-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (21 commits) Autotest: make at least one update before checking if more are needed Fix warning about id maybe used when uninitialised Doc: setSslConfiguration also sets the CA certificates Autotest: check that the type received is the expected one Attempt to fix symbian 3.1 and 3.2 compile break. Prevents crashing when ICO file has bad color table value directfb: fix crash in client/server mode of qws Make Qt/DirectFB less verbose about failing to load pixmaps. Autotest: don't use the deprecated signal from QDBusConnectionInterface Autotest: be nicer to the subprocess and SIGTERM it Fix warnings in QtDeclarative Autotest: avoid memory leaks if test fails QtDBus: Make sure we can receive unknown types QtDBus meta object: keep methods, signals and props with unknown types Autotest: add a new test for parsing an introspection with unknown types Make the QtDBus parser not complain about unknown things fix-layer-getsurface-result-check-for-screen-size-determination Bump QtWebKit version to 2.0.2 SSL: fix memory leak when loading certificates on Mac OS X Add a mutex to protect the access to the QSet. ...
| | * Bump QtWebKit version to 2.0.2Ademar de Souza Reis Jr2011-02-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | QtWebKit 2.0.1 was part of Qt-4.7.1, QtWebKit as included in 4.7.2 should be 2.0.2. Merge-request: 1095 Task-number: QTBUG-17480 Reviewed-by: Jason McDonald
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-181-1/+1
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-181-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Changed the localized vendor name for Qt SIS packages to "Nokia"
| | * Changed the localized vendor name for Qt SIS packages to "Nokia"Eckhart Koppen2011-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The previously used name "Nokia, Qt" was not usable for Nokia Content Signing, which only allows "Nokia" as the visible vendor name. The unique vendor ID remains as "Nokia, Qt" Reviewed-by: TrustMe
generated by cgit v0.12 at 2024-12-03 09:43:49 (GMT)