FCL/sf/mw/qt: comparison src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp

equal deleted inserted replaced

-:2f34d5167611
+:fcece45ef507
 painter->restore();
 }
 }
-static bool webframe_scrollOverflow(WebCore::Frame* frame, int dx, int dy)
+static bool webframe_scrollOverflow(WebCore::Frame* frame, int dx, int dy, const QPoint& pos)
 {
 if (!frame || !frame->document() || !frame->eventHandler())
 return false;
-Node* node = frame->document()->focusedNode();
+Node* node = frame->document()->elementFromPoint(pos.x(), pos.y());
-if (!node)
-node = frame->document()->elementFromPoint(frame->eventHandler()->currentMousePosition().x(),
-frame->eventHandler()->currentMousePosition().y());
 if (!node)
 return false;
 RenderObject* renderer = node->renderer();
 if (!renderer)
 else if (dy < 0)
 scrolledVertical = renderLayer->scroll(ScrollUp, ScrollByPixel, qAbs(dy));
 return (scrolledHorizontal || scrolledVertical);
 }
 /*!
 \class QWebFrame
 \since 4.4
 \brief The QWebFrame class represents a frame in a web page.
 d->frame->view()->scrollBy(IntSize(dx, dy));
 }
 /*!
-\since 4.7
 \internal
 Scrolls nested frames starting at this frame, \a dx pixels to the right
 and \a dy pixels downward. Both \a dx and \a dy may be negative. First attempts
-to scroll elements with CSS overflow followed by this frame. If this
+to scroll elements with CSS overflow at position pos, followed by this frame. If this
 frame doesn't scroll, attempts to scroll the parent
+*/
-\sa QWebFrame::scroll
+void QWEBKIT_EXPORT qtwebkit_webframe_scrollRecursively(QWebFrame* qFrame, int dx, int dy, const QPoint& pos)
-*/
-bool QWEBKIT_EXPORT qtwebkit_webframe_scrollRecursively(QWebFrame* qFrame, int dx, int dy)
 {
 Frame* frame = QWebFramePrivate::core(qFrame);
-bool scrolledHorizontal = false;
-bool scrolledVertical = false;
+if (!frame || !frame->view())
-bool scrolledOverflow = webframe_scrollOverflow(frame, dx, dy);
+return;
-if (!scrolledOverflow) {
+if (!webframe_scrollOverflow(frame, dx, dy, pos)) {
-if (!frame || !frame->view())
-return false;
 do {
+bool scrolledHorizontal = false;
+bool scrolledVertical = false;
 IntSize scrollOffset = frame->view()->scrollOffset();
 IntPoint maxScrollOffset = frame->view()->maximumScrollPosition();
 if (dx > 0) // scroll right
 scrolledHorizontal = scrollOffset.width() < maxScrollOffset.x();
 else if (dy < 0) //scroll up
 scrolledVertical = scrollOffset.height() > 0;
 if (scrolledHorizontal || scrolledVertical) {
 frame->view()->scrollBy(IntSize(dx, dy));
-return true;
+return;
 }
 frame = frame->tree()->parent();
 } while (frame && frame->view());
 }
-return (scrolledHorizontal || scrolledVertical || scrolledOverflow);
 }
 /*!
 \property QWebFrame::scrollPosition
 \since 4.5

changeset 19	fcece45ef507
parent 18	2f34d5167611
child 22	79de32ba3296