Merge WebKit at r71558: Initial merge by git.

[android-x86/external-webkit.git] / WebCore / platform / ScrollView.h

diff --git a/WebCore/platform/ScrollView.h b/WebCore/platform/ScrollView.h
index 739e1ac..7fb5d8e 100644 (file)
--- a/WebCore/platform/ScrollView.h
+++ b/WebCore/platform/ScrollView.h
@@ -104,6 +104,7 @@ public:
     virtual void setCanHaveScrollbars(bool);
     bool canHaveScrollbars() const { return horizontalScrollbarMode() != ScrollbarAlwaysOff || verticalScrollbarMode() != ScrollbarAlwaysOff; }
 
+    virtual bool delegatesScrolling() { return false; }
     virtual bool avoidScrollbarCreation() { return false; }
 
     // By default you only receive paint events for the area that is visible. In the case of using a