Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1625)

Unified Diff: Source/platform/PlatformGestureEvent.h

Issue 1308313005: Modify gesture event types for WebView-tag scroll bubbling. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rename |resendSource| to |resendingPluginId|. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/platform/PlatformGestureEvent.h
diff --git a/Source/platform/PlatformGestureEvent.h b/Source/platform/PlatformGestureEvent.h
index a1d8be5e0506953525615d3b62812b9567fb318b..e50d7db5da223c00118875e9986c2a117c5dcea3 100644
--- a/Source/platform/PlatformGestureEvent.h
+++ b/Source/platform/PlatformGestureEvent.h
@@ -55,7 +55,7 @@ public:
}
void setScrollGestureData(float deltaX, float deltaY, float velocityX, float velocityY,
- bool inertial, bool preventPropagation)
+ bool inertial, int resendingPluginId, bool preventPropagation)
{
ASSERT(type() == PlatformEvent::GestureScrollBegin
|| type() == PlatformEvent::GestureScrollUpdate
@@ -76,6 +76,7 @@ public:
m_data.m_scroll.m_velocityX = velocityX;
m_data.m_scroll.m_velocityY = velocityY;
m_data.m_scroll.m_inertial = inertial;
+ m_data.m_scroll.m_resendingPluginId = resendingPluginId;
m_data.m_scroll.m_preventPropagation = preventPropagation;
}
@@ -104,13 +105,13 @@ public:
float velocityX() const
{
- ASSERT(m_type == PlatformEvent::GestureScrollUpdate);
+ ASSERT(m_type == PlatformEvent::GestureScrollUpdate || m_type == PlatformEvent::GestureFlingStart);
return m_data.m_scroll.m_velocityX;
}
float velocityY() const
{
- ASSERT(m_type == PlatformEvent::GestureScrollUpdate);
+ ASSERT(m_type == PlatformEvent::GestureScrollUpdate || m_type == PlatformEvent::GestureFlingStart);
return m_data.m_scroll.m_velocityY;
}
@@ -120,6 +121,15 @@ public:
return m_data.m_scroll.m_inertial;
}
+ int resendingPluginId() const
+ {
+ ASSERT(m_type == PlatformEvent::GestureScrollUpdate);
tdresser 2015/09/15 13:13:08 In WebInputEventConversion, we populate the plugin
wjmaclean 2015/09/15 15:02:48 Done. We actually mark the bracketing begin/end t
+ if (isScrollEvent())
+ return m_data.m_scroll.m_resendingPluginId;
+
+ return 0;
tdresser 2015/09/15 13:13:08 Let's return -1 here.
wjmaclean 2015/09/15 15:02:48 Done.
+ }
+
bool preventPropagation() const
{
ASSERT(m_type == PlatformEvent::GestureScrollUpdate);
@@ -185,6 +195,7 @@ protected:
float m_velocityY;
int m_preventPropagation;
bool m_inertial;
+ int m_resendingPluginId;
} m_scroll;
struct {

Powered by Google App Engine
This is Rietveld 408576698