summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix assert after makerope boundary check5.3Lucas Forschler2014-10-311-0/+1
| | | | | | | | | | The browser demo asserts on qt-project.org after the makerope security fix. Port of http://trac.webkit.org/changeset/169397 Change-Id: I19c98737735d9b17133742752928d4ce6349de13 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Add missing branchAdd32 implementations to fix sh4 and mips buildsJulien Brianceau2014-09-302-0/+29
| | | | | | | sh4 implementation has been taken from WebKit r173222. Change-Id: I1c188e88e9fd8772f97cac94d7ee31945b538b71 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* [ARM] Unreviewed build fix after r167336.Csaba Osztrogonác2014-09-261-0/+5
| | | | | | | | | * assembler/MacroAssemblerARM.h: (JSC::MacroAssemblerARM::branchAdd32): Change-Id: I919df8301e69cca630f475afcc0c4311d713f10e git-svn-id: http://svn.webkit.org/repository/webkit/trunk@167565 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Unreviewed, ARMv7 build fix after r167336.Filip Pizlo2014-09-261-0/+6
| | | | | | | | | * assembler/MacroAssemblerARMv7.h: (JSC::MacroAssemblerARMv7::branchAdd32): Change-Id: Ia16f8dce00ce660cf5f7b9eb1c3496e08cbdb603 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@167354 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* compileMakeRope does not emit necessary bounds checksFilip Pizlo2014-09-266-23/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=130684 <rdar://problem/16398388> Reviewed by Oliver Hunt. Add string length bounds checks in a bunch of places. We should never allow a string to have a length greater than 2^31-1 because it's not clear that the language has semantics for it and because there is code that assumes that this cannot happen. Also add a bunch of tests to that effect to cover the various ways in which this was previously allowed to happen. * dfg/DFGOperations.cpp: * dfg/DFGSpeculativeJIT.cpp: (JSC::DFG::SpeculativeJIT::compileMakeRope): * ftl/FTLLowerDFGToLLVM.cpp: (JSC::FTL::LowerDFGToLLVM::compileMakeRope): * runtime/JSString.cpp: (JSC::JSRopeString::RopeBuilder::expand): * runtime/JSString.h: (JSC::JSString::create): (JSC::JSRopeString::RopeBuilder::append): (JSC::JSRopeString::RopeBuilder::release): (JSC::JSRopeString::append): * runtime/Operations.h: (JSC::jsString): (JSC::jsStringFromRegisterArray): (JSC::jsStringFromArguments): * runtime/StringPrototype.cpp: (JSC::stringProtoFuncIndexOf): (JSC::stringProtoFuncSlice): (JSC::stringProtoFuncSubstring): (JSC::stringProtoFuncToLowerCase): * tests/stress/make-large-string-jit-strcat.js: Added. (foo): * tests/stress/make-large-string-jit.js: Added. (foo): * tests/stress/make-large-string-strcat.js: Added. * tests/stress/make-large-string.js: Added. Change-Id: If01dd2a2d2daa3d209eddf0213d2b391e94f54a0 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@167336 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* QWidgetPluginImpl: fix build with QT_NO_STYLE_STYLESHEETOlivier Blin2014-09-091-0/+2
| | | | | Change-Id: Ia96efd95ff5f92e5b6569b343764c337fb1a8d41 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Bump versionFrederik Gladhorn2014-08-291-1/+1
| | | | Change-Id: Icd62ad6ca89ac8039272d9b3caaacabc571e0c8d
* Fix key identifier for comma key ("Separator")v5.3.25.3.2Olivier Blin2014-08-201-1/+1
| | | | | Change-Id: Ib450ba08d1bf53e2f7879560cb8ec764997570db Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix fallback conversion of recognized objectsAllan Sandfeld Jensen2014-08-151-1/+1
| | | | | | | | | | | All objects are added the list of visited objects, but only those that were not recognized more specific than 'Object' are removed before trying the fallback conversion. This prevents the fallback from working as the algorithm will assume we are looping. Task-number: QTBUG-39951 Change-Id: I1d538c452092485b371c335e53f16db162bd4fb1 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix regression in QQuickWebView's transparent backgoundAllan Sandfeld Jensen2014-08-131-0/+1
| | | | | | | | | We need to set both setDrawsTransparentBackground and setDrawsBackground to get the full correct behavior of transparent backgrounds. Task-number: QTBUG-40063 Change-Id: Iaa276a6a12e3cff40d8bc2892fb0667242afb88b Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix crash in DeviceOrientationController when !HAVE(QTSENSORS)Julien Brianceau2014-08-131-2/+4
| | | | | | | Regression introduced by QSensors leak fix (QTBUG-38857). Change-Id: I22dd4f774012ef9b8af9ba8b59e1e4603a3ebbf4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix case in documentation of qobjectbridge bindingsAllan Sandfeld Jensen2014-08-122-3/+3
| | | | | | | | | The method toDataURL does not work, but calling toDataUrl does. This patch updates the documentation to match the exported method name. Task-number: QTBUG-40268 Change-Id: Icf0ee233df141d43367da045834e6a42c9afb31a Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Do not add QStyle padding on top of default paddingAllan Sandfeld Jensen2014-07-311-1/+1
| | | | | | | | | | | The recent change to follow CSS padding value, added the CSS padding to the default QStyle. This however needlessly changes the default size of input elements. This change instead uses the maximum of CSS padding and QStyle padding. Change-Id: I23a39c76db837409ea11915f69ebbfefa2d25548 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* [WK2] Update text upon item selection for menu listsPierre Rossi2014-07-309-8/+37
| | | | | | | | | | | | | While RenderListBox repaints itself on selection changes, RenderMenuList lacks this logic when it's used for multiple selections (acting as a listbox). Make sure we properly update the element's text as the options are toggled. Originally reported and proposed fix in http://wkb.ug/91862 Task-number: QTBUG-39675 Change-Id: I09f17ff03577fc6f65875674d632684b560fffb7 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Do not use title as the primary text of dragged or copied linksAllan Sandfeld Jensen2014-07-282-4/+9
| | | | | | | | | | | | | | In trying to preserve the link title, we set the title in the text part of dragged or copied mimedata. This has caused a number of undesired changes in behavior. This patch reverts to placing the url in the text field, but instead stores the rich part of the link as HTML. This is consistent with GTK, and Chromium. Task-number: QTBUG-39995 Change-Id: Id5f2587a93fb9721c728299340f2e3562f3456ca Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Show placeholder text when focusedAllan Sandfeld Jensen2014-07-231-0/+2
| | | | | | | | | Change the default behavior of placeholder text, so that it continues to be shown when the element has focus but is still empty. Task-number: QTBUG-40171 Change-Id: Ide37c3b28488cb6c24f7823a41fb62c8920a71f6 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Do not override padding in textfieldsAllan Sandfeld Jensen2014-07-233-5/+13
| | | | | | | | | | | | | We currently override any defined padding on textfields with the Qt style framewidth. This patch instead adds the framewidth to any existing fixed padding. This fixes textfield text from overlapping icons absolutely placed in its padding. Task-number: QTBUG-40257 Change-Id: I73feb3f9e4630f7c7813a1b2a16f1c525c84386f Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Avoid crash when hidePopup is called multiple timesAllan Sandfeld Jensen2014-07-221-1/+5
| | | | | | | | If hidePopup is called twice it may cause access to a deleted version of itself Task-number: QTBUG-38998 Change-Id: Iee967eb51c403420779ea502610b58383d07963f Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Added support for appending an escaped SegmentedString to another.Oystein2014-07-221-2/+9
| | | | | | | | | | | | | | | | | | | Merge of blink r174725 This was previously an assert which triggers in the situation where the HTMLEntityParser is parsing a potential named entity, but only has one or two characters of data available due to being at the end of a network packet boundary, so it 'unconsumes' them from the SegmentedString which has some special handling when only one or two characters needs unconsuming to avoid string creation. Next time the tokenizer is pumped, the SegmentedString is then appended to the HTMLSourceTracker right before the actual parsing happens (i.e. when we'd consume the previously unconsumed characters). SegmentedString::append mostly assumes the parameter string hasn't been consumed from and had an assert instead of handling this case, which hits. Task-number: QTBUG-40284 Change-Id: Ifcf9af6f6e2e5a9750af4297cfda2f55f3bb274e Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* QWebPage crashes on drag without QWidget viewDavid Fries2014-07-121-1/+2
| | | | | | | | | | | | | | | | QWebPage can be used without a widgets and has a documentation section on how to do so, but if QWegPage hasn't been given a QWidget in setView a drag operation will crash. To reproduce select a section of the web page click and drag from within the selection and it will crash. Add a check to avoid a NULL dereference, the existing code already has a check for not having a QWidget set as the view. DragClientQt::startDrag m_chromeClient->platformPageClient() is NULL Task-number: QTBUG-40204 Change-Id: I5739285696ab57c05ee59c10ae00a1cf652ff494 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Crash during exception unwindingOliver Hunt2014-07-089-12/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://webkit.org/b/119860 Reviewed by Filip Pizlo. Add an "Unreachable" NodeType, and then rearrange op_throw and op_throw_reference_error to plant Throw or ThrowReferenceError followed by a flush and then the Unreachable node. We need this so that Throw and ThrowReferenceError no longer need to be treated as terminals and the subsequent flush keeps the activation (and other registers) live. * dfg/DFGAbstractInterpreterInlines.h: (JSC::DFG::::executeEffects): * dfg/DFGByteCodeParser.cpp: (JSC::DFG::ByteCodeParser::parseBlock): * dfg/DFGClobberize.h: (JSC::DFG::clobberize): * dfg/DFGFixupPhase.cpp: (JSC::DFG::FixupPhase::fixupNode): * dfg/DFGNode.h: (JSC::DFG::Node::isTerminal): * dfg/DFGNodeType.h: * dfg/DFGPredictionPropagationPhase.cpp: (JSC::DFG::PredictionPropagationPhase::propagate): * dfg/DFGSafeToExecute.h: (JSC::DFG::safeToExecute): * dfg/DFGSpeculativeJIT32_64.cpp: (JSC::DFG::SpeculativeJIT::compile): * dfg/DFGSpeculativeJIT64.cpp: (JSC::DFG::SpeculativeJIT::compile): Change-Id: Idb894e780cd3ebe15515d1796c58a339ae54d55f git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154290 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Bad cast from CSSInitialValue to CSSValueListRyosuke Niwa2014-07-041-1/+5
| | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=121729 Reviewed by Beth Dakin. Add a regression test. This is not a merge since the test in the Blink change involves superfluous execCommand calls. Change-Id: I13e08031516548a5915f8ad4c42486e9ba0e3d96 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156222 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* use after free in WebCore::DocumentOrderedMap::remove / ↵Zalan Bujtas2014-07-043-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore::TreeScope::removeElementById https://bugs.webkit.org/show_bug.cgi?id=121324 Reviewed by Ryosuke Niwa. Update the document ordered map for an image element before dispatching load or error events when it's inserted into a document. Source/WebCore: Test: fast/dom/modify-node-and-while-in-the-callback-too-crash.html * dom/DocumentOrderedMap.cpp: defensive fix to avoid use after free issues. (WebCore::DocumentOrderedMap::remove): * html/HTMLImageElement.cpp: (WebCore::HTMLImageElement::insertedInto): * loader/ImageLoader.cpp: (WebCore::ImageLoader::updateFromElement): setting m_failedLoadURL makes repeated updateFromElement calls return early. Change-Id: I305e56de969d0efe3dc67930cdf585a201e8c6a5 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@159481 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS on HPPALisandro Damián Nicanor Pérez Meyer2014-07-021-1/+1
| | | | | | | Solves building WebKit on HPPA. Change-Id: I00a455ad03d3f896de589aaf6e6f4dc0e71398ac Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Actually load icc.prf for the Intel compilerThiago Macieira2014-07-023-1/+5
| | | | | | | | Nothing sets CONFIG += icc, so the .prf file was not getting loaded at all. So force it on both Windows and Unix. Change-Id: I0c9a0ab07b5637716e37fb2066d6013fa28c4012 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Prevent interpreting URL parameter for Qt plugins as content URLs.Michael Brüning2014-06-301-3/+8
| | | | | | | | | This prevents a compatibility workaround for NPAPI plugins from interfering with the Qt plugins. Task-number: QTBUG-39483 Change-Id: Ic9342d3bdeec4c26c21f56b475d3d3751b30f057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix android build error about already defined struct.Sergio Martins2014-06-271-8/+0
| | | | | | | | | | Minimum API version is 9, which already defines this struct in elf.h Also see qtscript/49ab1bd9838dc3c069be780ff6d69a2543c06ed6 which does the same thing there. Change-Id: Ia56f8399156a93edc569e7bb982bd7186a16a445 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Fix SpeculateCellOperand ASSERT failure in DFG for 32-bit builds.Julien Brianceau2014-06-261-18/+27
| | | | | | | | | | Original patch by Filip Pizlo <fpizlo@apple.com> on 2013-08-28 taken from WebKit r154804 (http://trac.webkit.org/changeset/154804). Task-number: QTBUG-39768 Change-Id: I239f2ee2ec5d1c21f7e50709b8989e744fd87995 Reviewed-by: Zhang Zengbo <zengbo.zhang@gmail.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* QtWebKitWidgets should not depend directly on QtQuickAllan Sandfeld Jensen2014-06-261-1/+0
| | | | | | | | | A left-over from the split of the QtWebKit and QtWebKitWidgets libraries meant that QtWebKitWidgets still linked directly to QtQuick, though it doesn't use it. Change-Id: I16ebc0020610ee17edde39dcf0a5caeca15a3ef8 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* QWebHitTestResult::element() should return the inner elementAllan Sandfeld Jensen2014-06-262-3/+8
| | | | | | | | | | | | | QWebHitTestResult::element() currently only returns a non-null result if the innernode happens to be an element. This means it will never contain anything when hittesting over text. This patch changes QWebHitTestResult::element() to instead return the inner element. Task-number: QTBUG-39591 Change-Id: Ic00f30d0b6429f2bcfb47f6e386be7d890d45bfb Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Specify location of CMake testsStephen Kelly2014-06-252-0/+4
| | | | | | | | | | The create_cmake.prf file now checks for the existence of tests, so ensure that they are searched for in the correct path. Change-Id: Ibac09b01e1d2546b5ee553990e6257fd92d453bf Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix WebView crash when using gcc 4.9.Sergio Martins2014-06-251-1/+2
| | | | | | | | Fix copied from https://code.google.com/p/angleproject/issues/detail?id=651 Task-number: QTBUG-39723 Change-Id: I8ee694079c263bf6d21e2a0eadc2234a2c69cae2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix debug builds of qtwebkit on linux-iccAllan Sandfeld Jensen2014-06-251-1/+1
| | | | | | | | | | The thin archives are available for all compilers on Linux, and are also required by the intel compiler for debug builds. Clang does not need thin archives but it still helps. Task-number: QTBUG-39632 Change-Id: I24f108e87492bd5b5dceb3c62126756f3976b88b Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Qt5WebKitWidgets should keep private dependencies privateAllan Sandfeld Jensen2014-06-241-0/+4
| | | | | | | | | | | | The qmake file webkit_modules was not loaded, which meant we never separated private Qt dependencies from public Qt dependencies in the QT qmake variable. Task-number: QTBUG-39249 Change-Id: Iadad6b652cee5a51894c4ac2e9979d7d41619d27 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
* Prevent crashes when the QWebView gets reparented.Michael Brüning2014-06-241-1/+1
| | | | | | | | | Wrap the QWindow pointer in a QPointer so it gets set to NULL when the QWindow gets deleted without notification. Task-number: QTBUG-39524 Change-Id: I7c8fbe0f6f1921a7b48c58dc502d6a0a3409d084 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix build with gcc 4.4Allan Sandfeld Jensen2014-06-241-2/+4
| | | | | | | | | | Gcc 4.4 does not have the unused-but-set-variable warning flag and fails when building leveldb which tries to set it. This patch only sets it on gcc versions that supports it. Change-Id: Iea4fb5bab062729fc0518d644122f13502967cfb Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Add qtxmlpatters to sync.profileSergio Ahumada2014-06-241-0/+1
| | | | | | | | | | | Indirect dependencies should also be listed in sync.profile qtwebkit depends on qtdeclarative which depends on qtxmlpatterns, so adding the latter as the CI system uses the information in sync.profile to clone the required repositories. Change-Id: I52f34b4ff1656aa20e0ceeacc4f42689f1505306 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* GraphicsContext for Qt: add popTransparencyLayerInternal method.Zhang Zengbo2014-06-202-7/+27
| | | | | | | | | | | | | | | | | | | It is harmful to just call endPlatformTransparencyLayer inside GraphicsContextQt.cpp,because the three calling sequences: 1. beginPlatformTransparenceyLayer endPlatformTransparencyLayer 2. pushTransparencyLayerInternal 3. savePlatformState restorePlatformState may interleave, which makes unexpected result. Task-number: QTBUG-39577 Change-Id: I676a85cd5210e0f944cf6b522dd21deec06f03bc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Bump versionOswald Buddenhagen2014-06-181-1/+1
| | | | Change-Id: I2522e10d7710331b57ace5d0a4e5b6e871987600
* Merge remote-tracking branch 'origin/stable' into 5.3v5.3.15.3.1Sergio Ahumada2014-06-173-22/+39
|\ | | | | | | Change-Id: I182d18383f82025fa7b9cfe7f136cf590c01fb14
| * Doc: Added detailed description for WebViewstableVenu2014-06-163-22/+39
| | | | | | | | | | | | | | | | | | | | | | Moved the description from the overview page to the WebView type documentation. Also added an image corresponding to the snippet used. Task-number: QTBUG-36179 Change-Id: Iaf4207a36f774d93af9a881eae2162d44837eeee Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Fix letter-spacing in SVGAllan Sandfeld Jensen2014-06-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | Qt incorrectly included letter-spacing when WebCore asked us to ignore it which broke SVG rendering of letter-spaced text in the complex font path. Task-number: QTBUG-39601 Change-Id: Ia951e12ac5503955eb0e34e214219f9136c71465 Reviewed-by: Julien Brianceau <jbriance@cisco.com> Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* | Fix clang debug-and-release buildAllan Sandfeld Jensen2014-06-131-2/+5
| | | | | | | | | | | | | | | | Under circumstances clang will leave code that calls the dead default constructor of Attribute, which causes link time errors. Change-Id: I265f5b6ee864737c8261cff1439d525000eed1ba Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* | Merge remote-tracking branch 'origin/stable' into 5.3Sergio Ahumada2014-06-115-8/+38
|\ \ | |/ | | | | Change-Id: I09992d60034fccf74c5f754ab88bebe8b8de5e45
| * [mips] Add floating point absolute support in JavaScriptCore.Julien Brianceau2014-06-102-3/+16
| | | | | | | | | | Change-Id: I8b03fb0380fa444a6da239d8ddb19bdbe6b3d061 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
| * Prevent register clobbering to fix negative zero check in SoftModulo.Julien Brianceau2014-06-061-1/+7
| | | | | | | | | | | | | | | | This fix is not relevant for x86 architectures. Covered by integer-division-neg2tothe32-by-neg1 JavaScript test. Change-Id: I8ffd1280063305bc98c564f5df57c76cc5b1d7a6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
| * [mips] Fix branchTruncateDoubleToUint32 implementation in macro assembler.Julien Brianceau2014-06-051-1/+1
| | | | | | | | | | | | | | Test dfg-uint32array-overflow-values fails without this patch. Change-Id: Ia186ab5c3fbc19fd7621f5cc60678b82a6424641 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
| * Do not crash or assert on SVG font fallbacksAllan Sandfeld Jensen2014-06-051-2/+2
| | | | | | | | | | | | | | | | | | Fonts falling back to SVG fonts may not have a rendering context, so just skip kerning in this case. Task-number: QTBUG-38356 Change-Id: I9d1473bbb8517bfae927e7b020a9c2102c6497b4 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
| * Avoid deep copy when updating BitmapTextureGLAllan Sandfeld Jensen2014-06-051-1/+12
|/ | | | | | | | | | | Since we use a ImageBuffer to paint into a BitmapTextureGL, and ImageBuffer's always have an active painter, the convertion from QPixmap to QImage causes a deep copy of the content before it is uploaded to OpenGL. This copy is unnecessary and can be avoided by temporarily redirecting the QPaintDevice. Change-Id: I0106c0f6dfb9cc3fbbee943411fc8f6853df4f98 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Ensure replaced tiles are repaintedAllan Sandfeld Jensen2014-06-042-8/+13
| | | | | | | | | | If a layer with a backing store is resized, we may replace some tiles that were not at maximum size. When that happens we need to ensure the replaced area is repainted, otherwise the content disappears until refreshed. Change-Id: Ie2f7796a2493a56ed5fc6cc4cea55f4ab9f38bbe Reviewed-by: Michael Bruning <michael.bruning@digia.com>
View Lorry Controller Status