diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-09-09 15:59:06 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-09-10 13:02:18 +0200 |
| commit | f2224a1d1100c415f0533df1275d212e423f31e4 (patch) | |
| tree | f422d8fbf2cefa81899b201ce48d99bd083f967c | |
| parent | be2a90afd34a8c851a6d49b6c1dffc8546263aab (diff) | |
Do a minor update to Chromium 37.0.2062.103
Change-Id: Ie9334cc9cdd240b2f5ceea0e31d82258045ea18c
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/render_widget_host_view_qt.cpp | 2 | ||||
| -rw-r--r-- | tools/scripts/version_resolver.py | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject e9509ea576f4fb1b65598435f0e13d1dcd127f7 +Subproject 7d9f85dc4a5c3474e7116abb26697cee280eca9 diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp index 08e7ca783..0c015f39c 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -152,6 +152,8 @@ public: virtual float GetHistoricalTouchMajor(size_t pointer_index, size_t historical_index) const Q_DECL_OVERRIDE { return 0; } virtual float GetHistoricalX(size_t pointer_index, size_t historical_index) const Q_DECL_OVERRIDE { return 0; } virtual float GetHistoricalY(size_t pointer_index, size_t historical_index) const Q_DECL_OVERRIDE { return 0; } + virtual ToolType GetToolType(size_t pointer_index) const Q_DECL_OVERRIDE { return ui::MotionEvent::TOOL_TYPE_UNKNOWN; } + virtual int GetButtonState() const Q_DECL_OVERRIDE { return 0; } virtual scoped_ptr<MotionEvent> Cancel() const Q_DECL_OVERRIDE { Q_UNREACHABLE(); return scoped_ptr<MotionEvent>(); } diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py index c28a422c1..d3d82094a 100644 --- a/tools/scripts/version_resolver.py +++ b/tools/scripts/version_resolver.py @@ -51,7 +51,7 @@ import json import urllib2 import git_submodule as GitSubmodule -chromium_version = '37.0.2062.68' +chromium_version = '37.0.2062.103' chromium_branch = '2062' json_url = 'http://omahaproxy.appspot.com/all.json' |