Changeset 142670 in webkit

Timestamp:

Feb 12, 2013 1:59:18 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] CSS animations stop running during zoom
​https://bugs.webkit.org/show_bug.cgi?id=109606

Patch by Andrew Lo <​anlo@rim.com> on 2013-02-12
Reviewed by Rob Buis.
Internally reviewed by Jakob Petsovits.

Internal PR 286160.
New BackingStore API for suspending/resuming geometry updates.

This is needed because we want to allow render jobs to continue during
zoom, but we don't want to allow geometry updates during zoom.

Prevent scroll/zoom render jobs from being added to the queue if
the tile is outside the expanded content rect.

• Api/BackingStore.cpp:

(BlackBerry::WebKit::BackingStorePrivate::BackingStorePrivate):
(BlackBerry::WebKit::BackingStorePrivate::suspendGeometryUpdates):
(WebKit):
(BlackBerry::WebKit::BackingStorePrivate::resumeGeometryUpdates):
(BlackBerry::WebKit::BackingStorePrivate::setBackingStoreRect):
(BlackBerry::WebKit::BackingStore::suspendGeometryUpdates):
(BlackBerry::WebKit::BackingStore::resumeGeometryUpdates):

• Api/BackingStore.h:
• Api/BackingStore_p.h:

(BackingStorePrivate):

• WebKitSupport/RenderQueue.cpp:

(BlackBerry::WebKit::RenderQueue::addToScrollZoomQueue):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/BackingStore.cpp (modified) (5 diffs)
• Api/BackingStore.h (modified) (1 diff)
• Api/BackingStore_p.h (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• WebKitSupport/RenderQueue.cpp (modified) (1 diff)

trunk/Source/WebKit/blackberry/Api/BackingStore.cpp

@@ -206 +206 @@
     : m_suspendScreenUpdateCounterWebKitThread(0)
     , m_suspendBackingStoreUpdates(0)
+    , m_suspendGeometryUpdates(0)
     , m_resumeOperation(BackingStore::None)
     , m_suspendScreenUpdatesWebKitThread(true)
@@ -302 +303 @@
 }
 
+void BackingStorePrivate::suspendGeometryUpdates()
+{
+    ASSERT(BlackBerry::Platform::webKitThreadMessageClient()->isCurrentThread());
+
+    if (m_suspendGeometryUpdates) {
+        BBLOG(Platform::LogLevelInfo,
+            "Backingstore geometry already suspended, increasing suspend counter.");
+    }
+
+    ++m_suspendGeometryUpdates;
+}
+
 void BackingStorePrivate::suspendScreenUpdates()
 {
@@ -337 +350 @@
 
     atomic_sub(&m_suspendBackingStoreUpdates, 1);
+
+    dispatchRenderJob();
+}
+
+
+void BackingStorePrivate::resumeGeometryUpdates()
+{
+    ASSERT(BlackBerry::Platform::webKitThreadMessageClient()->isCurrentThread());
+
+    ASSERT(m_suspendGeometryUpdates >= 1);
+    if (m_suspendGeometryUpdates < 1) {
+        Platform::logAlways(Platform::LogLevelCritical,
+            "Call mismatch: Backingstore geometry hasn't been suspended, therefore won't resume!");
+        return;
+    }
+
+    // Set a flag indicating that we're about to resume geometry updates and
+    // the tile matrix should be updated as a consequence by the first render
+    // job that happens after this resumption of geometry updates.
+    if (m_suspendGeometryUpdates == 1)
+        setTileMatrixNeedsUpdate();
+
+    --m_suspendGeometryUpdates;
 
     dispatchRenderJob();
@@ -768 +804 @@
     }
 
-    if (m_suspendBackingStoreUpdates)
+    if (m_suspendBackingStoreUpdates || m_suspendGeometryUpdates)
         return;
 
@@ -2423 +2459 @@
 }
 
+void BackingStore::suspendGeometryUpdates()
+{
+    d->suspendGeometryUpdates();
+}
+
+void BackingStore::resumeGeometryUpdates()
+{
+    d->resumeGeometryUpdates();
+}
+
 void BackingStore::suspendScreenUpdates()
 {

trunk/Source/WebKit/blackberry/Api/BackingStore.h

@@ -62 +62 @@
     void resumeBackingStoreUpdates();
 
+    void suspendGeometryUpdates();
+    void resumeGeometryUpdates();
+
     void suspendScreenUpdates();
     void resumeScreenUpdates(BackingStore::ResumeUpdateOperation);

trunk/Source/WebKit/blackberry/Api/BackingStore_p.h

@@ -136 +136 @@
     void resumeBackingStoreUpdates();
 
+    // Suspends all backingstore geometry updates.
+    void suspendGeometryUpdates();
+
+    // Resumes all backingstore geometry updates.
+    void resumeGeometryUpdates();
+
     // Suspends all screen updates so that 'blitVisibleContents' is disabled.
     void suspendScreenUpdates();
@@ -346 +352 @@
     unsigned m_suspendScreenUpdateCounterWebKitThread;
     unsigned m_suspendBackingStoreUpdates;
+    unsigned m_suspendGeometryUpdates;
     BackingStore::ResumeUpdateOperation m_resumeOperation;
 

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-02-12  Andrew Lo  <anlo@rim.com>
+
+        [BlackBerry] CSS animations stop running during zoom
+        https://bugs.webkit.org/show_bug.cgi?id=109606
+
+        Reviewed by Rob Buis.
+        Internally reviewed by Jakob Petsovits.
+
+        Internal PR 286160.
+        New BackingStore API for suspending/resuming geometry updates.
+
+        This is needed because we want to allow render jobs to continue during
+        zoom, but we don't want to allow geometry updates during zoom.
+
+        Prevent scroll/zoom render jobs from being added to the queue if
+        the tile is outside the expanded content rect.
+
+        * Api/BackingStore.cpp:
+        (BlackBerry::WebKit::BackingStorePrivate::BackingStorePrivate):
+        (BlackBerry::WebKit::BackingStorePrivate::suspendGeometryUpdates):
+        (WebKit):
+        (BlackBerry::WebKit::BackingStorePrivate::resumeGeometryUpdates):
+        (BlackBerry::WebKit::BackingStorePrivate::setBackingStoreRect):
+        (BlackBerry::WebKit::BackingStore::suspendGeometryUpdates):
+        (BlackBerry::WebKit::BackingStore::resumeGeometryUpdates):
+        * Api/BackingStore.h:
+        * Api/BackingStore_p.h:
+        (BackingStorePrivate):
+        * WebKitSupport/RenderQueue.cpp:
+        (BlackBerry::WebKit::RenderQueue::addToScrollZoomQueue):
+
 2013-02-12  Christophe Dumez  <ch.dumez@sisa.samsung.com>
 

trunk/Source/WebKit/blackberry/WebKitSupport/RenderQueue.cpp

@@ -345 +345 @@
 void RenderQueue::addToScrollZoomQueue(const TileIndexList& addedTiles, TileIndexList* alreadyQueuedTiles)
 {
+    Platform::IntRect contentsRect = m_parent->expandedContentsRect();
     for (size_t i = 0; i < addedTiles.size(); ++i) {
         if (alreadyQueuedTiles->contains(addedTiles[i]))
             continue;
+
+        Platform::IntRect tileRect(m_parent->frontState()->originOfTile(addedTiles[i]), m_parent->tileSize());
+        if (!contentsRect.intersects(tileRect)) {
+#if DEBUG_RENDER_QUEUE
+                Platform::logAlways(Platform::LogLevelCritical,
+                    "RenderQueue::addToScrollZoomQueue tile at %s outside of expanded contents rect %s, ignoring.",
+                    tileRect.toString().c_str(),
+                    contentsRect.toString().c_str());
+#endif
+            continue;
+        }
 
 #if DEBUG_RENDER_QUEUE