Changeset 79867 in webkit

Timestamp:

Feb 28, 2011 8:35:32 AM (13 years ago)

Author:

Adam Roben

Message:

Decouple state changes from sending of UpdateState messages in DrawingAreaProxyImpl

The new DrawingAreaProxyImpl::stateDidChange function should be called whenever
DrawingAreaProxyImpl's state changes in a way that will require allocating a new backing
store. (Currently, this is just when the size changes.) This function will sometimes (but
not always, as when we're waiting for a DidUpdateState message) send an UpdateState message
to the web process. This means it's now possible for the state IDs sent in consecutive
UpdateState messages to increase by more than one, but that's OK.

This should cause no change in behavior.

Fixes <​http://webkit.org/b/55382> DrawingAreaProxyImpl's state ID should be updated whenever
its state changes, not just when we send an UpdateState message

Reviewed by Anders Carlsson.

• UIProcess/DrawingAreaProxyImpl.cpp:

(WebKit::DrawingAreaProxyImpl::DrawingAreaProxyImpl): Updated for rename.
(WebKit::DrawingAreaProxyImpl::sizeDidChange): Changed to call stateDidChange.
(WebKit::DrawingAreaProxyImpl::didUpdateState): Updated for rename, and changed to call
sendUpdateState whenever our state has changed for any reason since the last UpdateState
message was sent.
(WebKit::DrawingAreaProxyImpl::stateDidChange): Added. Increments m_nextStateID and calls
through to sendUpdateState.
(WebKit::DrawingAreaProxyImpl::sendUpdateState): Updated for rename, moved incrementing of
the state ID we send to the web process from here to stateDidChange, and added an assertion.

• UIProcess/DrawingAreaProxyImpl.h: Renamed m_requestedStateID to m_nextStateID, and updated

the comment explaining its meaning.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/DrawingAreaProxyImpl.cpp (modified) (6 diffs)
• UIProcess/DrawingAreaProxyImpl.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-02-28  Adam Roben  <aroben@apple.com>
+
+        Decouple state changes from sending of UpdateState messages in DrawingAreaProxyImpl
+
+        The new DrawingAreaProxyImpl::stateDidChange function should be called whenever
+        DrawingAreaProxyImpl's state changes in a way that will require allocating a new backing
+        store. (Currently, this is just when the size changes.) This function will sometimes (but
+        not always, as when we're waiting for a DidUpdateState message) send an UpdateState message
+        to the web process. This means it's now possible for the state IDs sent in consecutive
+        UpdateState messages to increase by more than one, but that's OK.
+
+        This should cause no change in behavior.
+
+        Fixes <http://webkit.org/b/55382> DrawingAreaProxyImpl's state ID should be updated whenever
+        its state changes, not just when we send an UpdateState message
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/DrawingAreaProxyImpl.cpp:
+        (WebKit::DrawingAreaProxyImpl::DrawingAreaProxyImpl): Updated for rename.
+        (WebKit::DrawingAreaProxyImpl::sizeDidChange): Changed to call stateDidChange.
+        (WebKit::DrawingAreaProxyImpl::didUpdateState): Updated for rename, and changed to call
+        sendUpdateState whenever our state has changed for any reason since the last UpdateState
+        message was sent.
+        (WebKit::DrawingAreaProxyImpl::stateDidChange): Added. Increments m_nextStateID and calls
+        through to sendUpdateState.
+        (WebKit::DrawingAreaProxyImpl::sendUpdateState): Updated for rename, moved incrementing of
+        the state ID we send to the web process from here to stateDidChange, and added an assertion.
+
+        * UIProcess/DrawingAreaProxyImpl.h: Renamed m_requestedStateID to m_nextStateID, and updated
+        the comment explaining its meaning.
+
 2011-02-28  Adam Roben  <aroben@apple.com>
 

trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp

@@ -51 +51 @@
     : DrawingAreaProxy(DrawingAreaTypeImpl, webPageProxy)
     , m_currentStateID(0)
-    , m_requestedStateID(0)
+    , m_nextStateID(0)
     , m_isWaitingForDidUpdateState(false)
 {
@@ -104 +104 @@
 void DrawingAreaProxyImpl::sizeDidChange()
 {
-    sendUpdateState();
+    stateDidChange();
 }
 
@@ -137 +137 @@
 void DrawingAreaProxyImpl::didUpdateState(uint64_t stateID, const UpdateInfo& updateInfo, const LayerTreeContext& layerTreeContext)
 {
-    ASSERT_ARG(stateID, stateID <= m_requestedStateID);
+    ASSERT_ARG(stateID, stateID <= m_nextStateID);
     ASSERT_ARG(stateID, stateID > m_currentStateID);
     m_currentStateID = stateID;
@@ -144 +144 @@
     m_isWaitingForDidUpdateState = false;
 
-    if (m_size != updateInfo.viewSize)
+    if (m_nextStateID != m_currentStateID)
         sendUpdateState();
 
@@ -215 +215 @@
 }
 
+void DrawingAreaProxyImpl::stateDidChange()
+{
+    ++m_nextStateID;
+    sendUpdateState();
+}
+
 void DrawingAreaProxyImpl::sendUpdateState()
 {
+    ASSERT(m_currentStateID < m_nextStateID);
+
     if (!m_webPageProxy->isValid())
         return;
@@ -224 +232 @@
 
     m_isWaitingForDidUpdateState = true;
-    m_webPageProxy->process()->send(Messages::DrawingArea::UpdateState(++m_requestedStateID, m_size, m_scrollOffset), m_webPageProxy->pageID());
+    m_webPageProxy->process()->send(Messages::DrawingArea::UpdateState(m_nextStateID, m_size, m_scrollOffset), m_webPageProxy->pageID());
     m_scrollOffset = IntSize();
 

trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h

@@ -62 +62 @@
 
     void incorporateUpdate(const UpdateInfo&);
+
+    void stateDidChange();
     void sendUpdateState();
     void waitForAndDispatchDidUpdateState();
@@ -75 +77 @@
     uint64_t m_currentStateID;
 
-    // The state ID we most recently requested the web process update to. Incremented whenever we
-    // send an UpdateState message to the web process to tell it we need to allocate a new backing
-    // store.
-    uint64_t m_requestedStateID;
+    // The next state ID we will request the web process update to. Incremented whenever our state
+    // changes in a way that will require a new backing store to be allocated.
+    uint64_t m_nextStateID;
 
     // The current layer tree context.