From cfd86b747d32ac22246a1aa908eaa720c63a88c1 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 7 Nov 2012 11:22:47 +0100 Subject: Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733) New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes. --- Source/WebKit/chromium/public/WebWidget.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Source/WebKit/chromium/public/WebWidget.h') diff --git a/Source/WebKit/chromium/public/WebWidget.h b/Source/WebKit/chromium/public/WebWidget.h index fa456238a..f2b394439 100644 --- a/Source/WebKit/chromium/public/WebWidget.h +++ b/Source/WebKit/chromium/public/WebWidget.h @@ -83,14 +83,16 @@ public: // Called to update imperative animation state. This should be called before // paint, although the client can rate-limit these calls. - // - // FIXME: remove this function entirely when inversion patches land. virtual void animate(double ignored) { } // Called to layout the WebWidget. This MUST be called before Paint, // and it may result in calls to WebWidgetClient::didInvalidateRect. virtual void layout() { } + // Called to toggle the WebWidget in or out of force compositing mode. This + // should be called before paint. + virtual void enterForceCompositingMode(bool enter) { } + enum PaintOptions { // Attempt to fulfill the painting request by reading back from the // compositor, assuming we're using a compositor to render. @@ -125,6 +127,9 @@ public: // animate or layout in this case. virtual void composite(bool finish) = 0; + // Returns true if we've started tracking repaint rectangles. + virtual bool isTrackingRepaints() const { return false; } + // Indicates that the compositing surface associated with this WebWidget is // ready to use. virtual void setCompositorSurfaceReady() = 0; -- cgit v1.2.1