ChangeLog

2012-07-04  Andras Becsi  <andras.becsi@nokia.com>

        [Qt][WK2] Improve visible content rect update

        https://bugs.webkit.org/show_bug.cgi?id=90547

        Reviewed by NOBODY (OOPS!).

        Avoid the extra work of computing the visible rect multiple

        times within the notification function and set a correct

        fixed visible content rect during page load.

        Also make sure that notifications with a null trajectory

        vector reach the backing store since a null vector means

        that all tiles around the viewport were requested.

        * UIProcess/qt/QtViewportHandler.cpp:

        (WebKit::ViewportUpdateDeferrer::~ViewportUpdateDeferrer):

        (WebKit::QtViewportHandler::informVisibleContentChange):

        (WebKit::QtViewportHandler::viewportItemSizeChanged):

        * UIProcess/qt/QtViewportHandler.h:

        (QtViewportHandler):

        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

        (WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage):

        * WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp:

        (WebKit::LayerTreeCoordinator::setVisibleContentsRect):

2012-07-04  Christophe Dumez  <christophe.dumez@intel.com>

        [EFL][WK2] Ewk_View should report load errors

Source/WebKit2/UIProcess/qt/QtViewportHandler.cpp

@@public:

        handler->resumePageContent();

        // Make sure that tiles all around the viewport will be requested.

92 handler->informVisibleContentChange(~~QPointF()~~);

92 handler->informVisibleContentChange();

    }

private:

@@void QtViewportHandler::informVisibleContentChange(const QPointF& trajectoryVect

    if (!drawingArea)

        return;

712 if (m_lastVisibleContentsRect == visibleContentsRect())

    const QRect currentVisibleContentsRect = visibleContentsRect();

    // A zero trajectoryVector indicates that tiles all around the viewport are requested.

    if (!trajectoryVector.isNull() && m_lastVisibleContentsRect == currentVisibleContentsRect)

        return;

    qreal scale = m_pageItem->contentsScale();

@@void QtViewportHandler::informVisibleContentChange(const QPointF& trajectoryVect

    if (scale != m_lastCommittedScale)

        emit m_viewportItem->experimental()->test()->contentsScaleCommitted();

    m_lastCommittedScale = scale;

720 m_lastVisibleContentsRect = visibleContentsRect();

723 m_lastVisibleContentsRect = currentVisibleContentsRect;

721724

722 drawingArea->setVisibleContentsRect(visibleContentsRect(), scale, trajectoryVector, m_viewportItem->contentPos());

725 drawingArea->setVisibleContentsRect(currentVisibleContentsRect, scale, trajectoryVector, m_viewportItem->contentPos());

    // Ensure that updatePaintNode is always called before painting.

    m_pageItem->update();

@@void QtViewportHandler::viewportItemSizeChanged()

    // it can resize the content accordingly.

    m_webPageProxy->setViewportSize(viewportSize);

739 informVisibleContentChange(~~QPointF()~~);

742 informVisibleContentChange();

}

void QtViewportHandler::scaleContent(const QPointF& centerInCSSCoordinates, qreal cssScale)

Source/WebKit2/UIProcess/qt/QtViewportHandler.h

@@private:

    QPointF m_lastScrollPosition;

    qreal m_pinchStartScale;

    qreal m_lastCommittedScale;

171 QRectF m_lastVisibleContentsRect;

171 QRect m_lastVisibleContentsRect;

    qreal m_zoomOutScale;

    QList<ScaleStackItem> m_scaleStack;

};

Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@void WebFrameLoaderClient::transitionToCommittedForNewPage()

    bool isMainFrame = webPage->mainWebFrame() == m_frame;

    bool shouldUseFixedLayout = isMainFrame && webPage->useFixedLayout();

    IntSize currentVisibleContentSize;

    if (const FrameView* view = m_frame->coreFrame()->view())

        currentVisibleContentSize = view->visibleContentRect().size();

    const ResourceResponse& response = m_frame->coreFrame()->loader()->documentLoader()->response();

    m_frameHasCustomRepresentation = isMainFrame && WebProcess::shared().shouldUseCustomRepresentationForResponse(response);

    m_frameCameFromPageCache = false;

@@void WebFrameLoaderClient::transitionToCommittedForNewPage()

    m_frame->coreFrame()->createView(webPage->size(), backgroundColor, /* transparent */ false, IntSize(), shouldUseFixedLayout);

    m_frame->coreFrame()->view()->setTransparent(!webPage->drawsBackground());

    if (shouldUseFixedLayout)

1234 m_frame->coreFrame()->view()->setFixedVisibleContentRect(webPage->bounds());

1238 // The HistoryController will update the scroll position later if needed.

1239 m_frame->coreFrame()->view()->setFixedVisibleContentRect(IntRect(IntPoint::zero(), currentVisibleContentSize));

}

void WebFrameLoaderClient::didSaveToPageCache()

Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp

@@void LayerTreeCoordinator::setVisibleContentsRect(const IntRect& rect, float sca

    bool contentsRectDidChange = rect != m_visibleContentsRect;

    bool contentsScaleDidChange = scale != m_contentsScale;

515 if (trajectoryVector != FloatPoint::zero())

516 toWebGraphicsLayer(m_nonCompositedContentLayer.get())->setVisibleContentRectTrajectoryVector(trajectoryVector);

515 toWebGraphicsLayer(m_nonCompositedContentLayer.get())->setVisibleContentRectTrajectoryVector(trajectoryVector);

    if (contentsRectDidChange || contentsScaleDidChange) {

        m_visibleContentsRect = rect;