ChangeLog

2012-10-18  Ian Vollick  <vollick@chromium.org>

        Make TestRunner.display() work with composited layers

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

        Reviewed by NOBODY (OOPS!).

        With this patch, FrameView now stores FloatQuads when tracking

        repaint rects (they represent the absolute, transformed rects).

        Composited layers and the NonCompositedContentHost now report

        their transformed repaint rects as well (the NCCH sends them

        along to its WebView).

        No new tests (OOPS!).

        * page/FrameView.cpp:

        (WebCore::FrameView::reset):

        (WebCore::FrameView::repaintContentRectangle):

        (WebCore::FrameView::setTracksRepaints):

        (WebCore::FrameView::addTransformedRepaintRect):

        (WebCore):

        * page/FrameView.h:

        (WebCore::FrameView::resetTrackedRepaints):

        (FrameView):

        (WebCore::FrameView::trackedTransformedRepaintRects):

        * rendering/RenderLayerBacking.cpp:

        (WebCore::RenderLayerBacking::paintContents):

2012-10-16  Julien Chaffraix  <jchaffraix@webkit.org>

        Make RenderObject destruction during detach a top-down operation

Source/WebKit/chromium/ChangeLog

2012-10-18  Ian Vollick  <vollick@chromium.org>

        Make TestRunner.display() work with composited layers

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

        With this patch, FrameView now stores FloatQuads when tracking

        repaint rects (they represent the absolute, transformed rects).

        Composited layers and the NonCompositedContentHost now report

        their transformed repaint rects as well (the NCCH sends them

        along to its WebView).

        Additional information of the change such as approach, rationale. Please add per-function descriptions below (OOPS!).

        * public/WebWidget.h:

        (WebKit):

        (WebWidget):

        (WebKit::WebWidget::startTrackingRepaints):

        (WebKit::WebWidget::isTrackingRepaints):

        (WebKit::WebWidget::addTransformedRepaintRect):

        (WebKit::WebWidget::trackedTransformedRepaintRectangles):

        * src/NonCompositedContentHost.cpp:

        (WebKit::NonCompositedContentHost::paintContents):

        * src/WebViewImpl.cpp:

        (WebKit::WebViewImpl::WebViewImpl):

        (WebKit::WebViewImpl::startTrackingRepaints):

        (WebKit):

        (WebKit::WebViewImpl::addTransformedRepaintRect):

        (WebKit::WebViewImpl::trackedTransformedRepaintRectangles):

        * src/WebViewImpl.h:

        (WebViewImpl):

2012-10-16  Alec Flett  <alecflett@chromium.org>

        IndexedDB: Stub out chromium success handlers for integers and undefined values

Source/WebCore/page/FrameView.cpp

@@void FrameView::reset()

    m_deferredRepaintDelay = s_initialDeferredRepaintDelayDuringLoading;

    m_deferredRepaintTimer.stop();

    m_isTrackingRepaints = false;

285 m_trackedRepaintRects.clear();

285 m_trackedTransformedRepaintRects.clear();

    m_lastPaintTime = 0;

    m_paintBehavior = PaintBehaviorNormal;

    m_isPainting = false;

@@void FrameView::repaintContentRectangle(const IntRect& r, bool immediate)

    if (m_isTrackingRepaints) {

        IntRect repaintRect = r;

        repaintRect.move(-scrollOffset());

1907 m_trackedRepaintRects.append(repaintRect);

1907 m_trackedTransformedRepaintRects.append(repaintRect);

    }

    double delay = m_deferringRepaints ? 0 : adjustedDeferredRepaintDelay();

@@void FrameView::setTracksRepaints(bool trackRepaints)

    if (trackRepaints == m_isTrackingRepaints)

        return;

3647 m_trackedRepaintRects.clear();

3647 m_trackedTransformedRepaintRects.clear();

    m_isTrackingRepaints = trackRepaints;

}

void FrameView::addTransformedRepaintRect(const FloatQuad& transformedRect)

{

    m_trackedTransformedRepaintRects.append(transformedRect);

}

void FrameView::addScrollableArea(ScrollableArea* scrollableArea)

{

    if (!m_scrollableAreas)

Source/WebCore/page/FrameView.h

#include "AdjustViewSizeOrNot.h"

#include "Color.h"

30#include "FloatQuad.h"

#include "Frame.h"

#include "LayoutTypes.h"

#include "Pagination.h"

@@public:

    
    void setTracksRepaints(bool);

    bool isTrackingRepaints() const { return m_isTrackingRepaints; }

341 void resetTrackedRepaints() { m_trackedRepaintRects.clear(); }

342 const Vector<IntRect>& trackedRepaintRects() const { return m_trackedRepaintRects; }

    void resetTrackedRepaints() { m_trackedTransformedRepaintRects.clear(); }

    void addTransformedRepaintRect(const FloatQuad&);

    const Vector<FloatQuad>& trackedTransformedRepaintRects() const { return m_trackedTransformedRepaintRects; }

    typedef HashSet<ScrollableArea*> ScrollableAreaSet;

    void addScrollableArea(ScrollableArea*);

@@private:

    unsigned m_disableRepaints;

    bool m_isTrackingRepaints; // Used for testing.

525 Vector<In~~tRect~~> m_trackedRepaintRects;

527 Vector<FloatQuad> m_trackedTransformedRepaintRects;

    bool m_shouldUpdateWhileOffscreen;

Source/WebCore/rendering/RenderLayerBacking.cpp

@@static void paintScrollbar(Scrollbar* scrollbar, GraphicsContext& context, const

// Up-call from compositing layer drawing callback.

void RenderLayerBacking::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& context, GraphicsLayerPaintingPhase paintingPhase, const IntRect& clip)

{

    FrameView* frameView = renderer()->frame()->view();

    if (frameView->isTrackingRepaints())

        frameView->addTransformedRepaintRect(renderer()->localToAbsoluteQuad(FloatRect(clip), SnapOffsetForTransforms));

#ifndef NDEBUG

    if (Page* page = renderer()->frame()->page())

        page->setIsPainting(true);

Source/WebKit/chromium/public/WebWidget.h

#include "WebTextInputInfo.h"

#include "platform/WebCanvas.h"

#include "platform/WebCommon.h"

39#include "platform/WebFloatQuad.h"

3940#include "platform/WebRect.h"

4041#include "platform/WebSize.h"

42#include "platform/WebVector.h"

#define WEBKIT_HAS_NEW_FULLSCREEN_API 1

#define WEBWIDGET_HAS_SETCOMPOSITORSURFACEREADY 1

@@class WebMouseEvent;

class WebString;

struct WebPoint;

struct WebRenderingStats;

53 template <typename T> class WebVector;

class WebWidget {

public:

@@public:

    // animate or layout in this case.

    virtual void composite(bool finish) = 0;

    // Start tracking repaint rectangles. Clears the list of rectangles

    // collected so far. Used for layout testing.

    virtual void startTrackingRepaints() { }

    // Returns true if we've started tracking repaint rectangles.

    virtual bool isTrackingRepaints() const { return false; }

    // Adds a transformed repaint rectangle to the list of tracked repaints.

    virtual void addTransformedRepaintRect(const WebFloatQuad&) { }

    // Returns the collected repaint rectangles since startTrackingRepaints()

    // was last called.

    virtual WebVector<WebFloatQuad> trackedTransformedRepaintRectangles() const { return WebVector<WebFloatQuad>(); }

    // Indicates that the compositing surface associated with this WebWidget is

    // ready to use.

    virtual void setCompositorSurfaceReady() = 0;

Source/WebKit/chromium/src/NonCompositedContentHost.cpp

#include "WebViewImpl.h"

#include <public/WebContentLayer.h>

#include <public/WebFloatPoint.h>

39#include <public/WebFloatQuad.h>

namespace WebKit {

@@void NonCompositedContentHost::paintContents(const WebCore::GraphicsLayer*, WebC

    WebCore::IntRect adjustedClipRect = clipRect;

    adjustedClipRect.move(m_layerAdjust);

    m_webView->paintRootLayer(context, adjustedClipRect);

    if (m_webView->isTrackingRepaints())

        m_webView->addTransformedRepaintRect(WebFloatQuad(WebCore::FloatRect(adjustedClipRect)));

}

void NonCompositedContentHost::setShowDebugBorders(bool showDebugBorders)

Source/WebKit/chromium/src/WebViewImpl.cpp

@@WebViewImpl::WebViewImpl(WebViewClient* client)

#endif

    , m_flingModifier(0)

    , m_validationMessage(ValidationMessageClientImpl::create(*client))

448 , m_isTrackingRepaints(false)

{

    // WebKit/win/WebView.cpp does the same thing, except they call the

    // KJS specific wrapper around this method. We need to have threading

@@void WebViewImpl::paint(WebCanvas* canvas, const WebRect& rect, PaintOptions opt

    }

}

void WebViewImpl::startTrackingRepaints()

{

    if (!page())

        return;

    FrameView* view = page()->mainFrame()->view();

    view->setTracksRepaints(true);

    view->resetTrackedRepaints();

    m_isTrackingRepaints = true;

    m_trackedTransformedRepaintRects.clear();

}

void WebViewImpl::addTransformedRepaintRect(const WebFloatQuad& quad)

{

    m_trackedTransformedRepaintRects.append(quad);

}

WebVector<WebFloatQuad> WebViewImpl::trackedTransformedRepaintRectangles() const

{

    if (!page())

        return WebVector<WebFloatQuad>();

    Vector<WebFloatQuad> toReturn = m_trackedTransformedRepaintRects;

    FrameView* view = page()->mainFrame()->view();

    toReturn.appendVector(view->trackedTransformedRepaintRects());

    return toReturn;

}

void WebViewImpl::themeChanged()

{

    if (!page())

Source/WebKit/chromium/src/WebViewImpl.h

@@public:

    virtual void animate(double);

    virtual void layout(); // Also implements WebLayerTreeViewClient::layout()

    virtual void paint(WebCanvas*, const WebRect&, PaintOptions = ReadbackFromCompositorIfAvailable);

    virtual void startTrackingRepaints() OVERRIDE;

    virtual bool isTrackingRepaints() const OVERRIDE { return m_isTrackingRepaints; }

    virtual void addTransformedRepaintRect(const WebFloatQuad&) OVERRIDE;

    virtual WebVector<WebFloatQuad> trackedTransformedRepaintRectangles() const OVERRIDE;

    virtual void themeChanged();

    virtual void composite(bool finish);

    virtual void setNeedsRedraw();

@@private:

    OwnPtr<LinkHighlight> m_linkHighlight;

#endif

    OwnPtr<ValidationMessageClientImpl> m_validationMessage;

    bool m_isTrackingRepaints; // Used for testing.

    Vector<WebFloatQuad> m_trackedTransformedRepaintRects;

};

} // namespace WebKit

Tools/ChangeLog

2012-10-18  Ian Vollick  <vollick@chromium.org>

        Make TestRunner.display() work with composited layers

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

        With this patch, FrameView now stores FloatQuads when tracking

        repaint rects (they represent the absolute, transformed rects).

        Composited layers and the NonCompositedContentHost now report

        their transformed repaint rects as well (the NCCH sends them

        along to its WebView).

        Additional information of the change such as approach, rationale. Please add per-function descriptions below (OOPS!).

        * DumpRenderTree/chromium/DRTTestRunner.cpp:

        (DRTTestRunner::display):

        (DRTTestRunner::displayInvalidatedRegion):

        * DumpRenderTree/chromium/TestShell.cpp:

        (TestShell::dump):

        * DumpRenderTree/chromium/WebViewHost.cpp:

        (WebViewHost::startTrackingRepaints):

        (WebViewHost::paintTrackedRepaintRectangleOverlay):

        * DumpRenderTree/chromium/WebViewHost.h:

        (WebViewHost):

2012-10-16  Andy Estes  <aestes@apple.com>

        [WebKit2] Create Objective-C API for adding and removing user scripts

Tools/DumpRenderTree/chromium/DRTTestRunner.cpp

@@void DRTTestRunner::display(const CppArgumentList& arguments, CppVariant* result

    WebRect rect(0, 0, size.width, size.height);

    host->updatePaintRect(rect);

    host->paintInvalidatedRegion();

1268 host->d~~isplay~~RepaintMask();

1268 host->startTrackingRepaints();

    result->setNull();

}

@@void DRTTestRunner::displayInvalidatedRegion(const CppArgumentList& arguments, C

{

    WebViewHost* host = m_shell->webViewHost();

    host->paintInvalidatedRegion();

1276 host->d~~isplay~~RepaintMask();

1276 host->startTrackingRepaints();

    result->setNull();

}

Tools/DumpRenderTree/chromium/TestShell.cpp

@@void TestShell::dump()

            m_webViewHost->paintPagesWithBoundaries();

        else

            m_webViewHost->paintInvalidatedRegion();

630 m_webViewHost->paintTrackedRepaintRectangleOverlay();

        // See if we need to draw the selection bounds rect. Selection bounds

        // rect is the rect enclosing the (possibly transformed) selection.

Tools/DumpRenderTree/chromium/WebViewHost.cpp

@@void WebViewHost::discardBackingStore()

    m_canvas.clear();

}

// Paints the entire canvas a semi-transparent black (grayish). This is used

// by the layout tests in fast/repaint. The alpha value matches upstream.

void WebViewHost::displayRepaintMask()

1949void WebViewHost::startTrackingRepaints()

19521950{

1953 canvas()->drawARGB(167, 0, 0, 0);

    webWidget()->startTrackingRepaints();

}

void WebViewHost::paintTrackedRepaintRectangleOverlay()

{

    SkPath path;

    WebVector<WebFloatQuad> quads = webWidget()->trackedTransformedRepaintRectangles();

    for (size_t i = 0; i < quads.size(); ++i) {

        SkPoint points[] = {

            SkPoint::Make(quads[i].p[0].x, quads[i].p[0].y),

            SkPoint::Make(quads[i].p[1].x, quads[i].p[1].y),

            SkPoint::Make(quads[i].p[2].x, quads[i].p[2].y),

            SkPoint::Make(quads[i].p[3].x, quads[i].p[3].y)

        };

        path.addPoly(points, 4, true);

    }

    WebSize widgetSize = webWidget()->size();

    SkPaint paint;

    paint.setColor(0xA7000000);

    paint.setStyle(SkPaint::kFill_Style);

    paint.setFlags(SkPaint::kAntiAlias_Flag);

    canvas()->clipPath(path, SkRegion::kDifference_Op);

    canvas()->drawRectCoords(0, 0, widgetSize.width, widgetSize.height, paint);

}

// Simulate a print by going into print mode and then exit straight away.

Tools/DumpRenderTree/chromium/WebViewHost.h

@@class WebViewHost : public WebKit::WebViewClient, public WebKit::WebFrameClient,

    void paintInvalidatedRegion();

    void paintPagesWithBoundaries();

    SkCanvas* canvas();

110 void displayRepaintMask();

110 void startTrackingRepaints();

111 void paintTrackedRepaintRectangleOverlay();

    void loadURLForFrame(const WebKit::WebURL&, const WebKit::WebString& frameName);

    TestNavigationController* navigationController() { return m_navigationController.get(); }