diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-27 02:11:30 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-28 15:30:37 +0000 |
| commit | 54e605a32bdceab163e4f2725794c1aab43adc73 (patch) | |
| tree | 493e0254601213505e06fcf12900646da050025a /Tools | |
| parent | 4bd713d56aa9bb86bc96ea9cb0c64cbf94bf43d4 (diff) | |
Import WebKit commit 7aa9943a36e7f3e72207dbf448d2d80fb368a300
Change-Id: I7e96b8e5ba5eef9b0c6c0835e200f770200573ed
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/QtTestBrowser/launcherwindow.cpp | 10 | ||||
| -rw-r--r-- | Tools/QtTestBrowser/launcherwindow.h | 2 | ||||
| -rw-r--r-- | Tools/qt/manifest.txt | 3 |
3 files changed, 15 insertions, 0 deletions
diff --git a/Tools/QtTestBrowser/launcherwindow.cpp b/Tools/QtTestBrowser/launcherwindow.cpp index 1321760f8..3d3414272 100644 --- a/Tools/QtTestBrowser/launcherwindow.cpp +++ b/Tools/QtTestBrowser/launcherwindow.cpp @@ -592,6 +592,16 @@ bool LauncherWindow::isGraphicsBased() const return bool(qobject_cast<QGraphicsView*>(m_view)); } +void LauncherWindow::closeEvent(QCloseEvent* e) +{ + e->ignore(); + auto c = connect(page(), &QWebPage::windowCloseRequested, this, [e]() { + e->accept(); + }); + page()->triggerAction(QWebPage::RequestClose); + disconnect(c); +} + void LauncherWindow::sendTouchEvent() { if (m_touchPoints.isEmpty()) diff --git a/Tools/QtTestBrowser/launcherwindow.h b/Tools/QtTestBrowser/launcherwindow.h index c9388da85..9020109db 100644 --- a/Tools/QtTestBrowser/launcherwindow.h +++ b/Tools/QtTestBrowser/launcherwindow.h @@ -195,6 +195,8 @@ private: bool isGraphicsBased() const; private: + void closeEvent(QCloseEvent*) final; + static QVector<int> m_zoomLevels; int m_currentZoom; diff --git a/Tools/qt/manifest.txt b/Tools/qt/manifest.txt index a09153070..cd60a6299 100644 --- a/Tools/qt/manifest.txt +++ b/Tools/qt/manifest.txt @@ -82,6 +82,9 @@ file Source/WTF/wtf/cf file Source/WTF/wtf/cocoa file Source/WTF/wtf/text/cf file Source/WebCore/platform/cf/SharedBufferCF.cpp +file Source/WebCore/platform/cocoa/MachSendRight.cpp +file Source/WebCore/platform/cocoa/MachSendRight.h +file Source/WebCore/platform/spi/cocoa/MachVMSPI.h # WK2 on Windows and macOS file Source/WebKit2/Platform/IPC/mac |