Changeset 132708 in webkit

Timestamp:

Oct 26, 2012, 4:03:27 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Allow embedder to enter/leave force compositing mode
​https://bugs.webkit.org/show_bug.cgi?id=100458

Patch by James Robinson <​jamesr@chromium.org> on 2012-10-26
Reviewed by Adrienne Walker.

This adds API for the embedder to decide when to enter and leave force compositing mode since it's
more efficient to only toggle this setting when the embedder is about to produce a frame.

• public/WebWidget.h:

(WebWidget):
(WebKit::WebWidget::enterForceCompositingMode):

• src/WebFrameImpl.cpp:

(WebKit::WebViewImpl::enterForceCompositingMode):
(WebKit):

• src/WebViewImpl.h:

(WebViewImpl):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebWidget.h (modified) (2 diffs)
• src/WebViewImpl.cpp (modified) (1 diff)
• src/WebViewImpl.h (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-10-26  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Allow embedder to enter/leave force compositing mode
+        https://bugs.webkit.org/show_bug.cgi?id=100458
+
+        Reviewed by Adrienne Walker.
+
+        This adds API for the embedder to decide when to enter and leave force compositing mode since it's
+        more efficient to only toggle this setting when the embedder is about to produce a frame.
+
+        * public/WebWidget.h:
+        (WebWidget):
+        (WebKit::WebWidget::enterForceCompositingMode):
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebViewImpl::enterForceCompositingMode):
+        (WebKit):
+        * src/WebViewImpl.h:
+        (WebViewImpl):
+
 2012-10-26  Dominic Mazzoni  <dmazzoni@google.com>
 

trunk/Source/WebKit/chromium/public/WebWidget.h

@@ -84 +84 @@
     // 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) { }
 
@@ -91 +89 @@
     // 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 {

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -1761 +1761 @@
 }
 
+void WebViewImpl::enterForceCompositingMode(bool enter)
+{
+    TRACE_EVENT1("webkit", "WebViewImpl::enterForceCompositingMode", "enter", enter);
+    settingsImpl()->setForceCompositingMode(enter);
+    if (enter) {
+        if (!m_page)
+            return;
+        Frame* mainFrame = m_page->mainFrame();
+        if (!mainFrame)
+            return;
+        mainFrame->view()->updateCompositingLayersAfterStyleChange();
+    }
+}
+
 #if USE(ACCELERATED_COMPOSITING)
 void WebViewImpl::doPixelReadbackToCanvas(WebCanvas* canvas, const IntRect& rect)

trunk/Source/WebKit/chromium/src/WebViewImpl.h

@@ -146 +146 @@
     virtual void animate(double);
     virtual void layout(); // Also implements WebLayerTreeViewClient::layout()
+    virtual void enterForceCompositingMode(bool enable) OVERRIDE;
     virtual void paint(WebCanvas*, const WebRect&, PaintOptions = ReadbackFromCompositorIfAvailable);
     virtual void themeChanged();