Changeset 58781 in webkit

Timestamp:

May 4, 2010 3:24:09 PM (14 years ago)

Author:

andersca@apple.com

Message:

2010-05-04 Anders Carlsson <​andersca@apple.com>

Reviewed by Dan Bernstein.

[WebKit2] The web process doesn't need to paint when the web view is hidden.
​https://bugs.webkit.org/show_bug.cgi?id=38549

• Shared/CoreIPCSupport/DrawingAreaMessageKinds.h: (DrawingAreaMessage::): Add SuspendPainting/ResumePainting messages.

• UIProcess/DrawingAreaProxyUpdateChunk.cpp: (WebKit::DrawingAreaProxyUpdateChunk::setPageIsVisible): Suspend and resume painting accordingly.

• WebProcess/WebPage/DrawingAreaUpdateChunk.cpp: (WebKit::DrawingAreaUpdateChunk::DrawingAreaUpdateChunk): Initialize m_shouldPaint to true.

(WebKit::DrawingAreaUpdateChunk::display):
Return if m_shouldPaint is false.

(WebKit::DrawingAreaUpdateChunk::scheduleDisplay):
Ditto.

(WebKit::DrawingAreaUpdateChunk::setSize):
Assert that we should paint here.

(WebKit::DrawingAreaUpdateChunk::suspendPainting):
Set m_shouldPaint to false and stop the timer.

(WebKit::DrawingAreaUpdateChunk::resumePainting):
Set m_shouldPaint to true and paint if needed.

(WebKit::DrawingAreaUpdateChunk::didReceiveMessage):
handle SuspendPainting/ResumePainting messages.

• WebProcess/WebPage/DrawingAreaUpdateChunk.h:

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/CoreIPCSupport/DrawingAreaMessageKinds.h (modified) (1 diff)
• UIProcess/DrawingAreaProxyUpdateChunk.cpp (modified) (1 diff)
• WebProcess/WebPage/DrawingAreaUpdateChunk.cpp (modified) (6 diffs)
• WebProcess/WebPage/DrawingAreaUpdateChunk.h (modified) (2 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-05-04  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        [WebKit2] The web process doesn't need to paint when the web view is hidden.
+        https://bugs.webkit.org/show_bug.cgi?id=38549
+
+        * Shared/CoreIPCSupport/DrawingAreaMessageKinds.h:
+        (DrawingAreaMessage::):
+        Add SuspendPainting/ResumePainting messages.
+        
+        * UIProcess/DrawingAreaProxyUpdateChunk.cpp:
+        (WebKit::DrawingAreaProxyUpdateChunk::setPageIsVisible):
+        Suspend and resume painting accordingly.
+        
+        * WebProcess/WebPage/DrawingAreaUpdateChunk.cpp:
+        (WebKit::DrawingAreaUpdateChunk::DrawingAreaUpdateChunk):
+        Initialize m_shouldPaint to true.
+        
+        (WebKit::DrawingAreaUpdateChunk::display):
+        Return if m_shouldPaint is false.
+        
+        (WebKit::DrawingAreaUpdateChunk::scheduleDisplay):
+        Ditto.
+        
+        (WebKit::DrawingAreaUpdateChunk::setSize):
+        Assert that we should paint here.
+
+        (WebKit::DrawingAreaUpdateChunk::suspendPainting):
+        Set m_shouldPaint to false and stop the timer.
+        
+        (WebKit::DrawingAreaUpdateChunk::resumePainting):
+        Set m_shouldPaint to true and paint if needed.
+
+        (WebKit::DrawingAreaUpdateChunk::didReceiveMessage):
+        handle SuspendPainting/ResumePainting messages.
+
+        * WebProcess/WebPage/DrawingAreaUpdateChunk.h:
+
 2010-05-03  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit2/Shared/CoreIPCSupport/DrawingAreaMessageKinds.h

@@ -34 +34 @@
 
 enum Kind {
-    Initialize,
+    // Called whenever the size of the drawing area needs to be updated.
     SetSize,
-    
+
+    // Called when the drawing area should stop painting.
+    SuspendPainting,
+
+    // Called when the drawing area should start painting again.
+    ResumePainting,
+
     // Called when an update chunk sent to the drawing area has been
     // incorporated into the backing store.

trunk/WebKit2/UIProcess/DrawingAreaProxyUpdateChunk.cpp

@@ -95 +95 @@
     if (!page->isValid())
         return;
+
+    if (!m_isVisible) {
+        // Tell the web process that it doesn't need to paint anything for now.
+        page->process()->connection()->send(DrawingAreaMessage::SuspendPainting, page->pageID(), CoreIPC::In());
+        return;
+    }
     
-    // FIXME: Actually notify the web process that the visibility has changed.
+    // The page is now visible.
+    page->process()->connection()->send(DrawingAreaMessage::ResumePainting, page->pageID(), CoreIPC::In());
+    
+    // FIXME: We should request a full repaint here if needed.
 }
     

trunk/WebKit2/WebProcess/WebPage/DrawingAreaUpdateChunk.cpp

@@ -41 +41 @@
     : DrawingArea(DrawingAreaUpdateChunkType, webPage)
     , m_isWaitingForUpdate(false)
+    , m_shouldPaint(true)
     , m_displayTimer(WebProcess::shared().runLoop(), this, &DrawingAreaUpdateChunk::display)
 {
@@ -80 +81 @@
 {
     ASSERT(!m_isWaitingForUpdate);
+ 
+    if (!m_shouldPaint)
+        return;
 
     if (m_dirtyRect.isEmpty())
@@ -102 +106 @@
 void DrawingAreaUpdateChunk::scheduleDisplay()
 {
+    if (!m_shouldPaint)
+        return;
+
     if (m_isWaitingForUpdate)
         return;
@@ -113 +120 @@
 void DrawingAreaUpdateChunk::setSize(const IntSize& viewSize)
 {
+    ASSERT(m_shouldPaint);
     ASSERT_ARG(viewSize, !viewSize.isEmpty());
 
@@ -130 +138 @@
 
     WebProcess::shared().connection()->send(DrawingAreaProxyMessage::DidSetSize, m_webPage->pageID(), CoreIPC::In(updateChunk));
+}
+
+void DrawingAreaUpdateChunk::suspendPainting()
+{
+    ASSERT(m_shouldPaint);
+    
+    m_shouldPaint = false;
+    m_displayTimer.stop();
+}
+
+void DrawingAreaUpdateChunk::resumePainting()
+{
+    ASSERT(!m_shouldPaint);
+    
+    m_shouldPaint = true;
+    
+    // Display if needed.
+    display();
 }
 
@@ -152 +178 @@
         }
         
+        case DrawingAreaMessage::SuspendPainting:
+            suspendPainting();
+            break;
+
+        case DrawingAreaMessage::ResumePainting:
+            resumePainting();
+            break;
+
         case DrawingAreaMessage::DidUpdate:
             didUpdate();

trunk/WebKit2/WebProcess/WebPage/DrawingAreaUpdateChunk.h

@@ -51 +51 @@
 private:
     void scheduleDisplay();
+    
+    // CoreIPC message handlers.
     void setSize(const WebCore::IntSize& viewSize);
-
+    void suspendPainting();
+    void resumePainting();
     void didUpdate();
 
@@ -60 +63 @@
     WebCore::IntRect m_dirtyRect;
     bool m_isWaitingForUpdate;
+    bool m_shouldPaint;
     RunLoop::Timer<DrawingAreaUpdateChunk> m_displayTimer;
 };