* page/Frame.cpp:
(WebCore::Frame::handleAutoscroll):
(WebCore::Frame::autoscrollTimerFired):
(WebCore::Frame::stopAutoscrollTimer):
* page/Frame.h:
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::~RenderLayer):
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::~RenderListBox):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16836
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2006-10-05 Adele Peterson <adele@apple.com>
+
+ Reverting autoscroll fix. I need to rework this a little.
+
+ * page/Frame.cpp:
+ (WebCore::Frame::handleAutoscroll):
+ (WebCore::Frame::autoscrollTimerFired):
+ (WebCore::Frame::stopAutoscrollTimer):
+ * page/Frame.h:
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::~RenderLayer):
+ * rendering/RenderListBox.cpp:
+ (WebCore::RenderListBox::~RenderListBox):
+
2006-10-05 Alice <alice.liu@apple.com>
Reviewed by Adam.
{
if (d->m_autoscrollTimer.isActive())
return;
- setAutoscrollRenderer(renderer);
+ d->m_autoscrollRenderer = renderer;
startAutoscrollTimer();
}
stopAutoscrollTimer();
return;
}
- if (RenderObject* r = autoscrollRenderer()) {
- r->autoscroll();
+ if (d->m_autoscrollRenderer) {
+ d->m_autoscrollRenderer->autoscroll();
}
}
-RenderObject* Frame::autoscrollRenderer() const
-{
- return d->m_autoscrollRenderer;
-}
-
-void Frame::setAutoscrollRenderer(RenderObject* renderer)
-{
- d->m_autoscrollRenderer = renderer;
-}
-
RenderObject::NodeInfo Frame::nodeInfoAtPoint(const IntPoint& point, bool allowShadowContent)
{
RenderObject::NodeInfo nodeInfo(true, true);
void Frame::stopAutoscrollTimer()
{
- setAutoscrollRenderer(0);
+ d->m_autoscrollRenderer = 0;
d->m_autoscrollTimer.stop();
}
void replaceContentsWithScriptResult(const KURL& url);
- void disconnectOwnerElement();
+ void disconnectOwnerElement();
- void setNeedsReapplyStyles();
-
- void stopAutoscrollTimer();
- RenderObject* autoscrollRenderer() const;
+ void setNeedsReapplyStyles();
protected:
virtual void startRedirectionTimer();
void handleAutoscroll(RenderObject*);
void startAutoscrollTimer();
- void setAutoscrollRenderer(RenderObject*);
+ void stopAutoscrollTimer();
private:
void emitLoadEvent();
RenderLayer::~RenderLayer()
{
- // If this layer is being autoscrolled, stop the autoscroll timer
- if (m_object && m_object->document() && m_object->document()->frame() && m_object->document()->frame()->autoscrollRenderer() == m_object)
- m_object->document()->frame()->stopAutoscrollTimer();
-
destroyScrollbar(HorizontalScrollbar);
destroyScrollbar(VerticalScrollbar);
RenderListBox::~RenderListBox()
{
- // If this list box is being autoscrolled, stop the autoscroll timer
- if (document() && document()->frame() && document()->frame()->autoscrollRenderer() == this)
- document()->frame()->stopAutoscrollTimer();
-
if (m_vBar && m_vBar->isWidget()) {
element()->document()->view()->removeChild(static_cast<PlatformScrollbar*>(m_vBar));
m_vBar->deref();