summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-03-171-4/+2
|\ | | | | | | Change-Id: I5add7bbeab559b3f14207c37c6e010f953f6a286
| * Incorrect type speculation reported by ToPrimitiveOliver Hunt2015-03-111-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=119458 Reviewed by Mark Hahnenberg. Make sure that we report the correct type possibilities for the output from ToPrimitive * dfg/DFGAbstractInterpreterInlines.h: (JSC::DFG::::executeEffects): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@153674 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: I85d91598088ead350c89c4a9cc28a2bd866a2d22 Task-number: QTBUG-44912 Reviewed-by: Julien Brianceau <jbriance@cisco.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-alpha1Allan Sandfeld Jensen2015-03-1018-73/+141
|\| | | | | | | Change-Id: I824a984e8552340c2f9f631ac951f2c9eaa90b74
| * Fix g++ 5.0 buildAllan Sandfeld Jensen2015-03-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | A non-inline template needs to be explicitly instantiated if used outside the object where it is declared. Patch suggested by Khem Raj. Task-number: QTBUG-44829 Change-Id: Ib0adbd9273bd1cef01e5863bc8aaa9c373022792 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| * Doc: Link issues Qt WebKitNico Vertriest2015-03-052-2/+2
| | | | | | | | | | | | | | | | Removed obsolete references QInputContext and QtDeclarative Task-number: QTBUG-43775 Change-Id: I308931beaec5ef2067350649135c26df1fe3817b Reviewed-by: Martin Smith <martin.smith@digia.com>
| * Fix unsafe memory load/store from the argument encoder/decoder affecting ARMBenjamin Poulain2015-03-032-39/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=125674 Patch by Benjamin Poulain <bpoulain@apple.com> on 2013-12-12 Reviewed by Darin Adler. Depending on the CPU and CPU config, load and store may have to be aligned. The argument buffer has no particular alignment which can cause problems. In this case, on ARMv7, strd and ldrd can have alignment restriction on 16 bytes. The code encoding double and 64 bits integers was causing bugs. To avoid problems, the encoders/decoders are modified to just use memcpy. The compiler optimizes it away for the right instructions (clang uses two ldr/str in the case of 64bits values on ARMv7). * Platform/CoreIPC/ArgumentDecoder.cpp: (CoreIPC::decodeValueFromBuffer): (CoreIPC::ArgumentDecoder::decode): * Platform/CoreIPC/ArgumentEncoder.cpp: (CoreIPC::copyValueToBuffer): (CoreIPC::ArgumentEncoder::encode): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@160529 268f45cc-cd09-0410-ab3c-d52691b4dbfc Task-number: QTBUG-44740 Change-Id: I9bd448cbfc524c62bdf4bfaad52fa194d8159726 Reviewed-by: Julien Brianceau <jbriance@cisco.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| * Fix build on x32 systemsDmitry Shachnev2015-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | On Linux x32 ABI, pointer size is different than on classic x86_64 systems, so the current assembly is wrong. To fix this, drop the quad qualifier and let the compiler infer the argument size. This way it will work on both x86_64 and x32. Done-with: Adam Borowski <kilobyte@angband.pl> Change-Id: I7a5f9edbba08705397ce7e771b1567f2a140fb1b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
| * Fix building with glib 2.43+Allan Sandfeld Jensen2015-03-021-24/+24
| | | | | | | | | | | | | | | | | | The newest version of glib have introduced their own GMutexLocker conflicting with the one defined in WebCore. Task-number: QTBUG-44714 Change-Id: Ibdd1646e129eaed84c65dc0d96bebe80f2a61f4b Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| * Forward show and hide events to PluginViewsMichael Bruning2015-02-2611-6/+71
| | | | | | | | | | | | | | | | | | | | | | | | This was causing issues with windows plugins on windows, which were always visible on top of all other widgets and not hidden correctly when the owning web view was hidden. Task-number: QTBUG-44401 Task-number: QTBUG-42588 Task-number: QTBUG-43024 Change-Id: Ie0307fa2f7b2bf59f51a76db5feef2e8446c359d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Initialize label vector lazilyAllan Sandfeld Jensen2015-02-251-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When parsing JSON temporary JIT objects are created when resolving each id. Each of these get a list of labels initialized to the size of the codeblock being operated on, which can be very long in some cases. This patch delays the initialization of the label vector, until it is actually used which is easy to figure out since the vector is not exported outside the class. Task-number: QTBUG-44475 Change-Id: I4fdbb7de7e7d953fffed39e38feed066edb6742b Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Fix two gcc 5.0 warningsAllan Sandfeld Jensen2015-03-062-4/+4
| | | | | | | | | | | | | | Improved warnings in gcc 5.0 has exposed some unclear expressions. Change-Id: I2c269528f6246319dab1a83d929d55c8d8e5a17d Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-253-2/+8
|\| | | | | | | Change-Id: If6bc4592dc0539dc8b95c712bb90f5be4acf9475
| * Don't do high-quality scaling on individual video framesAllan Sandfeld Jensen2015-02-241-1/+1
| | | | | | | | | | | | | | | | | | Each frame of a video needs to be scaled fast, there is not time for high-quality scaling, and doing so will also blow our image scaling cache. Change-Id: Ibdd38ccffa273d0848aedcef19ffb2b4861c08a0 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * Fix build with -no-rttiCorentin Jabot2015-02-241-0/+2
| | | | | | | | | | | | | | WebCore was unable to build with -no-rtti since 82d8a5c8 Change-Id: I52dbd9b8db6c3b44ebad9e2518d89bdbe1430c3a Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * Fix crash on html5video.org by detecting inconsistent frame dataAllan Sandfeld Jensen2015-02-242-1/+5
| | | | | | | | | | | | | | | | | | | | | | GStreamer is on this particular video sending us invalid dimensions that would leave us to operate on invalid addresses. We ignore that frame and print a warning to the log so the user might know their gstreamer plugin is dangerously broken. Task-number: QTBUG-44245 Change-Id: I476ec9822ff2f8210161a8642e16bbafb6786357 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Merge dev into 5.5Oswald Buddenhagen2015-02-2356-72/+71
|\ \ | | | | | | | | | Change-Id: I1a4e088f1080851e768f41551b69e62267782fd9
| * | Update copyright headersJani Heikkinen2015-02-1656-72/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: Icc6f774c9ca37ea88ac024163386b16fc50fb2a7 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-1623-66/+189
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib6552c4dd0fbfecfa1800689eb2ae75b9d54a22b
* | \ \ Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-2024-66/+190
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | Conflicts: .qmake.conf Change-Id: Ic900e9207ae48520c99894345fe0b4d0ab58ec44
| * | Fix compile issue as it was missing the multimedia moduleAndy Shaw2015-02-191-0/+1
| |/ | | | | | | | | Change-Id: I24f89215897b366fc7f21bf4a43e61337a17b596 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Merge remote-tracking branch 'origin/5.4.1' into 5.4Frederik Gladhorn2015-02-101-1/+1
| |\ | | | | | | | | | Change-Id: I39ebf7fb2c12b6afa986a20380cea309f0a1bbee
| | * Fix memory leak in ImageDocumentAllan Sandfeld Jensen2015-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An ImageLoader may hold a reference to its image element, and any element holds a guard on the document. To make the ImageLoader release the reference it needs to receive the notifyFinished() call, but that doesn't happen if the CachedResource is in the wrong state. The solution is to ensure we set the finish state on the resource before calling the method signifying loading is finished. Task-number: QTBUG-44023 Change-Id: I694483f6201b7ea4656016731e431f2806c3ab1c Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | Add documentation for feature permission related APIs.Florian Bruhin2015-01-221-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | Those are mostly taken from QWebEnginePage's documentation with some slight adjustments. Change-Id: Ifbde5252cc46505c117a9d75ffa2af6e3b6eec11 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * | Editor actions should only be checked when page is editableAllan Sandfeld Jensen2015-01-201-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the split of qt4 QWebPage the check for GUI level editor actions was incorrectly moved to being checked when the page is not editable instead of when it is editable Task-number: QTBUG-44019 Change-Id: I3776cec6ee05f27e43139e40cc18480905300888 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * | Avoid crash on root elements with display:noneAllan Sandfeld Jensen2015-01-161-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | We expect elements returned by hit-testing to have actual renderObjects, but that may not be the case if the root element is declared display:none, since the root element is always considered hit if nothing else is, and display: none elements have no renderObjects. Task-number: QTBUG-43882 Change-Id: I526615d401bf09b30e2b6994dcdad3b2373cef5a Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * Check if OpenGL context is supportedAllan Sandfeld Jensen2015-01-151-6/+9
| | | | | | | | | | | | | | | | | | | | | | Before the support for dynamic GL builds, the WebCore initialize OpenGL shims would check if the OpenGL version had all the necessary methods. After we removed this we now risk continuing with an OpenGL version that is not supported by WebCore and can cause crashes. Task-number: QTBUG-43831 Change-Id: I19caffc645ea5dede8b98408cbe0cae5fae8c22f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| * Allow 3D transforms without composited layersAllan Sandfeld Jensen2015-01-122-0/+16
| | | | | | | | | | | | | | | | | | | | | | Qt has no problems doing static 3D transforms without composited layers, since the performance is not optimal we want to still trigger composited layers when available, but allowing this without can fix the rendering in the screenshot and printing API. Task-number: QTBUG-43106 Change-Id: I30869d0f86704b84369273d7c2b875ee22badf22 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * Optimize HTML5 video painting on LinuxAllan Sandfeld Jensen2015-01-092-22/+15
| | | | | | | | | | | | | | | | | | | | | | We were doing a needless inversion of image data, that gstreamer somehow detected and corrected for. The inversion can be safely removed and we can also avoid copying the image data by releasing the gstreamer buffer later like the cairo implementation does. Task-number: QTBUG-43520 Change-Id: I5910d5358d049abe3570dd5468e9e0bb56517639 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| * Fix build without OpenGLAllan Sandfeld Jensen2015-01-086-12/+20
| | | | | | | | | | | | | | | | | | | | The accelerated 2D canvas feature broke building without OpenGL due to missing feature checks. Task-number: QTBUG-43549 Change-Id: I7e62751d5237e1c600bc784539c70db50bccfa22 Reviewed-by: Ashish Kulkarni <kulkarni.ashish@gmail.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * fix build on MSVC with system libraries for zlib, libpng and libjpegAshish Kulkarni2015-01-081-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | The definitions in qtbase were used as a source. zlib => qtbase/src/3rdparty/zlib_dependency.pri libpng => qtbase/src/gui/image/qpnghandler.pri libjpeg => qtbase/src/gui/image/qjpeghandler.pri Change-Id: I41529493d382d693311f3a2c1a2590bf1406baff Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * fix build on MSVC with --system-libpng or --system-libjpegAshish Kulkarni2015-01-082-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was introduced in WebKit r108792, as in the related bug https://bugs.webkit.org/show_bug.cgi?id=32410#c26 it was confirmed as broken for Windows MSVC (for Chromium). The final merge made it conditional for PLATFORM(QT) but did not fix the underlying issue, which was the wrong placement of NO_RETURN as MSVC does not allow __declspec(noreturn) to be put after the declaration but GCC allows __attribute((__noreturn__)) at either location. This is similar with the usage of NO_RETURN in other places. Change-Id: I95ae3727553093b84b3645eb6dad63779f08e09d Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * WTF: fix build on Windows for static ICUAshish Kulkarni2015-01-081-1/+11
| | | | | | | | | | | | | | | | | | The logic used was changed to be in sync with that used for the configuration tests. Change-Id: I8ba654c85487c19144431a94c2337caebac60447 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Calling WebCore::Page::setMediaVolume(0) does not mute videos as expected.Ada Chan2015-01-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=137305 Reviewed by Darin Adler. This was broken in http://trac.webkit.org/changeset/154970. To fix this (but not break GStreamer), remove the "if (m_volumeInitialized)" check before updating the MediaPlayer's volume to the value multiplied with the Page's mediaVolume. This should not affect GStreamer's behavior because MediaPlayerPrivateGStreamerBase::setStreamVolumeElement does nothing unless m_volumeInitialized is true. * html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::updateVolume): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@175003 268f45cc-cd09-0410-ab3c-d52691b4dbfc Task-number: QTBUG-43479 Change-Id: I7f40dfc2535e2874d8c396051c488b7d92046919 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * [GStreamer] Video player sets system volume to 100%Xabier Rodriguez Calvar2015-01-064-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=118974 Reviewed by Philippe Normand. In order to preserve the system volume we need to keep track of the volume being initialized in the HTMLMediaElement and then just setting the volume to the sink when initializing the pipeline if that volume was changed before. * html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::HTMLMediaElement): Initialized attribute to false. (WebCore::HTMLMediaElement::setVolume): Set the attribute to true when volume is changed. (WebCore::HTMLMediaElement::updateVolume): Set the volume only if volume was initialized. (WebCore::HTMLMediaElement::mediaPlayerPlatformVolumeConfigurationRequired): Platform volume configuration is required only if volume was not initialized before. * html/HTMLMediaElement.h: Added attribute and interface method. * platform/graphics/MediaPlayer.h: (WebCore::MediaPlayerClient::mediaPlayerPlatformVolumeConfigurationRequired): Declared and added default implementation for the interface method. (WebCore::MediaPlayer::platformVolumeConfigurationRequired): Asked the client, meaning the HTMLMediaElement if the platform volume configuration is required. * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp: (WebCore::mediaPlayerPrivateVolumeChangedCallback): Added log. (WebCore::MediaPlayerPrivateGStreamerBase::setVolume): Added log. (WebCore::MediaPlayerPrivateGStreamerBase::setStreamVolumeElement): Set the volume only if not platform volume is required and added log. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154970 268f45cc-cd09-0410-ab3c-d52691b4dbfc Task-number: QTBUG-43479 Task-number: QTBUG-34896 Change-Id: I4031b33e52e2299b03a5844770dc17c69822059c Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * Support MSIE compatible pasteboard typesAllan Sandfeld Jensen2015-01-061-6/+23
| | | | | | | | | | | | | | | | | | | | Treat 'Text' pasteboard type as 'text/plain' matching Apple and GTK webkit ports and the whatwg spec. Task-number: QTBUG-43149 Change-Id: Iac491fd15f1e9e8539daabf30a61e64921c82222 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* | Fix lots of crashes because of 4th argument register trampling.Julien Brianceau2015-02-095-30/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=123421 Reviewed by Michael Saboff. r3 register is the 4th argument register for ARM and also a scratch register in the baseline JIT for this architecture. We can use r6 instead, as this used to be the timeoutCheckRegister and it is no longer used since r148119. * assembler/ARMAssembler.h: Temp register is now r6 instead of r3 for ARM. * assembler/MacroAssemblerARMv7.h: Temp register is now r6 instead of r3 for ARMv7. * dfg/DFGGPRInfo.h: Add r3 properly in GPRInfo for ARM. * jit/JITStubs.cpp: Remove obsolete timeoutCheckRegister init. * yarr/YarrJIT.cpp: Use r3 and not the new scratch register r6 and r8 register doesn't need to be saved. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@158208 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: I5198a158e5e69d4e3a05b353abb60f28c0ab095e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Add QWebHitTestResult::linkTitleString().Florian Bruhin2015-01-272-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | QWebHitTestResult::linkTitle returned the link title as an (invalid) QUrl. Since the return type can not be changed before Qt 6, it is now obsolete and replaced by a linkTitleString method with a correct (QString) return type. Task-number: QTBUG-44052 Change-Id: I0636de3112eac19942db7c29c7cc5b8a0ac1e05a Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devFrederik Gladhorn2015-01-195-7/+9
|\ \
| * | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-12-175-7/+9
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I623088d8d000cd57cea011bb33c482e8f379021f
| | * Remove double quotation from $preprocessorStephan Binner2014-12-121-0/+3
| | | | | | | | | | | | | | | Change-Id: I975dda0df62b61ae82d0a0f58f8446c7513b507e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * Do not set the mainframe graphicslayer to being opaque when it isn'tAllan Sandfeld Jensen2014-12-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the frameview has a transparent background we need to tell the GraphicsLayer that it is not opaque otherwise the TextureMapperGL might choose not to use blend. Task-number: QTBUG-40063 Change-Id: If129305fed8620cd3c28cec5357625d8892ad063 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| | * Remove unnecessary \inqmlmodule parameterAlejandro Exojo2014-12-081-1/+1
| | | | | | | | | | | | | | | Change-Id: Ib63865b4205ffc6bb8dbfb1f8c8e607cc29c1364 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| | * Disable the animation so the style renders buttons correctlyAndy Shaw2014-12-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously just the style was checked to see if it was one that supported animations on buttons. However when a stylesheet is used then it would not correctly be picked up. Therefore the animations are disabled directly using the property available on the styleObject. Task-number: QTBUG-39400 Change-Id: I99c205bf61d98f9bfefc8c9c6f9806d3d068abc4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * Fix documentation for QWebPage::scrollRequested signal.Florian Bruhin2014-12-021-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation says the scrollRequested signal will be emitted if no view was set, however the signal gets emitted unconditionally. This behavior was changed in https://bugs.webkit.org/show_bug.cgi?id=21790 Change-Id: I3d6df9935fc5d6efb14bc956c43c03b655f9a2ad Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Add support authenticated POST requestsAllan Sandfeld Jensen2015-01-132-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To resend a POST request on authentication challenge we need to be able to reset the FormData IODevice so it can give the same data again to QtNetwork. Task-number: QTBUG-43628 Change-Id: Icc0a25f45dee80240501b18f1e3f61af022552d1 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | | Map CSS font-weights to new QFont enumsAllan Sandfeld Jensen2015-01-081-5/+33
|/ / | | | | | | | | | | | | | | Fixes the selection of light font for weight 300, and adds mapping for the rest of the values that was added in Qt 5.5. Change-Id: Ic92e61bc9e452d44328ac05ad5c9a2b15fceb91e Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* / Use deepbind when loading plugins.Allan Sandfeld Jensen2014-12-031-1/+10
|/ | | | | | | | | | This patch adds the deepbind option when loading plugins. This allows us to load plugins linked against different library versions, especially plugins linked against Qt 4. It is not recursive though, and plugins loading subplugins must still be blacklisted. Change-Id: Id4f86dc01c1712a08eb4828a852f8a0733eaf899 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix build failure with python3Samuel Martin2014-11-261-1/+1
| | | | | | Task-number: QTBUG-33692 Change-Id: I9f0bd6411e42b7ca06710dd47e3bcae4d2605c81 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* 100% cpu usage for "transition: opacity" animationLuciano Wolf2014-11-261-1/+1
| | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=120012 Reviewed by Noam Rosenthal. Schedule animation timer after scheduling a layer flush. This way it won't overwrite animation timer with "0", thus avoiding 100% cpu usage. * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp: (WebKit::CoordinatedLayerTreeHost::scheduleAnimation): Change-Id: Ia423bb1a8cb5da8f29aaa489c8023744d43119f2 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154711 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2014-11-212-7/+13
|\ | | | | | | Change-Id: I3df74c8b47ff6e3d668f8b2126e6145670327d73