diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 23:35:06 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 23:35:06 +0000 |
| commit | e90e1f02118866ce6ff066a28a3fec264c53c9b1 (patch) | |
| tree | 8431bbadd7cf6340ac1327b086226270d577f19c /cc | |
| parent | 2065bce60e9fefa0a0325c6467e8c6b543f1a294 (diff) | |
| download | chromium_src-e90e1f02118866ce6ff066a28a3fec264c53c9b1.zip chromium_src-e90e1f02118866ce6ff066a28a3fec264c53c9b1.tar.gz chromium_src-e90e1f02118866ce6ff066a28a3fec264c53c9b1.tar.bz2 | |
cc: Clamp the fixed thumb size to be at least zero.
WebKit is providing a negative thumb size sometimes, which causes asserts in
gfx::Size once we re-enable those DCHECKs.
BUG=160799
R=enne
Review URL: https://chromiumcodereview.appspot.com/11365247
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/scrollbar_geometry_stub.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cc/scrollbar_geometry_stub.cc b/cc/scrollbar_geometry_stub.cc index b9f8cf2..51fc4f9 100644 --- a/cc/scrollbar_geometry_stub.cc +++ b/cc/scrollbar_geometry_stub.cc @@ -4,6 +4,8 @@ #include "cc/scrollbar_geometry_stub.h" +#include <cmath> + using WebKit::WebRect; using WebKit::WebScrollbar; using WebKit::WebScrollbarThemeGeometry; @@ -31,7 +33,7 @@ int ScrollbarGeometryStub::thumbPosition(WebScrollbar* scrollbar) int ScrollbarGeometryStub::thumbLength(WebScrollbar* scrollbar) { - return m_geometry->thumbLength(scrollbar); + return std::max(0, m_geometry->thumbLength(scrollbar)); } int ScrollbarGeometryStub::trackPosition(WebScrollbar* scrollbar) |