From 0db629da417dc3e637b8f0f877a79e2ec2ecc0f9 Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Tue, 24 Jan 2012 04:53:22 +0000 Subject: [PATCH] [Qt][WK2] QQuickWebView is initializing touch mode twice while being constructed https://bugs.webkit.org/show_bug.cgi?id=76859 Patch by Jesus Sanchez-Palencia on 2012-01-23 Reviewed by Kenneth Rohde Christiansen. Removing d->initializeTouch() from QQuickWebView::QQuickWebView() since in QQuickWebViewPrivate::initialize() there is a call for setUseTraditionalDesktopBehaviour(false), which will call initializeTouch. * UIProcess/API/qt/qquickwebview.cpp: (QQuickWebView::QQuickWebView): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@105689 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit2/ChangeLog | 14 ++++++++++++++ Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp | 1 - 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index 9dad6d4..476cbec 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,17 @@ +2012-01-23 Jesus Sanchez-Palencia + + [Qt][WK2] QQuickWebView is initializing touch mode twice while being constructed + https://bugs.webkit.org/show_bug.cgi?id=76859 + + Reviewed by Kenneth Rohde Christiansen. + + Removing d->initializeTouch() from QQuickWebView::QQuickWebView() + since in QQuickWebViewPrivate::initialize() there is a call for + setUseTraditionalDesktopBehaviour(false), which will call initializeTouch. + + * UIProcess/API/qt/qquickwebview.cpp: + (QQuickWebView::QQuickWebView): + 2012-01-23 Martin Robinson [GTK][WK2] Make the LoadTracking and WebView test fixtures more flexible diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp index aaf6334..e7162b7 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp @@ -871,7 +871,6 @@ QQuickWebView::QQuickWebView(QQuickItem* parent) { Q_D(QQuickWebView); d->initialize(); - d->initializeTouch(this); } QQuickWebView::QQuickWebView(WKContextRef contextRef, WKPageGroupRef pageGroupRef, QQuickItem* parent) -- 2.7.4