Skip to content

Instantly share code, notes, and snippets.

View kenchris's full-sized avatar
🏠
Working from home

Kenneth Rohde Christiansen kenchris

🏠
Working from home
229 followers · 4 following
  • Intel Corporation
  • Denmark
View GitHub Profile
@kenchris
kenchris / gist:1978324
Created March 5, 2012 13:34
commit 0daa70f5652036520e144a6d2616a7f86d1244ea
commit 0daa70f5652036520e144a6d2616a7f86d1244ea
Author: Kenneth Rohde Christiansen <kenneth@webkit.org>
Date: Mon Mar 5 14:22:44 2012 +0100
Rename the timers to be consistent with the actual code.
diff --git a/Source/WebCore/platform/graphics/TiledBackingStore.cpp b/Source/WebCore/platform/graphics/TiledBackingStore.cpp
index ab3e2b9..47e8d37 100644
--- a/Source/WebCore/platform/graphics/TiledBackingStore.cpp
@kenchris
kenchris / gist:1978327
Created March 5, 2012 13:35
commit f8c9fa5a9e356b6952d5c55f4a51269539c053be
Author: Kenneth Rohde Christiansen <kenneth@webkit.org>
Date: Mon Mar 5 14:23:07 2012 +0100
Use OwnPtr for the timers
diff --git a/Source/WebCore/platform/graphics/TiledBackingStore.cpp b/Source/WebCore/platform/graphics/TiledBackingStore.cpp
index 47e8d37..8adbb30 100644
--- a/Source/WebCore/platform/graphics/TiledBackingStore.cpp
+++ b/Source/WebCore/platform/graphics/TiledBackingStore.cpp
@kenchris
kenchris / gist:1993037
Created March 7, 2012 13:13
diff --git a/Source/WebKit2/UIProcess/WebPageProxy.cpp b/Source/WebKit2/UIProcess/WebPageProxy.cpp
index 299ac1c..130ab9b 100644
--- a/Source/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/Source/WebKit2/UIProcess/WebPageProxy.cpp
@@ -1007,7 +1007,10 @@ void WebPageProxy::handleTouchEvent(const NativeWebTouchEvent& event)
if (!isValid())
return;
- if (m_needTouchEvents) {
+ // If the page is suspended, which should be the case during panning, pinching
@kenchris
kenchris / gist:2049868
Created March 16, 2012 12:27
diff --git a/Source/WebCore/platform/graphics/TiledBackingStore.cpp b/Source/WebCore/platform/graphics/TiledBackingStore.cpp
index 9bd424c..940b45e 100644
--- a/Source/WebCore/platform/graphics/TiledBackingStore.cpp
+++ b/Source/WebCore/platform/graphics/TiledBackingStore.cpp
@@ -69,10 +69,14 @@ void TiledBackingStore::setTileCreationDelay(double delay)
void TiledBackingStore::coverWithTilesIfNeeded(const FloatPoint& trajectoryVector)
{
IntRect visibleRect = this->visibleRect();
- if (m_trajectoryVector == trajectoryVector && m_visibleRect == visibleRect)
+
@kenchris
kenchris / gist:2137460
Created March 20, 2012 15:59
diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
index fdc2073..b3b5a65 100644
--- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
@@ -489,8 +489,6 @@ void QQuickWebViewLegacyPrivate::updateViewportSize()
QQuickWebViewFlickablePrivate::QQuickWebViewFlickablePrivate(QQuickWebView* viewport)
: QQuickWebViewPrivate(viewport)
- , postTransitionState(adoptPtr(new PostTransitionState(this)))
- , isTransitioningToNewPage(false)
@kenchris
kenchris / gist:2138096
Created March 20, 2012 16:46
diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
index fdc2073..8e17f18 100644
--- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
@@ -489,8 +489,6 @@ void QQuickWebViewLegacyPrivate::updateViewportSize()
QQuickWebViewFlickablePrivate::QQuickWebViewFlickablePrivate(QQuickWebView* viewport)
: QQuickWebViewPrivate(viewport)
- , postTransitionState(adoptPtr(new PostTransitionState(this)))
- , isTransitioningToNewPage(false)
@kenchris
kenchris / gist:2151568
Created March 21, 2012 19:16
diff --git a/Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.cpp b/Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.cpp
index 431f8d8..eaa6ed9 100644
--- a/Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.cpp
+++ b/Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.cpp
@@ -75,6 +75,7 @@ bool QtPanGestureRecognizer::recognize(const QTouchEvent* event)
return false;
m_state = GestureRecognized;
+ interactionEngine()->cancelScrollAnimation();
ASSERT(m_touchBegin);
@kenchris
kenchris / gist:2157308
Created March 22, 2012 09:25
diff --git a/Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.cpp b/Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.cpp
index 431f8d8..eaa6ed9 100644
--- a/Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.cpp
+++ b/Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.cpp
@@ -75,6 +75,7 @@ bool QtPanGestureRecognizer::recognize(const QTouchEvent* event)
return false;
m_state = GestureRecognized;
+ interactionEngine()->cancelScrollAnimation();
ASSERT(m_touchBegin);
@kenchris
kenchris / gist:2158016
Created March 22, 2012 12:24
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 9496aae..ea4bdde 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,27 @@
+2012-03-22 Kenneth Rohde Christiansen <kenneth@webkit.org>
+
+ [Qt] Fix some issues with the gesture recognizers
+
+ Reviewed by NOBODY (OOPS!).
@kenchris
kenchris / gist:2293169
Created April 3, 2012 16:00
diff --git a/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp b/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp
index d637366..17e8394 100644
--- a/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp
+++ b/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp
@@ -37,83 +37,73 @@ QtTapGestureRecognizer::QtTapGestureRecognizer(QtWebPageEventHandler* eventHandl
{
}
+static inline bool withinDistance(const QTouchEvent::TouchPoint& touchPoint, int distance)
+{