Qt/GTK+ build fix.
authoraroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Jan 2008 19:06:55 +0000 (19:06 +0000)
committeraroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Jan 2008 19:06:55 +0000 (19:06 +0000)
        * platform/gtk/ScrollViewGtk.cpp:
        (WebCore::ScrollView::ScrollViewPrivate::isActive):
        * platform/qt/ScrollViewQt.cpp:
        (WebCore::ScrollView::ScrollViewPrivate::isActive):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29586 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/platform/gtk/ScrollViewGtk.cpp
WebCore/platform/qt/ScrollViewQt.cpp

index bfe2da4..e61ba24 100644 (file)
@@ -1,3 +1,12 @@
+2008-01-17  Adam Roben  <aroben@apple.com>
+
+        Qt/GTK+ build fix.
+
+        * platform/gtk/ScrollViewGtk.cpp:
+        (WebCore::ScrollView::ScrollViewPrivate::isActive):
+        * platform/qt/ScrollViewQt.cpp:
+        (WebCore::ScrollView::ScrollViewPrivate::isActive):
+
 2008-01-16  Adam Roben  <aroben@apple.com>
 
         Update scroll bars/form controls when FocusController::isActive changes
index 0b0cdda..a180813 100644 (file)
@@ -93,6 +93,7 @@ public:
 
     virtual void valueChanged(Scrollbar*);
     virtual IntRect windowClipRect() const;
+    virtual bool isActive() const;
 
     static void adjustmentChanged(GtkAdjustment*, gpointer);
 
@@ -241,6 +242,12 @@ IntRect ScrollView::ScrollViewPrivate::windowClipRect() const
     return static_cast<const FrameView*>(view)->windowClipRect(false);
 }
 
+bool ScrollView::ScrollViewPrivate::isActive() const
+{
+    Page* page = static_cast<const FrameView*>(m_view)->frame()->page();
+    return page && page->focusController()->isActive();
+}
+
 ScrollView::ScrollView()
     : m_data(new ScrollViewPrivate(this))
 {}
index 5be2b4f..71c043d 100644 (file)
@@ -78,6 +78,7 @@ public:
 
     virtual void valueChanged(Scrollbar*);
     virtual IntRect windowClipRect() const;
+    virtual bool isActive() const;
 
     void scrollBackingStore(const IntSize& scrollDelta);
 
@@ -171,6 +172,12 @@ IntRect ScrollView::ScrollViewPrivate::windowClipRect() const
     return static_cast<const FrameView*>(m_view)->windowClipRect(false);
 }
 
+bool ScrollView::ScrollViewPrivate::isActive() const
+{
+    Page* page = static_cast<const FrameView*>(m_view)->frame()->page();
+    return page && page->focusController()->isActive();
+}
+
 ScrollView::ScrollView()
     : m_data(new ScrollViewPrivate(this))
 {