From 0617145a89917ae7735fe1c9538688ab9a577df5 Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Fri, 30 Jul 2010 10:46:49 +0100
Subject: Merge WebKit at r64264 : Initial merge by git.

Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
---
 WebCore/page/FrameView.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'WebCore/page/FrameView.h')

diff --git a/WebCore/page/FrameView.h b/WebCore/page/FrameView.h
index 868a15f..718b793 100644
--- a/WebCore/page/FrameView.h
+++ b/WebCore/page/FrameView.h
@@ -63,6 +63,7 @@ public:
     virtual HostWindow* hostWindow() const;
     
     virtual void invalidateRect(const IntRect&);
+    virtual void setFrameRect(const IntRect&);
 
     Frame* frame() const { return m_frame.get(); }
     void clearFrame();
@@ -279,6 +280,7 @@ private:
 
     bool updateWidgets();
     void scrollToAnchor();
+    void scrollPositionChanged();
 
 #if ENABLE(INSPECTOR)
     InspectorTimelineAgent* inspectorTimelineAgent() const;
-- 
cgit v1.1