summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit
Commit message (Collapse)AuthorAgeFilesLines
* Fix patch to WebKit git repoSimon Hausmann2012-08-251-1/+1
| | | | | Change-Id: Ibb5165f3f4ac4aca23cf28a504b8ef7179b018b1 Reviewed-by: Andras Becsi <andras.becsi@nokia.com>
* Updated WebKit to 9c682c404770cfb2eddf705be593824e06f8ec40Simon Hausmann2012-07-305-2/+11
| | | | | | | | | Prospective build fix for Mac OS X Mountain Lion Change-Id: Ia6e83bba30788cd473bd01f7217e6153970f60be Reviewed-by: Mike McQuaid <mike@mikemcquaid.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Updated WebKit to 0b63152ae5d572c4a817a53210d8907f3dd11bd7Simon Hausmann2012-06-257-995/+1089
| | | | | | | | | | Fresh import from qtwebkit-2.2 branch that includes -Werror fix The bison changes are due to a local bison upgrade. Change-Id: I61a413a5550c748c56b39362e2a0f67c321afb4d Task: QTBUG-23987 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Updated WebKit to 2dea2a19feedc165596b933fe9509ddd0caf4d15Simon Hausmann2012-06-2512-277/+29
| | | | | | | Includes version bump and backport of build fix with newer glib versions Change-Id: I42a7c6c835b3d7ae6e79f30f308b350b67dd1e7b Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
* Updated WebKit to a096458b01a9387719308c99e5917a7b42196078Simon Hausmann2012-05-034-7/+33
| | | | | | | | | | QNX fixes for https://bugs.webkit.org/show_bug.cgi?id=77013 and http://trac.webkit.org/changeset/109105 backported by Nicolas Arnaud-Cormos <nicolas.arnaud-cormos.qnx@kdab.com> Change-Id: I4b57f26bac6ed61a8a48ea6ef4c2dedf0503675b Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
* Updated WebKit to 9c745c625c6d1112cec51d742ecc8c041cc090d7Simon Hausmann2012-04-044-3/+15
| | | | | | | Backport Casper's doc fix from https://bugs.webkit.org/show_bug.cgi?id=82893 Change-Id: I85bd671132fe6e1bb8798960ef0db7f02e10b4b4 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Updated WebKit to c0107296d95cf4f2e988513db42572976ff7d55eSimon Hausmann2012-03-265-79/+95
| | | | | | | Includes windows fix and fixes the shared library version. Change-Id: Ia4b66661323cc4176bdfdf700aa072e9670b3bd2 Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
* Updated WebKit to c1252be57a3f673277c732c0902568111b2f4964Simon Hausmann2012-02-238-7/+32
| | | | | | | QNX build fix. Change-Id: I72b31faba88a569f62667f7803f6c7434ce6b15e Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Various Qt documentation bug fixes (wk 42)artoka2012-01-302-1/+3
| | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18101 Task-number: QTBUG-8673 Task-number: QTBUG-14194 Task-number: QTBUG-9109 Task-number: QTBUG-9466 Task-number: QTBUG-8323 Task-number: QTBUG-7924 Task-number: QTBUG-20355 Task-number: QTBUG-19367 Task-number: QTBUG-21295 Task-number: QTBUG-14554 Task-number: QTBUG-8331 Task-number: QTBUG-8329 Task-number: QTBUG-8786 Task-number: QTBUG-8787 Change-Id: I4b6403df4a0078fa385abbfab5b6c3a94f175295 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Updated WebKit to 7b7ded42f42a558bc5672c2523f9c5689bb975d0Zeno Albisser2012-01-063-4/+4
|
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into ↵Qt Continuous Integration System2011-12-087-6/+23
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: Updated WebKit to 83439de78841f9569ad78e3a84b7b888337b5d18
| * Updated WebKit to 83439de78841f9569ad78e3a84b7b888337b5d18Zeno Albisser2011-12-087-6/+23
| |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-11-2926-0/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Set execution bits for more scripts. Set execution bits for .test files. Fix more permissions (no execute bit). Fix permission (no execute bit). QGraphicsLayoutItem - bound constraint the minimum and maximum size Notify X11 of its resizable state through MWM Hints.
| * | Fix more permissions (no execute bit).Frederik Gladhorn2011-11-2226-0/+0
| | |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-11-251-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Symbian-linux crosscompilation case changes Symbian-linux crosscompilation debug-release align
| * | | Symbian-linux crosscompilation case changesPasi Pentikainen2011-11-241-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | Update the cases to match actual files in Symbian, and add EPOCROOT prefixes to data files in iby. Reviewed-by: Juha Kukkonen Task-number: QTBUG-14361
* | | Webkit: Work around C++11 string literal source incompatibility.hjk2011-11-225-13/+13
|/ / | | | | | | | | | | | | | | | | | | | | ISO/IEC 14882 2.2 Phases of translations: "user defined string literals" are recognized as single preprocessor token in Phase 3, left unchanged by "...preprocessing executed" in Phase 4. Previously, there were no user defined liteal, and the intended concatanation was done in Phase 6 "adjacent string literal tokens are concatenated", after the macro expansion. Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com Task-number: QTBUG-22847
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into ↵Qt Continuous Integration System2011-11-124-6/+28
|\ \ | |/ | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: Re-apply change e3208a8d44423bc3b5c32e2e90f68675e51a3b73 by Andreas Kling Re-apply change 37cde52cb17b57f8ec89c248f06331ed4977e51c by Ademar de Souza Reis Jr Re-apply change 945c44d0865cf44363e6c860995f971ce952dd5f by Ademar de Souza Reis Jr Updated WebKit to 52a11cec052aa40d3bbc06861be1177b649b4a99
| * Re-apply change e3208a8d44423bc3b5c32e2e90f68675e51a3b73 by Andreas KlingAndreas Kling2011-11-091-1/+1
| | | | | | | | Sentences should end with a period! (Poor man's rebuild trigger.)
| * Re-apply change 37cde52cb17b57f8ec89c248f06331ed4977e51c by Ademar de Souza ↵Ademar de Souza Reis Jr2011-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | Reis Jr Workaround MSVC2010 problems when linking QtWebKit Include MSVC2010 in the list of compilers where incremental build is disabled (INCREMENTAL:NO). Change suggested by Simo Falt <simo.falt@nokia.com>
| * Re-apply change 945c44d0865cf44363e6c860995f971ce952dd5f by Ademar de Souza ↵Ademar de Souza Reis Jr2011-11-091-43/+43
| | | | | | | | | | | | | | | | | | | | | | Reis Jr dos2unix on a webkit source file (fix support for Visual Studio) webkit/Source/WebCore/bindings/js/JSExceptionBase.h had CRLF terminations, which Visual Studio didn't like for some reason. Reported by Simo Falt. Patch is also being submited to upstream (webkit.org)
| * Updated WebKit to 52a11cec052aa40d3bbc06861be1177b649b4a99Zeno Albisser2011-11-096-51/+73
| |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into ↵Qt Continuous Integration System2011-11-0314-9/+367
|\ \ | |/ | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: Re-apply change a14033620fab5edca44293ec6dfcc904e2e0eb20 by Andreas Kling Re-apply change 3489808c1dcd157ac09dd6da16bc057b56696d59 by Ademar de Souza Reis Jr Re-apply change 3dd9e66baaa0848bcc2eb7daecf2b63724624358 by Ademar de Souza Reis Jr Updated WebKit to 99371ddc1d61832131835964a753e1c5817f6916
| * Re-apply change a14033620fab5edca44293ec6dfcc904e2e0eb20 by Andreas KlingAndreas Kling2011-11-031-1/+1
| | | | | | | | Sentences should end with a period! (Poor man's rebuild trigger.)
| * Re-apply change 3489808c1dcd157ac09dd6da16bc057b56696d59 by Ademar de Souza ↵Ademar de Souza Reis Jr2011-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | Reis Jr Workaround MSVC2010 problems when linking QtWebKit Include MSVC2010 in the list of compilers where incremental build is disabled (INCREMENTAL:NO). Change suggested by Simo Falt <simo.falt@nokia.com>
| * Re-apply change 3dd9e66baaa0848bcc2eb7daecf2b63724624358 by Ademar de Souza ↵Ademar de Souza Reis Jr2011-11-031-43/+43
| | | | | | | | | | | | | | | | | | | | | | Reis Jr dos2unix on a webkit source file (fix support for Visual Studio) webkit/Source/WebCore/bindings/js/JSExceptionBase.h had CRLF terminations, which Visual Studio didn't like for some reason. Reported by Simo Falt. Patch is also being submited to upstream (webkit.org)
| * Updated WebKit to 99371ddc1d61832131835964a753e1c5817f6916Zeno Albisser2011-11-0315-53/+411
| |
* | QWebElement example missed informationartoka2011-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | In the example there was told to use button.evaluateJavaScript("click()"); which doesn't work. Instead of "click()" it should be "this.click()". Changed to "this.click()". Task-number: QTBUG-17029 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | Merge remote-tracking branch 'qt-doc-review/master'Casper van Donderen2011-10-142-45/+45
|\ \ | |/
| * Sentences should end with a period! (Poor man's rebuild trigger.)Andreas Kling2011-09-221-1/+1
| |
| * Workaround MSVC2010 problems when linking QtWebKitAdemar de Souza Reis Jr2011-09-201-1/+1
| | | | | | | | | | | | | | Include MSVC2010 in the list of compilers where incremental build is disabled (INCREMENTAL:NO). Change suggested by Simo Falt <simo.falt@nokia.com>
| * dos2unix on a webkit source file (fix support for Visual Studio)Ademar de Souza Reis Jr2011-09-201-43/+43
| | | | | | | | | | | | | | | | webkit/Source/WebCore/bindings/js/JSExceptionBase.h had CRLF terminations, which Visual Studio didn't like for some reason. Reported by Simo Falt. Patch is also being submited to upstream (webkit.org)
* | Update translation sources.Casper van Donderen2011-09-291-1/+1
|/ | | | Reviewed-By: Geir Vattekar
* Updated WebKit to 64cce10 (qtwebkit-rc1, week36)Ademar de Souza Reis Jr2011-09-1327-50/+339
| | | | | | | | | | | | | | | | | Changes since last sync: [https://webkit.org/b/59927 #59927]: [SH4] AssemblerLabel does not name a type [https://webkit.org/b/63259 #63259]: Warnings in JSC's JIT on 32 bit [https://webkit.org/b/67254 #67254]: [Qt][DRT] Normalize file:///tmp/LayoutTests in LayoutTestController::pathToLocalResource() [https://webkit.org/b/64527 #64527]: [Qt]Update layout test results for newer Qt 4.8.x [https://webkit.org/b/67644 #67644]: [Qt][Symbian] REGRESSION[94105] DumpRenderTree.exe doesn't build on Symbian [https://webkit.org/b/67784 #67784]: frame-loading-via-document-write.html test cases have extra slash in path [https://webkit.org/b/67958 #67958]: (restricted bug) [https://webkit.org/b/61805 #61805]: (restricted bug) [https://webkit.org/b/64753 #64753]: (restricted bug) [https://webkit.org/b/67364 #67364]: (restricted bug) [https://webkit.org/b/67488 #67488]: (restricted bug) [https://webkit.org/b/67735 #67735]: (restricted bug) [https://webkit.org/b/67748 #67748]: (restricted bug)
* Updated WebKit to a2bd2bb (qtwebkit-2.2-week35)Ademar de Souza Reis Jr2011-09-0626-77/+364
| | | | | | | | | | | | | | | | | Changes since last sync: [https://webkit.org/b/66016 #66016]: [Qt] Add test for correct order of load signals in QWebPage [https://webkit.org/b/28851 #28851]: Emit last progress notification before calling dispatchDidFinishLoad [https://webkit.org/b/67285 #67285]: [Qt] Unskip API test for load signals order [https://webkit.org/b/67307 #67307]: [Qt][Symbian] REGRESSION(93235) Missing .def update [https://webkit.org/b/49448 #49448]: (restricted bug) [https://webkit.org/b/64737 #64737]: (restricted bug) [https://webkit.org/b/64741 #64741]: (restricted bug) [https://webkit.org/b/66015 #66015]: (restricted bug) [https://webkit.org/b/66141 #66141]: (restricted bug) [https://webkit.org/b/66360 #66360]: (restricted bug) [https://webkit.org/b/66699 #66699]: (restricted bug) [https://webkit.org/b/66799 #66799]: (restricted bug) [https://webkit.org/b/67556 #67556]: (restricted bug)
* Updated WebKit to fb3b4700aa5abbb2db471b4f0eb7946ce4850cc4Ademar de Souza Reis Jr2011-08-307-6/+65
| | | | | | Changes since last sync: [https://webkit.org/b/61235 #61235]: JavaScriptCore doesn't build on MinGW-w64 [https://webkit.org/b/67055 #67055]: [Qt] Do not unconditionally use pkg-config in .pro files
* Do not unconditionally use pkg-config in .pro filesRohan McGovern2011-08-262-2/+2
| | | | | | | | | | | Using the first pkg-config in PATH is prone to errors when cross compiling. This is a known issue, and `configure' already avoids using pkg-config for cross compiling (unless -force-pkg-config is used). However, there was previously no way for a .pro file to test whether or not the user had passed -force-pkg-config. Let !contains(QT_CONFIG, no-pkg-config) be used to test whether or not it is safe to run pkg-config.
* 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
generated by cgit v0.12 at 2024-08-23 00:08:19 (GMT)