Changeset 76157 in webkit

Timestamp:

Jan 19, 2011 1:56:58 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-01-19 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

Suspend/resume painting as the WKView visibility changes
​https://bugs.webkit.org/show_bug.cgi?id=52738

• UIProcess/DrawingAreaProxy.h: (WebKit::DrawingAreaProxy::visibilityDidChange): Add new member function. It should really be pure virtual once setPageIsVisible is removed.

• UIProcess/DrawingAreaProxyImpl.cpp: (WebKit::DrawingAreaProxyImpl::visibilityDidChange): Send SuspendPainting/ResumePainting messages based on whether the view is visible or not.

(WebKit::DrawingAreaProxyImpl::setPageIsVisible):
Make this a stub; it should really be removed.

• UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::viewStateDidChange): Call visibilityDidChange.

• UIProcess/WebPageProxy.h: (WebKit::WebPageProxy::isViewVisible): Add new getter.

• WebProcess/WebPage/DrawingArea.messages.in: Add SuspendPainting and ResumePainting messages.

• WebProcess/WebPage/DrawingAreaImpl.cpp: (WebKit::DrawingAreaImpl::DrawingAreaImpl): Initialize m_isPaintingSuspended.

(WebKit::DrawingAreaImpl::suspendPainting):
Set m_isPaintingSuspended to true and stop the display timer.

(WebKit::DrawingAreaImpl::resumePainting):
Set m_isPaintingSuspended to false.

(WebKit::DrawingAreaImpl::scheduleDisplay):
(WebKit::DrawingAreaImpl::display):
Bail if m_isPaintingSuspended is true.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/DrawingAreaProxy.h (modified) (1 diff)
• UIProcess/DrawingAreaProxyImpl.cpp (modified) (1 diff)
• UIProcess/DrawingAreaProxyImpl.h (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (1 diff)
• WebProcess/WebPage/DrawingArea.h (modified) (1 diff)
• WebProcess/WebPage/DrawingArea.messages.in (modified) (1 diff)
• WebProcess/WebPage/DrawingAreaImpl.cpp (modified) (4 diffs)
• WebProcess/WebPage/DrawingAreaImpl.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-01-19  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Suspend/resume painting as the WKView visibility changes
+        https://bugs.webkit.org/show_bug.cgi?id=52738
+
+        * UIProcess/DrawingAreaProxy.h:
+        (WebKit::DrawingAreaProxy::visibilityDidChange):
+        Add new member function. It should really be pure virtual once setPageIsVisible
+        is removed.
+
+        * UIProcess/DrawingAreaProxyImpl.cpp:
+        (WebKit::DrawingAreaProxyImpl::visibilityDidChange):
+        Send SuspendPainting/ResumePainting messages based on whether the view is visible or not.
+
+        (WebKit::DrawingAreaProxyImpl::setPageIsVisible):
+        Make this a stub; it should really be removed.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::viewStateDidChange):
+        Call visibilityDidChange.
+
+        * UIProcess/WebPageProxy.h:
+        (WebKit::WebPageProxy::isViewVisible):
+        Add new getter.
+
+        * WebProcess/WebPage/DrawingArea.messages.in:
+        Add SuspendPainting and ResumePainting messages.
+
+        * WebProcess/WebPage/DrawingAreaImpl.cpp:
+        (WebKit::DrawingAreaImpl::DrawingAreaImpl):
+        Initialize m_isPaintingSuspended.
+
+        (WebKit::DrawingAreaImpl::suspendPainting):
+        Set m_isPaintingSuspended to true and stop the display timer.
+
+        (WebKit::DrawingAreaImpl::resumePainting):
+        Set m_isPaintingSuspended to false.
+
+        (WebKit::DrawingAreaImpl::scheduleDisplay):
+        (WebKit::DrawingAreaImpl::display):
+        Bail if m_isPaintingSuspended is true.
+
 2011-01-19  Andreas Kling  <kling@webkit.org>
 

trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h

@@ -66 +66 @@
 
     virtual void sizeDidChange() = 0;
+
+    // FIXME: visibilityDidChange() should be pure virtual.
+    virtual void visibilityDidChange() { }
+
     virtual void setPageIsVisible(bool isVisible) = 0;
     

trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp

@@ -83 +83 @@
 }
 
-void DrawingAreaProxyImpl::setPageIsVisible(bool pageIsVisible)
+void DrawingAreaProxyImpl::visibilityDidChange()
 {
-    // FIXME: Implement.
+    if (!m_webPageProxy->isViewVisible()) {
+        // Suspend painting.
+        m_webPageProxy->process()->send(Messages::DrawingArea::SuspendPainting(), m_webPageProxy->pageID());
+        return;
+    }
+
+    // Resume painting.
+    m_webPageProxy->process()->send(Messages::DrawingArea::ResumePainting(), m_webPageProxy->pageID());
+}
+
+void DrawingAreaProxyImpl::setPageIsVisible(bool)
+{
 }
 

trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h

@@ -47 +47 @@
     virtual bool paint(const WebCore::IntRect&, PlatformDrawingContext);
     virtual void sizeDidChange();
+    virtual void visibilityDidChange();
     virtual void setPageIsVisible(bool);
     virtual void attachCompositingContext(uint32_t contextID);

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -498 +498 @@
         if (isVisible != m_isVisible) {
             m_isVisible = isVisible;
+            m_drawingArea->visibilityDidChange();
             m_drawingArea->setPageIsVisible(isVisible);
         }

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -186 +186 @@
 
     WebCore::IntSize viewSize() const;
+    bool isViewVisible() const { return m_isVisible; }
 
     void executeEditCommand(const String& commandName);

trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h

@@ -83 +83 @@
     virtual void setSize(const WebCore::IntSize&) { }
     virtual void didUpdate() { }
+    virtual void suspendPainting() { }
+    virtual void resumePainting() { }
 };
 

trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in

@@ -23 +23 @@
 messages -> DrawingArea {
     SetSize(WebCore::IntSize size)
-    DidUpdate()    
+    DidUpdate()
+    SuspendPainting()
+    ResumePainting()
 }

trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp

@@ -54 +54 @@
     : DrawingArea(DrawingAreaInfo::Impl, parameters.drawingAreaInfo.identifier, webPage)
     , m_isWaitingForDidUpdate(false)
+    , m_isPaintingSuspended(!parameters.isVisible)
     , m_displayTimer(WebProcess::shared().runLoop(), this, &DrawingAreaImpl::display)
 {
@@ -157 +158 @@
 }
 
+void DrawingAreaImpl::suspendPainting()
+{
+    ASSERT(!m_isPaintingSuspended);
+
+    m_isPaintingSuspended = true;
+    m_displayTimer.stop();
+}
+
+void DrawingAreaImpl::resumePainting()
+{
+    ASSERT(m_isPaintingSuspended);
+
+    m_isPaintingSuspended = false;
+
+    // FIXME: Repaint if needed.
+}
+
 void DrawingAreaImpl::scheduleDisplay()
 {
@@ -162 +180 @@
         return;
 
+    if (m_isPaintingSuspended)
+        return;
+
     if (m_dirtyRegion.isEmpty())
         return;
@@ -173 +194 @@
 void DrawingAreaImpl::display()
 {
+    ASSERT(!m_isWaitingForDidUpdate);
+
+    if (m_isPaintingSuspended)
+        return;
+
     if (m_dirtyRegion.isEmpty())
         return;

trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h

@@ -56 +56 @@
     virtual void setSize(const WebCore::IntSize&);
     virtual void didUpdate();
+    virtual void suspendPainting();
+    virtual void resumePainting();
 
     void scheduleDisplay();
@@ -68 +70 @@
     // web process won't paint more frequent than the UI process can handle.
     bool m_isWaitingForDidUpdate;
-    
+
+    // Whether painting is suspended. We'll still keep track of the dirty region but we 
+    // won't paint until painting has resumed again.
+    bool m_isPaintingSuspended;
+
     RunLoop::Timer<DrawingAreaImpl> m_displayTimer;
 };