summaryrefslogtreecommitdiff
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Fix cast from QByteArray to QStringv5.3.0-rc1v5.3.0release5.3.0Allan Sandfeld Jensen2014-04-161-1/+1
| | | | | | | | QUrl::toEncoded() returns a QByteArray which we should not try to append directly to a QString. Instead convert it first from ascii/latin1. Change-Id: I54fd1ef939cf25c81ad4f4ceab91fc4053b627ba Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Flash of garbage pixels when playing a show on HuluSimon Fraser2014-04-162-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <https://webkit.org/b/119871> Source/WebCore: Reviewed by Tim Horton. When starting a show on Hulu, there's a layer that gets marked as opaque because it has a child RenderLayer whose background fills the compositing layer. That child RenderLayer was recently position:fixed but outside the viewport, so its viewportConstrainedNotCompositedReason was set to a non-zero value. However, we failed to clear the viewportConstrainedNotCompositedReason when the layer became non-fixed. This caused painting the opaque layer to bail in RenderLayer::paintLayer(), leaving garbage. Test: compositing/contents-opaque/fixed-to-nonfixed.html * rendering/RenderLayer.cpp: (WebCore::RenderLayer::paintLayer): Add an assertion to catch this error in future. * rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::updateBacking): Make sure we clear the ViewportConstrainedNotCompositedReason if the layer is no longer fixed. Change-Id: Ie1aa935b8271cd8cc3159f5337d483a77d74b8a0 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154147 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Crash when submitting form in a document with null encodingRyosuke Niwa2014-04-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=123975 Reviewed by Alexey Proskuryakov. Source/WebCore: Merge https://chromium.googlesource.com/chromium/blink/+/bba01a7fff09e3053ada96ababac2a6e4261fe5f The CString object which is passed to normalizeLineEndingsToCRLF() can be a null string. It is created in FormDataList::appendString(), and it produces a null CString if FormDataList::m_encoding is a null encoding. Test: fast/forms/form-submit-in-image-document.html * platform/text/LineEnding.cpp: (internalNormalizeLineEndingsToCRLF): Change-Id: Ia36bcf292fb4d1da7e4bb21e2eddf1146eecd71c git-svn-id: http://svn.webkit.org/repository/webkit/trunk@158868 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Fix build on AndroidAllan Sandfeld Jensen2014-04-161-3/+0
| | | | | | | | | | Atomic increment/decrement was defined twice on Android, and gamepad support doesn't build. This removesthe redundant definition, and disables gamepad support on android. Change-Id: I62ceae141564c4dec7a1b941ef832889e82736fb Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Sérgio Martins <sergio.martins@kdab.com>
* [mips] Fix or32 implementation in macro assembler.Julien Brianceau2014-04-081-1/+3
| | | | | | | | This patch fixes JavaScript issues for the mips backend, especially in the DFG stage when using (x|0) expressions. Change-Id: I4c7c7280735481dc06ca24745d2e42b2d8e13ef5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix wrong VK keycodesAllan Sandfeld Jensen2014-04-031-2/+3
| | | | | | | | The two paren keycodes were reversed and the exclam key was not mapped Task-number: QTBUG-38031 Change-Id: I5614ed85a4c99792ca684bc4f1188631ccaa45d3 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix warnings found by the headerclean testThiago Macieira2014-04-022-4/+4
| | | | | | | Extra semi-colons at the end of lines, arguments shadowing members, etc. Change-Id: I8163ed42da31b6a5bb37a56d8cf4c7b2e32139d3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix compilation: missing typedef for uint32_tThiago Macieira2014-04-021-0/+1
| | | | | | | status.cc:12:3: error: ‘uint32_t’ was not declared in this scope Change-Id: Id6ea656937f8db39976603a504bcdd0c7559e488 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Set image drag hotspot from drag image origin.Allan Sandfeld Jensen2014-03-281-3/+4
| | | | | | | | | | | QtWebKit does not currently set the drag image origin, this cause any dragged image to always visibly jump as soon as the drag start. By setting the hotspot any dragged image will start at its origin and only move when then the mouse moves. Change-Id: I6cdfa1bdbcf79a63f26fc62442978f65aabd493b Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Fix crash on access of dead QMimeDataAllan Sandfeld Jensen2014-03-282-39/+27
| | | | | | | | | | | | | | | When we give a QMimeData to the system pasteboard, we should no longer access it locally. This patch ensures we invalidate the pointer to the QMimeDate once it has been uploaded to the system clipboard. To ensure we can still read values we have writen, the code to read the pasteboard data will now read it from the system pasteboard when applicable. Several places the latter was done manually have been removed. Task-number: QTBUG-37904 Change-Id: I9c37b2fcc58ebbc387319be39c190fd7db6f70eb Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix loading nested mpegurls using GStreamerAllan Sandfeld Jensen2014-03-271-7/+24
| | | | | | | | | | | | | | | | | | If gstreamer tries to load an http source, we currently lose the context of where it is loaded from, which causes the load to fail. This patch caches a loading context when one is set on the outer most appsrc, and uses that for gstreamer requests until the outer most source is unloaded. This can have consequences if multiple webviews are open at the same time with different QNetworkAccessManagers, but this is considered unusual, and wouldn't work with the QtMultimedia either. Task-number: QTBUG-37636 Change-Id: I9d3b4d10705254629bc5fce7d76765077585caa2 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Mention default encoding for QML WebView loadHtml method in docs.Michael Brüning2014-03-251-0/+4
| | | | | | | | | | The fact that the html string will be implicitly converted to UTF-16 led to some errors with loaded resources. Task-number: QTBUG-36656 Change-Id: I6ed36e2e814034cfccb4082c24e3327674e04cdf Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Doc: Put \qtvariable in module page backv5.3.0-beta1Sergio Ahumada2014-03-211-0/+1
| | | | | | | | | It was removed by d441d6f39bb846989d95bcf5caf387b42414718d for some reason. Change-Id: I333cf71dc5bf69b3a1f5aa04f5089e9fbd617c6b Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Fix static buildsAllan Sandfeld Jensen2014-03-191-0/+2
| | | | | | | | | Disable WebKit2 since WTF from qtdeclarative conflicts with ours, and renable use of thin archives for static builds, except only use it for the intermediate staticlibs. Change-Id: Iee625c5d25f01d1700d4c89028578e4d1288e2ba Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix compiler warnings when building Qt WebKitAllan Sandfeld Jensen2014-03-183-87/+91
| | | | | | | | Fix warnings about C++11 violating syntax, unused variables in leveldb and non anynomous classes deriving from anonymous ones. Change-Id: I39326eed03fabe2856f1ea7c93eff65f30ee78ee Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix build: LLIntAssembly.h is in a subdir of generated/Thiago Macieira2014-03-171-1/+2
| | | | | | | | | ruby /home/thiago/src/qt/qt5/qtwebkit/Source/JavaScriptCore/offlineasm/asm.rb /home/thiago/src/qt/qt5/qtwebkit/Source/JavaScriptCore/llint/LowLevelInterpreter.asm LLIntOffsetsExtractor generated/LLIntOffsetsExtractor/LLIntAssembly.h offlineasm: Parsing /home/thiago/src/qt/qt5/qtwebkit/Source/JavaScriptCore/llint/LowLevelInterpreter.asm and LLIntOffsetsExtractor and creating assembly file generated/LLIntOffsetsExtractor/LLIntAssembly.h. Change-Id: If12f1476de74c3feeb5c6d6e2e115829e1106581 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix a documentation oversightPierre Rossi2014-03-171-2/+2
| | | | | | | | | We had forgotten a few substitutions in the process it would seem. Change-Id: I37297c39bea84b0d277784edb80e72eab8de7ca7 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Fix doc warningsJocelyn Turcotte2014-03-179-51/+20
| | | | | | | | | | - Qt for Embedded Linux Requirements isn't available since Qt5 - NOTIFY signal documentations are now ignored and are part of their property - The QtQuick1 WebView code isn't available anymore - Adjust to other renamed and removed pages Change-Id: Ife04becb1a847fb0bfb11dfafa6db2caa36aa9f0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix link and image draggingAllan Sandfeld Jensen2014-03-121-11/+47
| | | | | | | | Ensure we can drag and drop images, and fix copying and dragging of links so the link title is correctly preserved. Change-Id: Ib257ee67405ac259c72387616b5d620b163c07b0 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix dragging of selectionsAllan Sandfeld Jensen2014-03-121-19/+27
| | | | | | | | | | A regression from (r151091) broke drag and drop of selections. This patch restores the maintenance of the m_writableData which is used by DragClientQt. Task-number: QTBUG-37314 Change-Id: I9afa193daec53d8d5affa560b8f225bb7dc79470 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix crash with rendering sliders that have anonymous nodes.Michael Brüning2014-03-101-1/+1
| | | | | | | | Added a check to no longer unconditionally call Node::toInputElement. Task-number: QTBUG-37029 Change-Id: I905dba35c19d4adb6652bbeaad77998560e36119 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix the webkit build with icu on Mac OS X 10.9.Michael Brüning2014-03-101-1/+1
| | | | | | | | | | | | The QtWebKit build on OS X 10.9 was failing due to the wrong headers being used for ICU. WebKit uses the system ICU libraries and includes the headers for this from the WebKit source. Fixed by changing the include path order for the QtWebKit build. Task-number: QTBUG-35667 Change-Id: Ic68991535457c1fc318b54f6830de352399dd5c4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix missing image in QWebView class documentation.Michael Brüning2014-03-102-1/+1
| | | | | | | | | | Add a current image of a QWebView showing the Qt Project Homepage previewed in Qt Creator. Task-number: QTBUG-37208 Change-Id: Iedfee6965aa0ef35ba2a532a937e8054c4a0a9d5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com> Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Fix documentation of the selector APIAllan Sandfeld Jensen2014-03-103-5/+22
| | | | | | | | | | | We support all CSS selectors WebKit supports since the methods map internally to the DOM Selectors API. We should therefore update the documentation to claim more than CSS2 selector support. Task-number: QTBUG-37208 Change-Id: I4eae7c897f13bbb17221995ef764020d9341d1f8 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Use qmake optimize_fullAllan Sandfeld Jensen2014-03-102-8/+2
| | | | | | | | | | Qmake now has new config optimize_full that replaces -O2 with -O3. We should use that in QtWebKit instead of trying to do the same ourselves. This makes clang now use -O3 like gcc does. Change-Id: I3db6167833c579bdea941d3ad1b3636cbad62475 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Fix crash in BitmapImage::destroyDecodedData()Laszlo Vidacs2014-03-101-1/+5
| | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=116494 Patch by Laszlo Vidacs <lac@inf.u-szeged.hu> on 2013-11-07 Reviewed by Csaba Osztrogonác. Merge from https://chromium.googlesource.com/chromium/blink/+/6b6887bf53068f8537908e501fdc7317ad2c6d86 * platform/graphics/BitmapImage.cpp: (WebCore::BitmapImage::destroyDecodedData): Change-Id: Ifa093a86c9cf2bfb8df29bc021c58c9c80eeaece git-svn-id: http://svn.webkit.org/repository/webkit/trunk@158840 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Assertion failure in Range::processContentsBetweenOffsetsRyosuke Niwa2014-03-101-2/+4
| | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=122777 Reviewed by Darin Adler. Source/WebCore: Merge https://chromium.googlesource.com/chromium/blink/+/c15de182774c7859c20d97126eb844ae97b792a4 This patch changes ASSERT statements for checking |endOffset| inbound in Range::processContentsBetweenOffsets() to limit |endOffset|. This is necessary when DOMNodeRemovedFromDocument event handler splits text nodes, Range::insertNode() on text node, in the range calling Range::deleteContents(). Test: fast/dom/Range/range-delete-contents-mutation-event-crash.html * dom/Range.cpp: (WebCore::Range::processContentsBetweenOffsets): Change-Id: Ibafd4e42cfc50b0a386f31a0c1b49072cdb220d5 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@157431 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* REGRESSION (r139343): WebKit crashes when canceling a load insideAndy Estes2014-03-101-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <https://webkit.org/b/119853> webView:resource:didFinishLoadingFromDataSource: Reviewed by Brady Eidson. Source/WebCore: A client implementing webView:resource:didFinishLoadingFromDataSource: might decide to call stopLoading: for the identifier that just finished loading. If this happens we re-enter the loader and attempt to cancel a load that has already finished and been removed from the set of active loaders. Prevent this by clearing DocumentLoader's m_identifierForLoadWithoutResourceLoader before calling dispatchDidFinishLoading(). New API test: WebKit1.StopLoadingFromDidFinishLoading. * loader/DocumentLoader.cpp: (WebCore::DocumentLoader::finishedLoading): Set m_identifierForLoadWithoutResourceLoader to 0 before calling dispatchDidFinishLoading(). Tools: Wrote an API test that verifies -[WebView stopLoading:] can be called inside webView:resource:didFinishLoadingFromDataSource: without crashing. * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * TestWebKitAPI/Tests/mac/StopLoadingFromDidFinishLoading.mm: Added. (-[StopLoadingFromDidFinishLoadingDelegate webView:resource:didFinishLoadingFromDataSource:]): (TestWebKitAPI::TEST): Change-Id: Ib5da6cfdd74eac0e284a512ee54e74353aba783b git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154115 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Compile fix for Win64 with jit disabled.achristensen@apple.com2014-03-071-1/+1
| | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=119804 Reviewed by Michael Saboff. * offlineasm/cloop.rb: Added std:: before isnan. Change-Id: Ie7d922b7d6a0f45619a77029b07804aef5d01076 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154066 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* JSObject::putDirectIndexBeyondVectorLengthWithArrayStorage does a check on ↵Mark Hahnenberg2014-03-071-2/+2
| | | | | | | | | | | | | | | | | the length of the ArrayStorage after possible reallocing it https://bugs.webkit.org/show_bug.cgi?id=120278 Reviewed by Geoffrey Garen. Source/JavaScriptCore: * runtime/JSObject.cpp: (JSC::JSObject::putDirectIndexBeyondVectorLengthWithArrayStorage): Change-Id: I034d6950683304d08a4e076d58fb1b999ade444b git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154633 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Setting a large numeric property on an object causes it to allocate a huge ↵Mark Hahnenberg2014-03-072-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backing store https://bugs.webkit.org/show_bug.cgi?id=118914 Reviewed by Geoffrey Garen. Source/JavaScriptCore: There are two distinct actions that we're trying to optimize for: new Array(100000); and: a = []; a[100000] = 42; In the first case, the programmer has indicated that they expect this Array to be very big, so they should get a contiguous array up until some threshold, above which we perform density calculations to see if it is indeed dense enough to warrant being contiguous. In the second case, the programmer hasn't indicated anything about the size of the Array, so we should be more conservative and assume it should be sparse until we've proven otherwise. Currently both of those cases are handled by MIN_SPARSE_ARRAY_INDEX. We should distinguish between them for the purposes of not over-allocating large backing stores like we see on http://www.peekanalytics.com/burgerjoints/ The way that we'll do this is to keep the MIN_SPARSE_ARRAY_INDEX for the first case, and introduce a new heuristic for the second case. If we are putting to an index above a certain threshold (say, 1000) and it is beyond the length of the array, then we will use a sparse map instead. So for example, in the second case above the empty array has a blank indexing type and a length of 0. We put-by-val to an index > 1000 and > a.length, so we'll use a sparse map. This fix is ~800x speedup on the accompanying regression test :-o * runtime/ArrayConventions.h: (JSC::indexIsSufficientlyBeyondLengthForSparseMap): * runtime/JSObject.cpp: (JSC::JSObject::putByIndexBeyondVectorLengthWithoutAttributes): (JSC::JSObject::putByIndexBeyondVectorLengthWithArrayStorage): (JSC::JSObject::putByIndexBeyondVectorLength): (JSC::JSObject::putDirectIndexBeyondVectorLengthWithArrayStorage): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@153374 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: I1c29992d6e09c9d523a8093e76e3848a9581ce45 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Implement Qt port for for leveldbAllan Sandfeld Jensen2014-03-066-10/+632
| | | | | | | | Replace the pthread/posix port classes in leveldb with a Qt port. This should enable us to use leveldb on all Qt platforms. Change-Id: Ie467f1c23ac28c436d26fb8fdc06c09ce70aff7d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Set correct virtual keycode for the apostrophe keyAllan Sandfeld Jensen2014-03-061-0/+1
| | | | | | | | | We currently set the virtual keycode to 0 for the apostrophe key, but it should use the same keycode as double-quote. Task-number: QTBUG-37280 Change-Id: Ic69c3f117c3f5f2ee3b5b1a77ce1c0b173c3a456 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Fix rendering of WebKit2 QML WebView with ANGLE.Michael Bruning2014-03-061-2/+2
| | | | | | | | | | | | | | | | The WebKit2 QML WebView was not rendered on ANGLE builds due to a precision mismatch for a uniform matrix used in in both vertex and fragment shaders which made the ANGLE compiler bail out on linking the shader program. This was fixed by overriding the precision to highp in both shaders. Task-number: QTBUG-37043 Change-Id: I79f331e84448f537daef15a4490bb5df40113f89 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Do no allow arbitrarily large buffer during loadingAllan Sandfeld Jensen2014-03-042-7/+22
| | | | | | | | | | | | If the network is faster or we get a cache-hit, we can currently end up processing very large QByteArrays. To lower the maximum memory pressure and improve caching, we should limit the maximum size of the buffers. Task-number: QTBUG-36979 Change-Id: I681e764d95db75aa846de2df8b84ac6630872afb Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Avoid deleting QtWebComboBox it's own nested QEventLoopAllan Sandfeld Jensen2014-03-043-2/+28
| | | | | | | | | | A race condition meant that sometimes a QtWebComboBox would be deleted in an eventloop run while hiding itself. This patch adds a flags and delays scheduling a deletion until after the nested eventloop. Task-number: QTBUG-29844 Change-Id: Ia5e03954756afa29c0be0a2d7f49ae8d1dbba250 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Enable changing the cursor for the QQuickWebView.Michael Brüning2014-03-031-2/+1
| | | | | | | | Implements setting the platform cursor in QtPageClient. Task-number: QTBUG-36368 Change-Id: I0ec2dc5eae550a7fa1197587f85c3f84b3225240 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Use moveDoubleToInts in SpecializedThunkJIT::returnDouble for non-X86 ↵Julien Brianceau2014-03-031-0/+5
| | | | | | | | | | | | | | | | | | | | JSVALUE32_64 ports. https://bugs.webkit.org/show_bug.cgi?id=124936 Patch by Julien Brianceau <jbriance@cisco.com> on 2013-11-29 Reviewed by Zoltan Herczeg. The moveDoubleToInts implementations in ARM, MIPS and SH4 macro assemblers do not clobber src FPRegister and are likely to be more efficient than the current generic implementation using the stack. * jit/SpecializedThunkJIT.h: (JSC::SpecializedThunkJIT::returnDouble): Change-Id: Ie3b6516a4047717212521315e85f5e2094373cbc git-svn-id: http://svn.webkit.org/repository/webkit/trunk@159873 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Account for extra guard page on Windows stack when using Java plugin.Michael Bruning2014-02-281-2/+7
| | | | | | | | | | This fixes some ASSERTs when debugging applications that load pages which contain Java applets. Task-number: QTBUG-36591 Change-Id: I65971dc97c3b002a28646916b82a548496c4c4d9 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Treat qrc protocol the same as file protocol in loadingAllan Sandfeld Jensen2014-02-283-2/+6
| | | | | | | | | | | | | KUrl's with qrc protocol was not recognized as local files which triggered mimetype sniffing that doesn't support SVG and break it. This patch makes qrc urls be treated as local files and modifies the one place were KURL::isLocalFile depended on the protocol being exactly "file" and not "qrc". Task-number: QTBUG-37058 Change-Id: Iad35ebc1fd72049484d2efa1f9caee96060fb236 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Fix build on x32v5.3.0-alpha1Allan Sandfeld Jensen2014-02-252-2/+12
| | | | | | | Recognize x32 and disable JIT and native LLINT in this configuration. Change-Id: I1576e38ffcff92495c4c108f66f2df17de9a5e9c Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix Qt WebKit build on architectures without JIT supportAllan Sandfeld Jensen2014-02-212-1/+5
| | | | | | | | | | | | | The fallback LLINT interpreter was triggering YARR JIT which would fail to compile and also trigger ENABLE_ASSEMBLER which would trigger even more not to compile. YARR JIT is only supported on platforms with valid JIT or native LLINT support. So we must avoid it when the fallback is used Task-number: QTBUG-36969 Change-Id: Ie94bcb316e192feb33ab528ddc3a328af154cebf Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix compilation with Intel CCThiago Macieira2014-02-201-1/+1
| | | | | | | | Inline functions must be defined. This one is meant not to be defined, so don't mark it inline Change-Id: Ibdf81302f88d568042ff5fc6733f96c8716fa52d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix compilation with Intel CC: C code can't have templatesThiago Macieira2014-02-202-3/+3
| | | | | | | | | | | | wtf/Assertions.h is compiled in C, C++, Objective C and Objective C++ modes. The C++ parts need to be inside #ifdef __cplusplus, so make sure the templates are hidden by it. But since Intel CC version 13 does not need the trick anymore, we can exclude it from there. Change-Id: Ifa1b168feec31826ecd025d07067852456d41ba1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Enable HTML5 Indexed Database APIAllan Sandfeld Jensen2014-02-141-0/+1
| | | | | | | | | | Enable the HTML5 indexed database API which is now a W3C candidate recommendation and supercedes WebSQL. [ChangeLog][QtWebKit][New Features] Indexed Database API (not available on windows) Change-Id: I924ba9cc2218658822380577dbd23ab010ef1f76 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix ASSERT on QtWebEngine TP blog postAllan Sandfeld Jensen2014-02-141-9/+6
| | | | | | | | | | | | | When loading the blog post about QtWebEngine TP1, QtWebKit hits an assert when an already loaded script stops the load of resource being processed. This patch changes the handling of revalidated sources so that didAddClient and thereby notifyFinished are called from a timer event instead of synchronously during handling of the load event. Change-Id: I33480a7216117fa19eb6cc57d1ccac1f2886b3ae Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix linker errors when Qt is built statically.Sergio Martins2014-02-131-1/+4
| | | | | | | | | moc_qwebkitplatformplugin.o was both present in libWebKit1.a and libQt5WebKitWidgets.a resulting in "multiple definition of" errors when building apps against a static webkit. Change-Id: I180b6288f39d9862a1b828f1bf295889b8e99955 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-1218-68/+205
|\ | | | | | | Change-Id: Iea6cf3f34fb33f2d138b72243b0e688958d9424e
| * [mips] Wrong register usage in LLInt.old/5.2Balazs Kilvady2014-02-102-52/+115
| | | | | | | | | | | | | | | | | | | | | | Fix register usage and add PIC header to all LLInt operations. This patch is taken from https://bugs.webkit.org/show_bug.cgi?id=125168. It fixes the crash of fast/js/exception-propagate-from-dfg-to-llint test on mips architecture. Change-Id: I98ad3b5766451cab48a76f7e028b210f9ebe99ed Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
| * Fix build with QT_NO_GRAPHICSVIEWSergio Martins2014-02-092-0/+6
| | | | | | | | | | Change-Id: Ia909a560db58d6cdc6ec4bbac879249eb5e286ef Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
View Lorry Controller Status