Changeset 111180 in webkit

Timestamp:

Mar 19, 2012 7:45:28 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Remove obsolete optimization in WebPageCompositorPrivate
​https://bugs.webkit.org/show_bug.cgi?id=81115

Patch by Arvid Nilsson <​anilsson@rim.com> on 2012-03-19
Reviewed by Benjamin Poulain.

The compositor tried to avoid rendering the same stuff twice, using a
mechanism that didn't work properly and has been redundant since we
introduced deferred blits. Remove this code.

Reviewed internally by Robin Cao.

• Api/WebPageCompositor.cpp:

(BlackBerry::WebKit::WebPageCompositorPrivate::WebPageCompositorPrivate):
(BlackBerry::WebKit::WebPageCompositorPrivate::commit):
(BlackBerry::WebKit::WebPageCompositorPrivate::drawLayers):

• Api/WebPageCompositor_p.h:

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPageCompositor.cpp (modified) (2 diffs)
• Api/WebPageCompositor_p.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)

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

@@ -41 +41 @@
     , m_context(GLES2Context::create(page))
     , m_layerRenderer(LayerRenderer::create(m_context.get()))
-    , m_generation(0)
-    , m_compositedGeneration(-1)
     , m_backingStoreUsesOpenGL(false)
     , m_animationTimer(this, &WebPageCompositorPrivate::animationTimerFired)
@@ -79 +77 @@
 
     rootLayer->commitOnCompositingThread();
-    ++m_generation;
 }
 
 bool WebPageCompositorPrivate::drawLayers(const IntRect& dstRect, const FloatRect& contents)
 {
-    // Save a draw if we already drew this generation, for example due to a concurrent scroll operation.
-    if (m_compositedGeneration == m_generation && dstRect == m_compositedDstRect
-        && contents == m_compositedContentsRect && !m_backingStoreUsesOpenGL)
-        return false;
-
     m_layerRenderer->drawLayers(contents, m_layoutRectForCompositing, m_contentsSizeForCompositing, dstRect);
     m_lastCompositingResults = m_layerRenderer->lastRenderingResults();
 
-    m_compositedDstRect = dstRect;
-    m_compositedContentsRect = contents;
-    m_compositedGeneration = m_generation;
-
     if (m_lastCompositingResults.needsAnimationFrame) {
-        ++m_generation; // The animation update moves us along one generation.
         // Using a timeout of 0 actually won't start a timer, it will send a message.
         m_animationTimer.start(1.0 / 60.0);

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

@@ -77 +77 @@
     WebCore::IntSize m_contentsSizeForCompositing;
     WebCore::LayerRenderingResults m_lastCompositingResults;
-    int m_generation;
-    int m_compositedGeneration;
-    WebCore::IntRect m_compositedDstRect;
-    WebCore::FloatRect m_compositedContentsRect;
     bool m_backingStoreUsesOpenGL;
     BlackBerry::Platform::Timer<WebPageCompositorPrivate> m_animationTimer;

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-03-19  Arvid Nilsson  <anilsson@rim.com>
+
+        [BlackBerry] Remove obsolete optimization in WebPageCompositorPrivate
+        https://bugs.webkit.org/show_bug.cgi?id=81115
+
+        Reviewed by Benjamin Poulain.
+
+        The compositor tried to avoid rendering the same stuff twice, using a
+        mechanism that didn't work properly and has been redundant since we
+        introduced deferred blits. Remove this code.
+
+        Reviewed internally by Robin Cao.
+
+        * Api/WebPageCompositor.cpp:
+        (BlackBerry::WebKit::WebPageCompositorPrivate::WebPageCompositorPrivate):
+        (BlackBerry::WebKit::WebPageCompositorPrivate::commit):
+        (BlackBerry::WebKit::WebPageCompositorPrivate::drawLayers):
+        * Api/WebPageCompositor_p.h:
+
 2012-03-17  Charles Wei  <charles.wei@torchmobile.com.cn>