diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-11 13:45:28 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-11 13:45:28 +0200 |
commit | d6a599dbc9d824a462b2b206316e102bf8136446 (patch) | |
tree | ecb257a5e55b2239d74b90fdad62fccd661cf286 /Source/WebKit2/UIProcess/qt | |
parent | 3ccc3a85f09a83557b391aae380d3bf5f81a2911 (diff) | |
download | qtwebkit-d6a599dbc9d824a462b2b206316e102bf8136446.tar.gz |
Imported WebKit commit 8ff1f22783a32de82fee915abd55bd1b298f2644 (http://svn.webkit.org/repository/webkit/trunk@122325)
New snapshot that should work with the latest Qt build system changes
Diffstat (limited to 'Source/WebKit2/UIProcess/qt')
-rw-r--r-- | Source/WebKit2/UIProcess/qt/QtDialogRunner.cpp | 6 | ||||
-rw-r--r-- | Source/WebKit2/UIProcess/qt/QtViewportHandler.cpp | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Source/WebKit2/UIProcess/qt/QtDialogRunner.cpp b/Source/WebKit2/UIProcess/qt/QtDialogRunner.cpp index 3ff4f273a..3d4c4e6d6 100644 --- a/Source/WebKit2/UIProcess/qt/QtDialogRunner.cpp +++ b/Source/WebKit2/UIProcess/qt/QtDialogRunner.cpp @@ -223,6 +223,12 @@ public slots: void accept(const QVariant& path) { QStringList filesPath = path.toStringList(); + + if (filesPath.isEmpty()) { + emit rejected(); + return; + } + // For single file upload, send only the first element if there are more than one file paths if (!m_allowMultiple && filesPath.count() > 1) filesPath = QStringList(filesPath.at(0)); diff --git a/Source/WebKit2/UIProcess/qt/QtViewportHandler.cpp b/Source/WebKit2/UIProcess/qt/QtViewportHandler.cpp index 548819e13..a1f56d189 100644 --- a/Source/WebKit2/UIProcess/qt/QtViewportHandler.cpp +++ b/Source/WebKit2/UIProcess/qt/QtViewportHandler.cpp @@ -238,6 +238,9 @@ void QtViewportHandler::viewportAttributesChanged(const WebCore::ViewportAttribu void QtViewportHandler::pageContentsSizeChanged(const QSize& newSize, const QSize& viewportSize) { + if (viewportSize.isEmpty()) + return; + float minimumScale = WebCore::computeMinimumScaleFactorForContentContained(m_rawAttributes, viewportSize, newSize); if (!qFuzzyCompare(minimumScale, m_rawAttributes.minimumScale)) { |