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
+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.
{
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;
}
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
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; }
bool ResourceLoader::start(DocLoader* docLoader)
{
+ ref();
ResourceLoaderManager::get()->add(this);
return true;
}
{
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;
IntSize newSize(w, h);
if (m_data->contentsSize != newSize) {
m_data->contentsSize = newSize;
- updateScrollBars();
+ updateScrollbars();
}
}
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;
}
}
-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)
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; }
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(); }
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(); }
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() { }