Build fix for Mac

        Keep FrameView::layoutIfNeededRecursive Windows- and Gtk-only for now
        (sadly). This will have to wait until we merge ScrollView and FrameView.

        Reviewed by NOBODY.

        * page/FrameView.cpp:
        * page/FrameView.h:

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bb46fb16909b94fe29dce04f3800dc29a06711a2..71950ae9ff277da57b812e4a5a5b4f917176fef8 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2007-08-21  Adam Roben  <aroben@apple.com>
+
+        Build fix for Mac
+
+        Keep FrameView::layoutIfNeededRecursive Windows- and Gtk-only for now
+        (sadly). This will have to wait until we merge ScrollView and FrameView.
+
+        Reviewed by NOBODY.
+
+        * page/FrameView.cpp:
+        * page/FrameView.h:
+
 2007-08-21  Adam Roben  <aroben@apple.com>
 
         Fix an ASSERT when using Find in Page

diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp
index 27f39dec50dba654394cba7673c03c111885f572..24013cd7309f06d131fc7d7fae318cca6c4be1ff 100644 (file)
--- a/WebCore/page/FrameView.cpp
+++ b/WebCore/page/FrameView.cpp
@@ -928,6 +928,7 @@ void FrameView::setWasScrolledByUser(bool wasScrolledByUser)
     d->m_wasScrolledByUser = wasScrolledByUser;
 }
 
+#if PLATFORM(WIN) || PLATFORM(GDK)
 void FrameView::layoutIfNeededRecursive()
 {
     // We have to crawl our entire tree looking for any FrameViews that need
@@ -948,5 +949,6 @@ void FrameView::layoutIfNeededRecursive()
         if ((*current)->isFrameView())
             static_cast<FrameView*>(*current)->layoutIfNeededRecursive();
 }
+#endif
 
 }

diff --git a/WebCore/page/FrameView.h b/WebCore/page/FrameView.h
index 61a4c99203649fed9148a6322293bdda5f68b2d9..5fba1e271393cbae8ffe1b85b7c56d587afd3693 100644 (file)
--- a/WebCore/page/FrameView.h
+++ b/WebCore/page/FrameView.h
@@ -125,7 +125,11 @@ public:
     bool wasScrolledByUser() const;
     void setWasScrolledByUser(bool);
 
+    // FIXME: This method should be used by all platforms, but currently depends on ScrollView::children,
+    // which not all methods have. Once FrameView and ScrollView are merged, this #if should be removed.
+#if PLATFORM(WIN) || PLATFORM(GDK)
     void layoutIfNeededRecursive();
+#endif
 
 private:
     void init();