summaryrefslogtreecommitdiff
path: root/Source/WebKit/qt/WidgetSupport
Commit message (Collapse)AuthorAgeFilesLines
* Import QtWebKit commit 55ed4f703de7bfbb0f554cd05dccff4c6db1bba3Konstantin Tokarev2019-09-052-0/+51
| | | | | Change-Id: I5063dd830f1cedda84e1ae66b0e659ffe7efa22c Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 1c054b639030b02ff98964cc915beaa45b18e6ceKonstantin Tokarev2019-09-021-0/+14
| | | | | Change-Id: Ieac288ef14217f25da44d69e1d191c47290182c3 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 5ccca3a720f7c2251c4ac8b28f25bd73524081f0Konstantin Tokarev2019-06-041-3/+3
| | | | | | | | | | | | | Change-Id: Idfb37cd43929536d4c67d1fa5d8cb598e9c0ad7e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 708de1520656bdf12023c04199ecab1b427d5e0cKonstantin Tokarev2017-11-041-2/+4
| | | | | Change-Id: Id24f973470620b1c7a36576606b81f5df0fd75d0 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit bdab88b903fe1a254c80af20161183976670cd3bKonstantin Tokarev2017-02-022-8/+43
| | | | | Change-Id: Idc1156f4a64df4e7d89e90d4e03451f004c8ae6d Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit 490f716dd2dd07fb0d6652795c62586e2e28ae27Konstantin Tokarev2017-02-028-104/+104
| | | | | Change-Id: I9f66467721cf923468af87915c260c1bb44e013e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit 2730223e8fe1776419fae168986b9e77f55d02d3Konstantin Tokarev2017-02-021-0/+2
| | | | | Change-Id: I46d453477a779a8db544ffc50d088fa13331da9b Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit eb954cdcf58f9b915b2fcb6f8e4cb3a60650a4f3Konstantin Tokarev2017-02-021-0/+3
| | | | | Change-Id: I8dda875c38075d43b76fe3a21acb0ffa102bb82d Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)Konstantin Tokarev2017-02-028-76/+24
| | | | | Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Don't use deprecated version suffixes of QStyleOption* classes.Konstantin Tokarev2016-06-151-4/+4
| | | | | | | They are deprecated since Qt 5.0. Change-Id: Id6df1fa1eec1e1f6bee863d7c00f37a599dd49f3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix potential crash on exitAllan Sandfeld Jensen2015-05-181-1/+2
| | | | | | | | | If we close a browser with a combobox open it may crash on exit due to double deferred deletion. This patch avoids that by using a smarter pointer. Change-Id: I3f1c561b0eb70cf1a51054de51b1027b52cd41b6 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-102-0/+12
|\ | | | | | | Change-Id: I824a984e8552340c2f9f631ac951f2c9eaa90b74
| * Forward show and hide events to PluginViewsMichael Bruning2015-02-262-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Update copyright headersJani Heikkinen2015-02-1614-14/+14
|/ | | | | | | | | | 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>
* 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>
* [Windows] Also check for QApplication::style when animating buttons.Michael Brüning2014-10-211-1/+1
| | | | | | | | | | The fallback style for a custom style sheet is QApplication::style(), which defaults to QWindowsVistaStyle on most (if not all) windows systems. Task-number: QTBUG-39400 Change-Id: Ib05571033730ed26a39f89d8e9fe948c4b280e64 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-161-0/+2
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I08b9747648df91cda78b49c8b4fa2bce8539dd4f
| * QWidgetPluginImpl: fix build with QT_NO_STYLE_STYLESHEETOlivier Blin2014-09-091-0/+2
| | | | | | | | | | Change-Id: Ia96efd95ff5f92e5b6569b343764c337fb1a8d41 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Support QOpenGLWidget for accelerated compositingAllan Sandfeld Jensen2014-08-061-6/+30
| | | | | | | | | | | | | | | | This patch enables the use of QOpenGLWidget for the same role QGLWidget can be used to enable accelerated compositing in QtWebKit. Change-Id: I7ac5c00c3a4b411637544128fc5d805781b9da4d Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-291-1/+5
|\ \ | |/ | | | | Change-Id: I488a1ee13117760781019a2f4bc6f6dff64c6871
| * 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>
* | Implement Accelerated 2D CanvasAllan Sandfeld Jensen2014-07-032-0/+14
|/ | | | | | | | | Implements accelered 2d canvas and makes it an setting. Accelerated 2D canvas can especially speed up image blitting and complex transforms on embedded devices when using a QGLWidget viewport. Change-Id: I98a03f3c76d4e87799830171c6df101ed9908de3 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix animation errors with radio buttons and checkboxes on Windows.Michael Brüning2014-05-141-0/+3
| | | | | | | | | | The QWindowsVistaStyle used the animation state of the control's style object. Since this is the QWebView for controls used in QtWebKit, this leads to unpredictable painting behavior. Task-number: QTBUG-30072 Change-Id: I1ba572bfbf56745b8e85fd631a596c43aa2ba25a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@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>
* Fix build with QT_NO_GRAPHICSVIEWSergio Martins2014-02-091-0/+4
| | | | | Change-Id: Ia909a560db58d6cdc6ec4bbac879249eb5e286ef Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Account for when the QGraphicsView is a top level widgetv5.2.0-rc1Andy Shaw2013-11-251-1/+4
| | | | | | | | | | | | | | When the QGraphicsView was a top level widget then it would not account for the transformations as it did not translate the point from the scene to the view. [ChangeLog][QtWebKitWidgets][QGraphicsWebView] Make sure that mouse events for QGraphicsWebView items in a top level QGraphicsView. Task-number: QTBUG-32179 Change-Id: I2c26580a7e7e5eaec08d71768298e961d3e9d13b Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* [Qt] RepaintRequested signal sometimes not emittedAllan Sandfeld Jensen2013-09-261-0/+2
| | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=121790 Reviewed by Simon Hausmann. We should also emit repaintRequested after calling PageClient::update(). * WidgetSupport/PageClientQt.cpp: (WebCore::PageClientQWidget::repaintViewport): (WebCore::PageClientQGraphicsWidget::repaintViewport): Change-Id: Ib8664ef0b25b7b9c51f3fd32925d018be3906299 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156329 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* [Qt][Win] Input events aren't mapped properly with windowless plugins.Jocelyn Turcotte2013-06-042-22/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=116094 Reviewed by Tor Arne Vestbø. Source/WebCore: The events are first sent properly but Flash then immediately repaints and this causes flickering painting. The issue is that Flash seems to be doing some input event tracking of its own internally, using the HWND returned through NPN_GetValue(NPNVnetscapeWindow). We are currently using two coordinate systems for windowless plugins on Windows with Qt: - FrameView coordinates: Used for input events and ajusted with the WM_WINDOWPOSCHANGED message - Drawable coordinates: Used by WM_PAINT and adjusted with NPP_SetWindow This patch fixes the bug by mapping input events to the native window returned as NPNVnetscapeWindow instead of the FrameView to ensure that those coordinates will match the ones used by Flash internally. With this we shouldn't be using FrameView coordinates anywhere for windowless plugins on Windows with Qt. * platform/qt/QWebPageClient.h: (QWebPageClient): Added mapToOwnerWindow to the interface, mapping from the FrameView up to the wrapping nativeParentWidget. * plugins/win/PluginViewWin.cpp: (WebCore::contentsToNativeWindow): (WebCore::PluginView::paintIntoTransformedContext): (WebCore::PluginView::handleMouseEvent): Source/WebKit/qt: * WidgetSupport/PageClientQt.cpp: (WebCore::PageClientQWidget::mapToOwnerWindow): (WebCore::PageClientQGraphicsWidget::makeOpenGLContextCurrentIfAvailable): (WebCore::PageClientQGraphicsWidget::screenNumber): (WebCore::PageClientQGraphicsWidget::geometryRelativeToOwnerWidget): (WebCore::PageClientQGraphicsWidget::mapToOwnerWindow): (WebCore::PageClientQGraphicsWidget::graphicsItemVisibleRect): (WebCore::PageClientQGraphicsWidget::firstGraphicsView): Extracted this common logic from makeOpenGLContextCurrentIfAvailable, screenNumber, geometryRelativeToOwnerWidget and graphicsItemVisibleRect to be able to use it in mapToOwnerWindow. * WidgetSupport/PageClientQt.h: (PageClientQWidget): (PageClientQGraphicsWidget): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@150749 268f45cc-cd09-0410-ab3c-d52691b4dbfc Conflicts: Source/WebCore/plugins/win/PluginViewWin.cpp Change-Id: I11ec6b6a9377c3e09b775d24fffb8572decbd0a5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* [Qt] Apply correct patch for the scrolling issue from bug 105014michael.bruning2013-01-161-1/+1
| | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=106219 Correct the if condition when overwriting the layout direction option with the values from the facade options to only overwrite if the facade direction is not equal to LayoutDirectionAuto. Reviewed by Allan Sandfeld Jensen. * WidgetSupport/QStyleFacadeImp.cpp: (WebKit::initGenericStyleOption): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@138946 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: I95c3e73766ae9351ae24be0270054d318c1775f0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* [Qt] Horizontal scrollbars events are offseted making them difficult to usemichael.bruning2013-01-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=105014 Reviewed by Allan Sandfeld Jensen. Patch co-authored by Simon Hausmann. Only copy the layout direction from the facade options if the current option is Qt::LayoutDirectionAuto in order to prevent misinterpretations as different layout direction when hit testing. Tests added to tst_qwebview and tst_qgraphicswebview to verify that the view actually is scrolled in the right direction. * WidgetSupport/QStyleFacadeImp.cpp: (WebKit::initGenericStyleOption): * tests/qgraphicswebview/resources/scrolltest_page.html: Added. * tests/qgraphicswebview/tst_qgraphicswebview.cpp: (tst_QGraphicsWebView): (tst_QGraphicsWebView::horizontalScrollbarTest): * tests/qgraphicswebview/tst_qgraphicswebview.qrc: * tests/qwebview/resources/scrolltest_page.html: Added. * tests/qwebview/tst_qwebview.cpp: (tst_QWebView): (tst_QWebView::horizontalScrollbarTest): * tests/qwebview/tst_qwebview.qrc: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@138933 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: I3c8190858f4a0fcd0bf394056771f775677ba30e Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Revert "Use non transient scrollbars on Mac"Eike Ziller2012-12-121-22/+0
| | | | | | | | | | | The patch made all checks for m_style->inherits("QMacStyle") in the StyleFacadeImp fail. This reverts commit 08d610737197b47bdfc7f78b0f712c337cc87286. Change-Id: Ie3f4d1cadcf32a71935e87075fbaf48c66c82f5f Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Use non transient scrollbars on MacGabriel de Dietrich2012-12-061-0/+22
| | | | | | | | | The current rendering would display the transient scrollbar on top of an empty background area. To make it look decent, we force non transient scrollbars through a style proxy. Change-Id: I33cdf9b9bb91d635eb40242187f98dd84da1fb9a Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* [Qt][Mac] QWebView disappears when the system tries to hide the scrollbars.v5.0.0-rc1Zeno Albisser2012-12-051-16/+11
| | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=104116 This is a workaround for an issue in Qt that was caused by Change-Id: I2000fa50d46b153e981ceafc12a53932a196382e in qtbase. Since we are drawing the scrollbars by ourselves, there is no widget available that needs to be hidden by the style. Therefore we have to disable transient scrollbar animations on Mac. Patch by: J-P Nurmi <jpnurmi@digia.com> Reviewed by Simon Hausmann. * WidgetSupport/QStyleFacadeImp.cpp: (WebKit::QStyleFacadeImp::paintScrollBar): Change-Id: Ia9ff6d6634aecfe574ba2842258fc003d4a5c665 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* [Qt] Use a separate QWEBKITWIDGETS_EXPORT macro for WebKitWidgetsPierre Rossi2012-12-032-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=103844 Patch by Pierre Rossi <pierre.rossi@digia.com> on 2012-12-03 Reviewed by Simon Hausmann. Let's follow the common practice and have one export macro per library. We can't rely on BUILDING_WEBKIT anymore in that case, so we use the qmake defines instead. * Api/qwebkitglobal.h: Updated the import/export logic. * WidgetApi/qgraphicswebview.h: s/QWEBKIT/QWEBKITWIDGETS/ * WidgetApi/qwebframe.h: Ditto. * WidgetApi/qwebinspector.h: Ditto. * WidgetApi/qwebpage.h: Ditto. * WidgetApi/qwebview.h: Ditto. * WidgetSupport/InitWebKitQt.cpp: (WebKit::initializeWebKitWidgets): use QWEBKITWIDGETS_EXPORT. * WidgetSupport/InitWebKitQt.h: (WebKit): Ditto. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@136394 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: I0030f2f17cddd66aedf24f29323579174e838303 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Imported WebKit commit 6a4a1d32e1d779548c726c4826cba9d69eb87601 ↵Simon Hausmann2012-11-3022-0/+2235
(http://svn.webkit.org/repository/webkit/trunk@136242) Final import for the Qt 5.x series that implements the QtWebKit / QtWebKitWidgets split Extra fixes will be cherry-picked. Change-Id: I844f1ebb99c6d6b75db31d6538c2acd628e79681 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
View Lorry Controller Status