Title: [102455] trunk/Tools
- Revision
- 102455
- Author
- [email protected]
- Date
- 2011-12-09 09:35:12 -0800 (Fri, 09 Dec 2011)
Log Message
[Qt] Remove a wrongly placed ASSERT.
Reviewed by Tor Arne Vestbø.
* MiniBrowser/qt/MiniBrowserApplication.cpp:
(MiniBrowserApplication::notify):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (102454 => 102455)
--- trunk/Tools/ChangeLog 2011-12-09 16:18:37 UTC (rev 102454)
+++ trunk/Tools/ChangeLog 2011-12-09 17:35:12 UTC (rev 102455)
@@ -1,3 +1,12 @@
+2011-12-09 Jocelyn Turcotte <[email protected]>
+
+ [Qt] Remove a wrongly placed ASSERT.
+
+ Reviewed by Tor Arne Vestbø.
+
+ * MiniBrowser/qt/MiniBrowserApplication.cpp:
+ (MiniBrowserApplication::notify):
+
2011-12-09 Cary Clark <[email protected]>
layout_test update to accommodate new use_skia=1 default on Chromium-Mac
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp (102454 => 102455)
--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp 2011-12-09 16:18:37 UTC (rev 102454)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp 2011-12-09 17:35:12 UTC (rev 102455)
@@ -94,7 +94,9 @@
}
BrowserWindow* browserWindow = qobject_cast<BrowserWindow*>(target);
- Q_ASSERT(browserWindow);
+ if (!browserWindow)
+ return QApplication::notify(target, event);
+
if (event->type() == QEvent::KeyRelease && static_cast<QKeyEvent*>(event)->key() == Qt::Key_Control) {
foreach (int id, m_heldTouchPoints)
if (m_touchPoints.contains(id))
@@ -103,7 +105,7 @@
sendTouchEvent(browserWindow);
}
- if (browserWindow && isMouseEvent(event)) {
+ if (isMouseEvent(event)) {
const QMouseEvent* const mouseEvent = static_cast<QMouseEvent*>(event);
QWindowSystemInterface::TouchPoint touchPoint;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
