Index: content/browser/android/overscroll_glow.cc |
diff --git a/content/browser/android/overscroll_glow.cc b/content/browser/android/overscroll_glow.cc |
index 2c9efeea72d846f43221928b3db136f20d51542a..6adf7dbec48daa75b2cc8b49d8124a960da257da 100644 |
--- a/content/browser/android/overscroll_glow.cc |
+++ b/content/browser/android/overscroll_glow.cc |
@@ -65,13 +65,14 @@ gfx::Vector2dF ZeroSmallComponents(gfx::Vector2dF vector) { |
} // namespace |
-scoped_ptr<OverscrollGlow> OverscrollGlow::Create(bool enabled) { |
+scoped_ptr<OverscrollGlow> OverscrollGlow::Create(bool enabled, |
+ gfx::SizeF size) { |
const SkBitmap& edge = g_overscroll_resources.Get().edge_bitmap(); |
const SkBitmap& glow = g_overscroll_resources.Get().glow_bitmap(); |
if (edge.isNull() || glow.isNull()) |
return scoped_ptr<OverscrollGlow>(); |
- return make_scoped_ptr(new OverscrollGlow(enabled, edge, glow)); |
+ return make_scoped_ptr(new OverscrollGlow(enabled, size, edge, glow)); |
} |
void OverscrollGlow::EnsureResources() { |
@@ -79,9 +80,11 @@ void OverscrollGlow::EnsureResources() { |
} |
OverscrollGlow::OverscrollGlow(bool enabled, |
+ gfx::SizeF size, |
const SkBitmap& edge, |
const SkBitmap& glow) |
: enabled_(enabled), |
+ size_(size), |
horizontal_overscroll_enabled_(true), |
vertical_overscroll_enabled_(true), |
root_layer_(cc::Layer::Create()) { |