Commit 4a1fc31c authored by Dawit Alemayehu's avatar Dawit Alemayehu
Browse files

Reverted commit d786bbdc which was a workaround for behavior change in

QtWebKit 2.3 beta releases. The issue has been corrected in the final
QtWebKit 2.3 release.

CCBUG: 313005
parent da64989b
......@@ -944,21 +944,6 @@ bool NewWindowPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequ
return WebPage::acceptNavigationRequest(frame, request, type);
}
/** TODO: Figure out if there is a way for QtWebKit to actually tell
* us whether we should create a popup window (dialog) or a regular
* new window. Right now that is simply broken because the parameter
* passed to QWebPage::createWindow is hard-coded in QtWebKit's code!
*/
#if (QTWEBKIT_VERSION >= QTWEBKIT_VERSION_CHECK(2, 3, 0))
static bool shouldApplyQtWebKit23Workaround(const QRect &rect)
{
return (rect.x() == 0 &&
rect.y() == 0 &&
rect.width() == 100 &&
rect.height() == 100);
}
#endif
void NewWindowPage::slotGeometryChangeRequested(const QRect & rect)
{
if (!rect.isValid())
......@@ -969,12 +954,6 @@ void NewWindowPage::slotGeometryChangeRequested(const QRect & rect)
return;
}
#if (QTWEBKIT_VERSION >= QTWEBKIT_VERSION_CHECK(2, 3, 0))
else if (shouldApplyQtWebKit23Workaround(rect)) {
return;
}
#endif
m_windowArgs.setX(rect.x());
m_windowArgs.setY(rect.y());
m_windowArgs.setWidth(qMax(rect.width(), 100));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment