2006-10-07 Mark Rowe <bdash@webkit.org>

        Reviewed by Mitz.

        Linux/Gdk build fixes, primarily consisting of s/ScrollBar/Scrollbar/ and
        matching recent ResourceLoader changes.

        * platform/gdk/FrameGdk.cpp:
        (WebCore::FrameGdk::openURL):
        (WebCore::FrameGdk::urlSelected):
        * platform/gdk/PlatformScrollBar.h:
        * platform/gdk/ResourceLoaderCurl.cpp:
        (WebCore::ResourceLoader::start):
        * platform/gdk/ScrollViewGdk.cpp:
        (WebCore::ScrollView::ScrollViewPrivate::ScrollViewPrivate):
        (WebCore::ScrollView::resizeContents):
        (WebCore::ScrollView::scrollBy):
        (WebCore::ScrollView::hScrollbarMode):
        (WebCore::ScrollView::vScrollbarMode):
        (WebCore::ScrollView::suppressScrollbars):
        (WebCore::ScrollView::setHScrollbarMode):
        (WebCore::ScrollView::setVScrollbarMode):
        (WebCore::ScrollView::setScrollbarsMode):
        * platform/gdk/TemporaryLinkStubs.cpp:
        (FrameView::passMousePressEventToScrollbar):
        (Widget::removeFromParent):
        (ScrollView::addChild):
        (ScrollView::updateScrollbars):
        (ScrollView::scrollbarUnderMouse):
        (PlatformScrollbar::PlatformScrollbar):
        (PlatformScrollbar::~PlatformScrollbar):
        (PlatformScrollbar::width):
        (PlatformScrollbar::height):
        (PlatformScrollbar::setEnabled):
        (PlatformScrollbar::paint):
        (PlatformScrollbar::updateThumbPosition):
        (PlatformScrollbar::updateThumbProportion):
        (PlatformScrollbar::setRect):
        (Scrollbar::Scrollbar):
        (Scrollbar::setSteps):
        (Scrollbar::scroll):
        (Scrollbar::setValue):
        (Scrollbar::setProportion):

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b9c83d91f9c18c7990acb17bd6e96932b1893702..9c57ecb2ae8ebca273c7af44c26c808d4152065a 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,47 @@
+2006-10-07  Mark Rowe  <bdash@webkit.org>
+
+        Reviewed by Mitz.
+
+        Linux/Gdk build fixes, primarily consisting of s/ScrollBar/Scrollbar/ and
+        matching recent ResourceLoader changes.
+
+        * platform/gdk/FrameGdk.cpp:
+        (WebCore::FrameGdk::openURL):
+        (WebCore::FrameGdk::urlSelected):
+        * platform/gdk/PlatformScrollBar.h:
+        * platform/gdk/ResourceLoaderCurl.cpp:
+        (WebCore::ResourceLoader::start):
+        * platform/gdk/ScrollViewGdk.cpp:
+        (WebCore::ScrollView::ScrollViewPrivate::ScrollViewPrivate):
+        (WebCore::ScrollView::resizeContents):
+        (WebCore::ScrollView::scrollBy):
+        (WebCore::ScrollView::hScrollbarMode):
+        (WebCore::ScrollView::vScrollbarMode):
+        (WebCore::ScrollView::suppressScrollbars):
+        (WebCore::ScrollView::setHScrollbarMode):
+        (WebCore::ScrollView::setVScrollbarMode):
+        (WebCore::ScrollView::setScrollbarsMode):
+        * platform/gdk/TemporaryLinkStubs.cpp:
+        (FrameView::passMousePressEventToScrollbar):
+        (Widget::removeFromParent):
+        (ScrollView::addChild):
+        (ScrollView::updateScrollbars):
+        (ScrollView::scrollbarUnderMouse):
+        (PlatformScrollbar::PlatformScrollbar):
+        (PlatformScrollbar::~PlatformScrollbar):
+        (PlatformScrollbar::width):
+        (PlatformScrollbar::height):
+        (PlatformScrollbar::setEnabled):
+        (PlatformScrollbar::paint):
+        (PlatformScrollbar::updateThumbPosition):
+        (PlatformScrollbar::updateThumbProportion):
+        (PlatformScrollbar::setRect):
+        (Scrollbar::Scrollbar):
+        (Scrollbar::setSteps):
+        (Scrollbar::scroll):
+        (Scrollbar::setValue):
+        (Scrollbar::setProportion):
+
 2006-10-06  Dave Hyatt  <hyatt@apple.com>
 
         Implement a new method for obtaining accurate clip rectangles that can be used by plugins to properly clip.

diff --git a/WebCore/platform/gdk/FrameGdk.cpp b/WebCore/platform/gdk/FrameGdk.cpp
index 8c787feb818f782e6d75ceaf00de2a0373a5d14c..63fa835024a4c3ed2f912174634494c2a602795d 100644 (file)
--- a/WebCore/platform/gdk/FrameGdk.cpp
+++ b/WebCore/platform/gdk/FrameGdk.cpp
@@ -130,8 +130,8 @@ bool FrameGdk::openURL(const KURL& url)
 {
     didOpenURL(url);
     begin(url);
-    ResourceLoader* job = new ResourceLoader(this, "GET", url);
-    job->start(document()->docLoader());
+    RefPtr<ResourceLoader> loader = ResourceLoader::create(this, "GET", url);
+    loader->start(document()->docLoader());
     return true;
 }
 
@@ -146,8 +146,8 @@ void FrameGdk::urlSelected(const ResourceRequest& request)
     printf("------------------> LOADING NEW URL %s \n", url.url().ascii());
     didOpenURL(url);
     begin(url);
-    ResourceLoader* job = new ResourceLoader(this, "GET", url);
-    job->start(document()->docLoader());
+    RefPtr<ResourceLoader> loader = ResourceLoader::create(this, "GET", url);
+    loader->start(document()->docLoader());
 }
 
 String FrameGdk::userAgent() const

diff --git a/WebCore/platform/gdk/PlatformScrollBar.h b/WebCore/platform/gdk/PlatformScrollBar.h
index 7bb00a3ceecfda2fd4af274fb6c7f83b803fae61..5ed974cd1d5bf1380ec73e97d2a8e8dd0027d042 100644 (file)
--- a/WebCore/platform/gdk/PlatformScrollBar.h
+++ b/WebCore/platform/gdk/PlatformScrollBar.h
@@ -31,10 +31,10 @@
 
 namespace WebCore {
 
-class PlatformScrollBar : public Widget, public ScrollBar {
+class PlatformScrollbar : public Widget, public Scrollbar {
 public:
-    PlatformScrollBar(ScrollBarClient*, ScrollBarOrientation, ScrollBarControlSize);
-    virtual ~PlatformScrollBar();
+    PlatformScrollbar(ScrollbarClient*, ScrollbarOrientation, ScrollbarControlSize);
+    virtual ~PlatformScrollbar();
 
     virtual bool isWidget() const { return true; }
 

diff --git a/WebCore/platform/gdk/ResourceLoaderCurl.cpp b/WebCore/platform/gdk/ResourceLoaderCurl.cpp
index bf8504925e622b19fee87f3de333360ecbd33ab9..1b51ac93e124e6bebda59fdbac6330d228c6d422 100644 (file)
--- a/WebCore/platform/gdk/ResourceLoaderCurl.cpp
+++ b/WebCore/platform/gdk/ResourceLoaderCurl.cpp
@@ -45,6 +45,7 @@ ResourceLoader::~ResourceLoader()
 
 bool ResourceLoader::start(DocLoader* docLoader)
 {
+    ref();
     ResourceLoaderManager::get()->add(this);
     return true;
 }

diff --git a/WebCore/platform/gdk/ScrollViewGdk.cpp b/WebCore/platform/gdk/ScrollViewGdk.cpp
index 27b283dabbbc2b8794fb235c6aba6c3365991811..e5080d035e33055a66f3edb2254986ccd173c93b 100644 (file)
--- a/WebCore/platform/gdk/ScrollViewGdk.cpp
+++ b/WebCore/platform/gdk/ScrollViewGdk.cpp
@@ -49,16 +49,16 @@ class ScrollView::ScrollViewPrivate
 {
 public:
     ScrollViewPrivate()
-        : hasStaticBackground(false), suppressScrollBars(false)
-        , vScrollBarMode(ScrollBarAuto), hScrollBarMode(ScrollBarAuto)
+        : hasStaticBackground(false), suppressScrollbars(false)
+        , vScrollbarMode(ScrollbarAuto), hScrollbarMode(ScrollbarAuto)
     { }
 
     IntSize scrollOffset;
     IntSize contentsSize;
     bool hasStaticBackground;
-    bool suppressScrollBars;
-    ScrollBarMode vScrollBarMode;
-    ScrollBarMode hScrollBarMode;
+    bool suppressScrollbars;
+    ScrollbarMode vScrollbarMode;
+    ScrollbarMode hScrollbarMode;
     IntRect visibleContentArea;
     IntRect viewportArea;
     IntRect scrollViewArea;
@@ -123,7 +123,7 @@ void ScrollView::resizeContents(int w, int h)
     IntSize newSize(w, h);
     if (m_data->contentsSize != newSize) {
         m_data->contentsSize = newSize;
-        updateScrollBars();
+        updateScrollbars();
     }
 }
 
@@ -169,8 +169,8 @@ void ScrollView::scrollBy(int dx, int dy)
 
     if (newScrollOffset != scrollOffset) {
         m_data->scrollOffset = newScrollOffset;
-        updateScrollBars();
-        // ScrollBar updates can fail, so we check the final delta before scrolling
+        updateScrollbars();
+        // Scrollbar updates can fail, so we check the final delta before scrolling
         IntSize scrollDelta = m_data->scrollOffset - scrollOffset;
         if (scrollDelta == IntSize())
             return;
@@ -185,43 +185,43 @@ void ScrollView::scrollBy(int dx, int dy)
     }
 }
 
-ScrollBarMode ScrollView::hScrollBarMode() const
+ScrollbarMode ScrollView::hScrollbarMode() const
 {
-    return m_data->hScrollBarMode;
+    return m_data->hScrollbarMode;
 }
 
-ScrollBarMode ScrollView::vScrollBarMode() const
+ScrollbarMode ScrollView::vScrollbarMode() const
 {
-    return m_data->vScrollBarMode;
+    return m_data->vScrollbarMode;
 }
 
-void ScrollView::suppressScrollBars(bool suppressed, bool repaintOnSuppress)
+void ScrollView::suppressScrollbars(bool suppressed, bool repaintOnSuppress)
 {
-    m_data->suppressScrollBars = suppressed;
+    m_data->suppressScrollbars = suppressed;
     if (repaintOnSuppress)
-        updateScrollBars();
+        updateScrollbars();
 }
 
-void ScrollView::setHScrollBarMode(ScrollBarMode newMode)
+void ScrollView::setHScrollbarMode(ScrollbarMode newMode)
 {
-    if (m_data->hScrollBarMode != newMode) {
-        m_data->hScrollBarMode = newMode;
-        updateScrollBars();
+    if (m_data->hScrollbarMode != newMode) {
+        m_data->hScrollbarMode = newMode;
+        updateScrollbars();
     }
 }
 
-void ScrollView::setVScrollBarMode(ScrollBarMode newMode)
+void ScrollView::setVScrollbarMode(ScrollbarMode newMode)
 {
-    if (m_data->vScrollBarMode != newMode) {
-        m_data->vScrollBarMode = newMode;
-        updateScrollBars();
+    if (m_data->vScrollbarMode != newMode) {
+        m_data->vScrollbarMode = newMode;
+        updateScrollbars();
     }
 }
 
-void ScrollView::setScrollBarsMode(ScrollBarMode newMode)
+void ScrollView::setScrollbarsMode(ScrollbarMode newMode)
 {
-    m_data->hScrollBarMode = m_data->vScrollBarMode = newMode;
-    updateScrollBars();
+    m_data->hScrollbarMode = m_data->vScrollbarMode = newMode;
+    updateScrollbars();
 }
 
 void ScrollView::setStaticBackground(bool flag)

diff --git a/WebCore/platform/gdk/TemporaryLinkStubs.cpp b/WebCore/platform/gdk/TemporaryLinkStubs.cpp
index acfa9df74330832daef757951cef396d16f06bdd..139bfff04aa4931c5c182272b85c152fcef4d909 100644 (file)
--- a/WebCore/platform/gdk/TemporaryLinkStubs.cpp
+++ b/WebCore/platform/gdk/TemporaryLinkStubs.cpp
@@ -74,7 +74,7 @@ using namespace WebCore;
 static void notImplemented() { puts("Not yet implemented"); }
 
 void FrameView::updateBorder() { notImplemented(); }
-bool FrameView::passMousePressEventToScrollbar(MouseEventWithHitTestResults&, PlatformScrollBar*) { return false; }
+bool FrameView::passMousePressEventToScrollbar(MouseEventWithHitTestResults&, PlatformScrollbar*) { return false; }
 bool FrameView::passMousePressEventToSubframe(MouseEventWithHitTestResults&, Frame*) { return true; }
 bool FrameView::passMouseReleaseEventToSubframe(MouseEventWithHitTestResults&, Frame*) { return true; }
 bool FrameView::passMouseMoveEventToSubframe(MouseEventWithHitTestResults&, Frame*) { return true; }
@@ -86,6 +86,7 @@ Widget::FocusPolicy Widget::focusPolicy() const { notImplemented(); return NoFoc
 void Widget::disableFlushDrawing() { notImplemented(); }
 GraphicsContext* Widget::lockDrawingFocus() { notImplemented(); return 0; }
 void Widget::unlockDrawingFocus(GraphicsContext*) { notImplemented(); }
+void Widget::removeFromParent() { }
 
 JavaAppletWidget::JavaAppletWidget(IntSize const&, Element*, WTF::HashMap<String, String> const&) { notImplemented(); }
 
@@ -250,16 +251,16 @@ void Widget::setIsSelected(bool) { }
 void Widget::invalidate() { }
 void Widget::invalidateRect(const IntRect& r) { }
 
-void ScrollView::addChild(Widget*, int, int) { }
+void ScrollView::addChild(Widget*) { }
 void ScrollView::removeChild(Widget*) { }
 void ScrollView::scrollPointRecursively(int x, int y) { }
 bool ScrollView::inWindow() const { return true; }
 void ScrollView::wheelEvent(PlatformWheelEvent&) { }
-void ScrollView::updateScrollBars() { }
+void ScrollView::updateScrollbars() { }
 int ScrollView::updateScrollInfo(short type, int current, int max, int pageSize) { return 0; }
 IntPoint ScrollView::windowToContents(const IntPoint& point) const { return point; }
 IntPoint ScrollView::contentsToWindow(const IntPoint& point) const { return point; }
-PlatformScrollBar* ScrollView::scrollbarUnderMouse(const PlatformMouseEvent& mouseEvent) { return 0; }
+PlatformScrollbar* ScrollView::scrollbarUnderMouse(const PlatformMouseEvent& mouseEvent) { return 0; }
 
 void GraphicsContext::addRoundedRectClip(const IntRect& rect, const IntSize& topLeft, const IntSize& topRight,
         const IntSize& bottomLeft, const IntSize& bottomRight) { notImplemented(); }
@@ -317,21 +318,21 @@ IntSize TextField::sizeForCharacterWidth(int) const { return IntSize(); }
 int TextField::baselinePosition(int) const { return 0; }
 void TextField::setLiveSearch(bool) { }
 
-PlatformScrollBar::PlatformScrollBar(ScrollBarClient* client, ScrollBarOrientation orientation, ScrollBarControlSize controlSize) : ScrollBar(client, orientation, controlSize) { }
-PlatformScrollBar::~PlatformScrollBar() { }
-int PlatformScrollBar::width() const { return 0; }
-int PlatformScrollBar::height() const { return 0; }
-void PlatformScrollBar::setEnabled(bool) { }
-void PlatformScrollBar::paint(GraphicsContext*, const IntRect& damageRect) { }
-void PlatformScrollBar::updateThumbPosition() { }
-void PlatformScrollBar::updateThumbProportion() { }
-void PlatformScrollBar::setRect(const IntRect&) { }
-
-ScrollBar::ScrollBar(ScrollBarClient*, ScrollBarOrientation, ScrollBarControlSize controlSize) { }
-void ScrollBar::setSteps(int, int) { }
-bool ScrollBar::scroll(ScrollDirection, ScrollGranularity, float) { return 0; }
-bool ScrollBar::setValue(int) { return 0; }
-void ScrollBar::setProportion(int, int) { }
+PlatformScrollbar::PlatformScrollbar(ScrollbarClient* client, ScrollbarOrientation orientation, ScrollbarControlSize controlSize) : Scrollbar(client, orientation, controlSize) { }
+PlatformScrollbar::~PlatformScrollbar() { }
+int PlatformScrollbar::width() const { return 0; }
+int PlatformScrollbar::height() const { return 0; }
+void PlatformScrollbar::setEnabled(bool) { }
+void PlatformScrollbar::paint(GraphicsContext*, const IntRect& damageRect) { }
+void PlatformScrollbar::updateThumbPosition() { }
+void PlatformScrollbar::updateThumbProportion() { }
+void PlatformScrollbar::setRect(const IntRect&) { }
+
+Scrollbar::Scrollbar(ScrollbarClient*, ScrollbarOrientation, ScrollbarControlSize controlSize) { }
+void Scrollbar::setSteps(int, int) { }
+bool Scrollbar::scroll(ScrollDirection, ScrollGranularity, float) { return false; }
+bool Scrollbar::setValue(int) { return false; }
+void Scrollbar::setProportion(int, int) { }
 
 ListBox::ListBox() { }
 ListBox::~ListBox() { }