Title: [112105] trunk/Source/WebKit2
- Revision
- 112105
- Author
- [email protected]
- Date
- 2012-03-26 08:50:09 -0700 (Mon, 26 Mar 2012)
Log Message
[Qt WK2] Disable/enable mouse events when displaying dialogs only for desktop view
https://bugs.webkit.org/show_bug.cgi?id=80542
Patch by Dinu Jacob <[email protected]> on 2012-03-26
Reviewed by Simon Hausmann.
* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewLegacyPrivate::enableMouseEvents):
(QQuickWebViewLegacyPrivate::disableMouseEvents):
* UIProcess/API/qt/qquickwebview_p_p.h:
(QQuickWebViewPrivate::enableMouseEvents):
(QQuickWebViewPrivate::disableMouseEvents):
(QQuickWebViewLegacyPrivate):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (112104 => 112105)
--- trunk/Source/WebKit2/ChangeLog 2012-03-26 15:37:11 UTC (rev 112104)
+++ trunk/Source/WebKit2/ChangeLog 2012-03-26 15:50:09 UTC (rev 112105)
@@ -1,3 +1,18 @@
+2012-03-26 Dinu Jacob <[email protected]>
+
+ [Qt WK2] Disable/enable mouse events when displaying dialogs only for desktop view
+ https://bugs.webkit.org/show_bug.cgi?id=80542
+
+ Reviewed by Simon Hausmann.
+
+ * UIProcess/API/qt/qquickwebview.cpp:
+ (QQuickWebViewLegacyPrivate::enableMouseEvents):
+ (QQuickWebViewLegacyPrivate::disableMouseEvents):
+ * UIProcess/API/qt/qquickwebview_p_p.h:
+ (QQuickWebViewPrivate::enableMouseEvents):
+ (QQuickWebViewPrivate::disableMouseEvents):
+ (QQuickWebViewLegacyPrivate):
+
2012-03-26 Jocelyn Turcotte <[email protected]>
[Qt] Make sure that purged directly composited images are re-created before a layer's sync.
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (112104 => 112105)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-03-26 15:37:11 UTC (rev 112104)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-03-26 15:50:09 UTC (rev 112105)
@@ -137,20 +137,6 @@
return webPageProxy->drawsTransparentBackground();
}
-void QQuickWebViewPrivate::enableMouseEvents()
-{
- Q_Q(QQuickWebView);
- q->setAcceptedMouseButtons(Qt::MouseButtonMask);
- q->setAcceptHoverEvents(true);
-}
-
-void QQuickWebViewPrivate::disableMouseEvents()
-{
- Q_Q(QQuickWebView);
- q->setAcceptedMouseButtons(Qt::NoButton);
- q->setAcceptHoverEvents(false);
-}
-
QPointF QQuickWebViewPrivate::pageItemPos()
{
ASSERT(pageView);
@@ -504,6 +490,20 @@
webPageProxy->drawingArea()->setVisibleContentsRect(IntRect(IntPoint(), viewportSize), 1, FloatPoint());
}
+void QQuickWebViewLegacyPrivate::enableMouseEvents()
+{
+ Q_Q(QQuickWebView);
+ q->setAcceptedMouseButtons(Qt::MouseButtonMask);
+ q->setAcceptHoverEvents(true);
+}
+
+void QQuickWebViewLegacyPrivate::disableMouseEvents()
+{
+ Q_Q(QQuickWebView);
+ q->setAcceptedMouseButtons(Qt::NoButton);
+ q->setAcceptHoverEvents(false);
+}
+
QQuickWebViewFlickablePrivate::QQuickWebViewFlickablePrivate(QQuickWebView* viewport)
: QQuickWebViewPrivate(viewport)
, pageIsSuspended(true)
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h (112104 => 112105)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h 2012-03-26 15:37:11 UTC (rev 112104)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h 2012-03-26 15:50:09 UTC (rev 112105)
@@ -66,8 +66,8 @@
virtual void initialize(WKContextRef contextRef = 0, WKPageGroupRef pageGroupRef = 0);
- void enableMouseEvents();
- void disableMouseEvents();
+ virtual void enableMouseEvents() { }
+ virtual void disableMouseEvents() { }
virtual QPointF pageItemPos();
virtual void updateContentsSize(const QSizeF&) { }
@@ -178,6 +178,8 @@
virtual void initialize(WKContextRef contextRef = 0, WKPageGroupRef pageGroupRef = 0);
virtual void updateViewportSize();
+ virtual void enableMouseEvents();
+ virtual void disableMouseEvents();
};
class QQuickWebViewFlickablePrivate : public QQuickWebViewPrivate {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
