Changeset 13302 in webkit

Timestamp:

Mar 15, 2006 1:05:41 AM (18 years ago)

Author:

adele

Message:

Reviewed by Maciej.

• Fix for ​http://bugzilla.opendarwin.org/show_bug.cgi?id=7114 Dragging to scroll doesn't work for overflow areas

No test case. There doesn't appear to be a way to trigger the autoscroll with the EventSender.

• bridge/mac/MacFrame.mm: (WebCore::MacFrame::khtmlMouseMoveEvent): If we have a layer that can scroll, let the layer handle its autoscroll. Otherwise, call over the bridge to let AppKit scroll the view. (WebCore::MacFrame::khtmlMouseReleaseEvent): Stops the autoscroll timer.
• page/Frame.cpp: (WebCore::Frame::khtmlMouseReleaseEvent): Stops the autoscroll timer. (WebCore::Frame::handleAutoscroll): Added. Saves the layer, and starts the timer. (WebCore::Frame::autoscrollTimerFired): Added. Calls autoscroll() on the layer. (WebCore::Frame::startAutoscrollTimer): Added. (WebCore::Frame::stopAutoscrollTimer): Added.
• page/Frame.h: Added new autoscroll methods.
• page/FramePrivate.h: (WebCore::FramePrivate::FramePrivate): Initialize m_autoscrollTimer and m_autoscrollLayer.
• rendering/render_layer.cpp: (WebCore::RenderLayer::autoscroll): Calculates how much the layer should scroll, and actually scrolls. (WebCore::RenderLayer::shouldAutoscroll): If the layer has overflow then it should be able to scroll. Except for overflow:hidden areas that aren't editable. In the future, we may want to have a css property that indicates an overflow:hidden style that should also scroll.
• rendering/render_layer.h: Added new autoscroll methods.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/mac/MacFrame.mm (modified) (2 diffs)
• page/Frame.cpp (modified) (4 diffs)
• page/Frame.h (modified) (3 diffs)
• page/FramePrivate.h (modified) (2 diffs)
• rendering/render_layer.cpp (modified) (3 diffs)
• rendering/render_layer.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-03-15  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Maciej.
+
+        - Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=7114
+        Dragging to scroll doesn't work for overflow areas
+
+        No test case.  There doesn't appear to be a way to trigger the autoscroll with the EventSender.
+
+        * bridge/mac/MacFrame.mm:
+        (WebCore::MacFrame::khtmlMouseMoveEvent):  If we have a layer that can scroll, let the layer handle its autoscroll.  
+         Otherwise, call over the bridge to let AppKit scroll the view.
+        (WebCore::MacFrame::khtmlMouseReleaseEvent): Stops the autoscroll timer.
+        * page/Frame.cpp:
+        (WebCore::Frame::khtmlMouseReleaseEvent): Stops the autoscroll timer.
+        (WebCore::Frame::handleAutoscroll): Added. Saves the layer, and starts the timer.
+        (WebCore::Frame::autoscrollTimerFired): Added. Calls autoscroll() on the layer.
+        (WebCore::Frame::startAutoscrollTimer): Added.
+        (WebCore::Frame::stopAutoscrollTimer): Added.
+        * page/Frame.h: Added new autoscroll methods.
+        * page/FramePrivate.h: (WebCore::FramePrivate::FramePrivate): Initialize m_autoscrollTimer and m_autoscrollLayer.
+        * rendering/render_layer.cpp:
+        (WebCore::RenderLayer::autoscroll): Calculates how much the layer should scroll, and actually scrolls.
+        (WebCore::RenderLayer::shouldAutoscroll): If the layer has overflow then it should be able to scroll.  
+         Except for overflow:hidden areas that aren't editable.  
+         In the future, we may want to have a css property that indicates an overflow:hidden style that should also scroll.
+        * rendering/render_layer.h: Added new autoscroll methods.
+
 2006-03-14  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebCore/bridge/mac/MacFrame.mm

@@ -1763 +1763 @@
         d->m_view->invalidateClick();
 
-        // We use khtml's selection but our own autoscrolling.
-        [_bridge handleAutoscrollForMouseDragged:_currentEvent];
+        NodeImpl* node = event->innerNode();
+        RenderLayer* layer = 0;
+        if (node && node->renderer())
+            layer = node->renderer()->enclosingLayer();
+            
+        // If the selection began in a layer that can scroll, the layer should handle the autoscroll
+        // Otherwise, let the bridge handle it so the view can scroll itself.
+        if (layer && layer->shouldAutoscroll())
+            handleAutoscroll(layer);
+        else
+            [_bridge handleAutoscrollForMouseDragged:_currentEvent];
+            
     } else {
         // If we allowed the other side of the bridge to handle a drag
@@ -1858 +1868 @@
         return;
     }
+    stopAutoscrollTimer();
     
     _sendingEventToSubview = true;

trunk/WebCore/page/Frame.cpp

@@ -72 +72 @@
 #include "render_canvas.h"
 #include "render_frames.h"
+#include "render_layer.h"
 #include "visible_text.h"
 #include "visible_units.h"
@@ -103 +104 @@
 
 const double caretBlinkFrequency = 0.5;
+const double autoscrollInterval = 0.1;
 
 class UserStyleSheetLoader : public CachedObjectClient {
@@ -1880 +1882 @@
 void Frame::khtmlMouseReleaseEvent(MouseEventWithHitTestResults* event)
 {
+    stopAutoscrollTimer();
+    
     // Used to prevent mouseMoveEvent from initiating a drag before
     // the mouse is pressed again.
@@ -2671 +2675 @@
 }
 
+void Frame::handleAutoscroll(RenderLayer* layer)
+{
+    if (d->m_autoscrollTimer.isActive())
+        return;
+    d->m_autoscrollLayer = layer;
+    startAutoscrollTimer();
+}
+
+void Frame::autoscrollTimerFired(Timer<Frame>*)
+{
+    bool isStillDown = CGEventSourceButtonState(kCGEventSourceStateCombinedSessionState, kCGMouseButtonLeft);   
+    if (!isStillDown){
+        stopAutoscrollTimer();
+        return;
+    }
+    if (d->m_autoscrollLayer) {
+        d->m_autoscrollLayer->autoscroll();
+    } 
+}
+
+void Frame::startAutoscrollTimer()
+{
+    d->m_autoscrollTimer.startRepeating(autoscrollInterval);
+}
+
+void Frame::stopAutoscrollTimer()
+{
+    d->m_autoscrollTimer.stop();
+}
+
 // FIXME: why is this here instead of on the FrameView?
 void Frame::paint(GraphicsContext* p, const IntRect& rect)

trunk/WebCore/page/Frame.h

@@ -70 +70 @@
 class MouseEventWithHitTestResults;
 class RangeImpl;
+class RenderLayer;
 class Selection;
 class SelectionController;
@@ -778 +779 @@
     virtual void startRedirectionTimer();
     virtual void stopRedirectionTimer();
+    
+    void handleAutoscroll(RenderLayer*);
+    void startAutoscrollTimer();
+    void stopAutoscrollTimer();
 
  private:
@@ -800 +805 @@
 
     virtual void setStatusBarText(const String&);
+    
+    void autoscrollTimerFired(Timer<Frame>*);
 
 public:

trunk/WebCore/page/FramePrivate.h

@@ -95 +95 @@
             , m_lifeSupportTimer(thisFrame, &Frame::lifeSupportTimerFired)
             , m_userStyleSheetLoader(0)
+            , m_autoscrollTimer(thisFrame, &Frame::autoscrollTimerFired)
+            , m_autoscrollLayer(0)
         {
         }
@@ -202 +204 @@
 
         UserStyleSheetLoader* m_userStyleSheetLoader;
+        
+        Timer<Frame> m_autoscrollTimer;
+        RenderLayer* m_autoscrollLayer;
     };
 

trunk/WebCore/rendering/render_layer.cpp

@@ -48 +48 @@
 #include "EventNames.h"
 #include "FrameView.h"
+#include "Frame.h"
 #include "GraphicsContext.h"
 #include "dom2_eventsimpl.h"
@@ -56 +57 @@
 #include "render_inline.h"
 #include "render_theme.h"
+#include "SelectionController.h"
 #include <assert.h>
 #include <kxmlcore/Vector.h>
@@ -725 +727 @@
 
     return IntRect(IntPoint(x, y), visibleRect.size());
+}
+
+void RenderLayer::autoscroll()
+{    
+    int xOffset = scrollXOffset();
+    int yOffset = scrollYOffset();
+
+    // Get the rectangle for the extent of the selection
+    SelectionController sel = renderer()->document()->frame()->selection();
+    IntRect extentRect = SelectionController(sel.extent(), sel.affinity()).caretRect();
+    extentRect.move(xOffset, yOffset);
+
+    IntRect bounds = IntRect(xPos() + xOffset, yPos() + yOffset, width() - verticalScrollbarWidth(), height() - horizontalScrollbarHeight());
+    
+    // Calculate how much the layer should scroll horizontally.
+    int diffX = 0;
+    if (extentRect.right() > bounds.right())
+        diffX = extentRect.right() - bounds.right();
+    else if (extentRect.x() < bounds.x())
+        diffX = extentRect.x() - bounds.x();
+        
+    // Calculate how much the layer should scroll vertically.
+    int diffY = 0;
+    if (extentRect.bottom() > bounds.bottom())
+        diffY = extentRect.bottom() - bounds.bottom();
+    else if (extentRect.y() < bounds.y())
+        diffY = extentRect.y() - bounds.y();
+
+    scrollToOffset(xOffset + diffX, yOffset + diffY);
+}
+
+bool RenderLayer::shouldAutoscroll()
+{
+    if (renderer()->hasOverflowClip() && (m_object->style()->overflow() != OHIDDEN || renderer()->node()->isContentEditable()))
+        return true;
+    return false;
 }
 

trunk/WebCore/rendering/render_layer.h

@@ -247 +247 @@
     void slotValueChanged(int);
     bool scroll(KWQScrollDirection direction, KWQScrollGranularity granularity, float multiplier=1.0);
+    void autoscroll();
+    bool shouldAutoscroll();
     
     void updateLayerPosition();