summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/Source
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Update obsolete external URLsTopi Reinio2015-04-111-1/+1
| | | | | | | | Update external URLs in the documentation for links where the resource is still available online. Change-Id: I99e5d6d7e030f93c3fe8d31cf300077e2897649e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* fix QWebSettings::setUserStyleSheetUrl() not working with windows pathsAshish Kulkarni2014-12-131-1/+1
| | | | | | | | | | | | | | | QWebSettings::setUserStyleSheetUrl() does not work with windows paths that contain drive letters. KURL::path() alone does not handle removing the leading slash from a windows file path. Using QUrl::toLocalFile() will turn ​file:///C:/path into C:/path appropriately This fixes https://bugs.webkit.org/show_bug.cgi?id=34884. Change-Id: I37a1482b67447be6ea6a10966cf59c9159db83cd Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Parse multiple buttons during mouse press and releaseAllan Sandfeld Jensen2014-11-041-3/+5
| | | | | | | | | Copies the logic for parsing mouse buttons from Qt5 QtWebKit so that button clicks when another button is held works. Task-number: QTBUG-42319 Change-Id: If56e20533531fe949eef444eb7e2f747907f5bcc Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Fix DateTime with recent versions of tzdataAllan Sandfeld Jensen2014-09-238-129/+110
| | | | | | | | | An backport of http://trac.webkit.org/changeset/150833 needed for correct time KRAT, YAKT and MOS timezones. Task-number: QTBUG-41422 Change-Id: I6e9d1db690fee8d77faa1d76c836bd7b345ce854 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Restore dirty line logic in RenderInline::destroyAshish Kulkarni2014-05-091-1/+2
| | | | | | | | | | In ea0cb7ad2066d9c3dc695ab2ebe724249b05ca0f the webkit version was upgraded which effectively merged http://trac.webkit.org/changeset/85869 The follow up patch was never merged: http://trac.webkit.org/changeset/86060 associated with ​https://bugs.webkit.org/show_bug.cgi?id=60448 Change-Id: I7dff1733439bb3bcfecc767da9147aa09a3159cf Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix compilation of QtWebKit with MSVC 2013Ashish Kulkarni2014-04-171-2/+2
| | | | | | | | | | Starting with MSVC 2013, more functions are provided. Task-number: QTBUG-34705 Change-Id: I85e35a2486e0bd556f5f16e5911cca5c364273ed (adapted from commit qtscript/24d678ce9c3996f46d1069c2b1193e7ec1083fc8) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix compilation of QtWebKit with MSVC 2012/2013Ashish Kulkarni2014-04-171-0/+16
| | | | | | | | | | For some reason, MSVC 2012/2013 is no longer able to infer the need for both a call to a constructor and a cast of its parameter so we have to give a hint for at least one of these two operations. Task-number: QTBUG-31882 Change-Id: I42b54313ec4f6a83cde28326534c59b93ab3f615 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Remove -fuse-ld=gold from webkit's LFLAGSNiels Ole Salscheider2014-03-131-7/+0
| | | | | | | | | | | This flag is not supported by upstream gcc. Thus the build might fail if the gold linker is found. This fixes https://bugs.webkit.org/show_bug.cgi?id=89312. Change-Id: I931081fccf64a43b32f2aaf2c3ad377391fdad4c Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix building of WebKit's JSC for earlier versions of gcc on MacAndy Shaw2014-03-131-0/+14
| | | | | | | | | | Since building for Carbon typically uses older versions of gcc on older versions of Mac, then we need to revert e3c44790065894f4e7f98ab097fce22c5bcbbd0a partially in order to fix this. Since the original code was just a cleanup then this is safe to do so. Change-Id: Ic662841f53660b763af2bc71cb9b4684fe614063 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* WebKit: Remove video support on OS XBrian Jensen2013-12-094-86/+5
| | | | | | | | | | | | | | | | | WebKit video support on OS X currently relies on QTKit to function properly. This is problematic because QTKit video support in WebKit requires linking against the WebKitSystemInterface specific to each OS X release, thus preventing the same set of Qt binaries from interoprating with several Mac Releases. As a workaround video support is disabled. Back ported from: http://trac.webkit.org/changeset/151546 Task-number: QTBUG-32237 Change-Id: I780062ce5971960dcad7b51e6226dcf7cd7c907f Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* qt webkit: add support for MIPS64 platformsVicente Olivert Riera2013-12-061-6/+11
| | | | | | | | | | qt5webkit is not fixed and this patch cannont be applied to qt5webkit Task-number: QTBUG-35394 Change-Id: Ie2d332345741989a0b4ef93306ca36b42e888c11 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Correct WebKit build path settingsBenjamin Seppke2013-11-281-2/+2
| | | | | | | | Change the WebKit build path settings to point to the correct install location. Change-Id: Idd350a9d873be454d88a01accf3d9fe590cc0103 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Backported fix for WebKit libc++ support on OS X MavricksBrian Jensen2013-11-282-2/+2
| | | | | | | | | | | | | As of OS X 10.9 Mavericks libc++ is the default standard library implementation. This fix is necessary for building WebKit on OS X Mavericks when using libc++. Upstream Change: http://trac.webkit.org/changeset/107489 Task-number: QTBUG-34652 Change-Id: Ieb30c115b85045adc3e82ee039c541c973b72a3c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* WebKit Nullptr type fixes when using libc++Brian Jensen2013-11-283-10/+10
| | | | | | | | | These changes correct the Nullptr type handling for libc++ based system. Task-number: QTBUG-34652 Change-Id: Ied51c8683cce86beb24ed2fef70e99bb4dfc15e5 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix WebKit TimerHeap implementaiton to work with more standard librariesDarin Adler2013-11-282-77/+110
| | | | | | | | | | | | This is necessary to get WebKit to build with more with more STL variants, including libc++. It is based on the upstream WebKit change: http://trac.webkit.org/changeset/92556 Task-number: QTBUG-34652 Change-Id: I31ad9a7af8b1fb21d4186857f63a9fdf58429042 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* [WK1] NPStream::headers not initializedAllan Sandfeld Jensen2013-08-091-0/+1
| | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=119574 Reviewed by Alexey Proskuryakov. Initialize the header field. According to user feedback that should solve some cases of random crashes when loading plugins on Mac and Windows. * plugins/PluginStream.cpp: (WebCore::PluginStream::PluginStream): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@153828 268f45cc-cd09-0410-ab3c-d52691b4dbfc Task-number: QTBUG-32181 Change-Id: I45410e618cf0337ac1b2c8c4bafa572e8e1e0d19 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* [Qt][WK1] navigator.plugins shows too few entries.Michael Brüning2013-08-011-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Backport r153517 from webkit trunk and Qt 5 to Qt 4.8. https://bugs.webkit.org/show_bug.cgi?id=119332 Reviewed by Jocelyn Turcotte. Based on input by Choon Sik Cho. WebPlatformStrategies::getPluginInfo was using the WTF::Vector::resize method wrongly. This patch removes the call to Vector::resize as Vector::append will take care of increasing capacity if needed. * WebCoreSupport/WebPlatformStrategies.cpp: (WebPlatformStrategies::getPluginInfo): Task-Number: QTBUG-30141 Change-Id: Ief250ee98c4c5d2cb5165d6da3d7b43c54cbd7c8 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Bring in WebKit revisions 139553 and 139921.Raphael Kubo da Costa2013-07-021-16/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are primarily useful for getting rid of some libstdc++-specific includes which break the build with libc++, and also for simplifying the code and removing a Darwin-specific code path. r139553 by ossy@webkit.org: Use sync_add_and_fetch instead of gnu_cxx::exchange_and_add https://bugs.webkit.org/show_bug.cgi?id=106729 After r139514 we need atomicIncrement(int64_t volatile*) for all platform. Now the GCC implementation of atomicIncrement() is based on gnu_cxx::exchange_and_add, which doesn't support int64_t type, but sync_add_and_fetch does. Reviewed by Benjamin Poulain. r139921 by benjamin@webkit.org: Use GCC's implementation of atomicIncrement/Decrement on Mac https://bugs.webkit.org/show_bug.cgi?id=106976 Reviewed by Filip Pizlo. wtf/Atomics.h: GCC and LLVM have builtin for atomic ADD and SUB: sync_add_and_fetch, sync_sub_and_fetch. Using them let the compiler just generate the atomic operations inline instead of generating a function call to LibC. It also simplify the code a bit. Cherry-picked from qtwebkit/0baf197 and qtwebkit/801fc96. I'm cherry-picking both revisions together to match what was done in 0de22e80. Change-Id: Ie5c1067980662ff04e8e36d8cf6e9459b7c46aab Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Correct error in Makefile generation for Windows MinGW.v4.8.5Michael Brüning2013-06-061-1/+1
| | | | | | | | | | | | Remove the build_pass check that was added for vcproj generation as it is no longer deemed necessary. See http://trac.webkit.org/changeset/62264 and http://trac.webkit.org/changeset/59266 for context. Task-number: QTBUG-27413 Change-Id: Ie82032cf4b183b31c66defc2d49cc8095989ec8f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Remove Nokia references.Leonard Lee2013-06-042-5/+1
| | | | | | | | | | These Nokia references removed as they are not appropriate. Task-number: QTBUG-31400 Change-Id: Ib80d2c2d28353e74c46e9ead9cde9807dad7022d (cherry-picked from qtdoc/019f96bc47cf56170c125ae90f5fc00059f6665d) (cherry-picked from qtwebkit/d7b8c69ccdd5547b5660be5876dbdedc3ac29548) Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix Qt WebKit build for non-default Xcode setup / Xcode 4.3+Danny Boelens2013-05-311-4/+4
| | | | | | | | | | There's no need to test the full path, the actual name of the SDK will do. This fixes the build in cases where Xcode is not installed in /Developer or when building with Xcode 4.3 or higher (where Xcode is a bundle), because in those cases the SDK's full path does not start with /Developer. Change-Id: I598ba2a5ebaae813f576dc72102d05fe8804a86f Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* WebKit: Fix using macro to determine Mac user agent architectureJonathan Liu2013-03-181-1/+1
| | | | | | | | | | | | Using || operator with #ifdef is incorrect. As a result, the architecture for the user agent is incorrectly set to PPC on an Intel Mac. This is a partial backport of r128775 in WebKit upstream. Task-number: QTBUG-30187 Change-Id: I6842f113fd024ababaf67e76dfee8f93e0988d08 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Updated WebKit to 5fc7dcbe084a8ee8beda11b92dc2111be1285434Simon Hausmann2013-03-133-1/+36
| | | | | | | | | This brings in a fix for QTBUG-30081 as well as a backport of https://bugs.webkit.org/show_bug.cgi?id=103529 Change-Id: Ibcebe76d6999dc304d4c0323bbfa44be93909285 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Updated WebKit to 994432629cb04ffd8e1985dce9e9ed3a89236dd1Simon Hausmann2012-11-233-4/+13
| | | | | | | Includes fix for QTBUG-23258 and bumps the version accordingly Change-Id: Id5dd3c388cf6de88aea1b40bc9bdc2d5d6d80a31 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Updated WebKit to 9c682c404770cfb2eddf705be593824e06f8ec40Simon Hausmann2012-07-302-0/+9
| | | | | | | | | 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-255-993/+1087
| | | | | | | | | | 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-259-275/+18
| | | | | | | 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-032-5/+31
| | | | | | | | | | 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-042-1/+13
| | | | | | | 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-263-77/+93
| | | | | | | 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-236-5/+30
| | | | | | | 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-061-2/+2
|
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into ↵Qt Continuous Integration System2011-12-084-4/+13
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: Updated WebKit to 83439de78841f9569ad78e3a84b7b888337b5d18
| * Updated WebKit to 83439de78841f9569ad78e3a84b7b888337b5d18Zeno Albisser2011-12-084-4/+13
| |
* | 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-121-4/+6
|\ \ | |/ | | | | | | | | | | | | | | | | 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-093-49/+51
| |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into ↵Qt Continuous Integration System2011-11-0311-7/+354
|\ \ | |/ | | | | | | | | | | | | | | | | 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-0312-51/+398
| |
generated by cgit v0.12 at 2025-02-23 11:26:49 (GMT)