Changeset 112287 in webkit

Timestamp:

Mar 27, 2012 11:39:59 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Switch WebPageCompositor to use AnimationFrameRateController instead of timer
​https://bugs.webkit.org/show_bug.cgi?id=82350

Switch timer in WebPageCompositor to use AnimationFrameRateController.

Patch by Andrew Lo <​anlo@rim.com> on 2012-03-27
Reviewed by Rob Buis.

• Api/WebPageCompositor.cpp:

(BlackBerry::WebKit::WebPageCompositorPrivate::WebPageCompositorPrivate):
(BlackBerry::WebKit::WebPageCompositorPrivate::~WebPageCompositorPrivate):
(BlackBerry::WebKit::WebPageCompositorPrivate::drawLayers):
(BlackBerry::WebKit::WebPageCompositorPrivate::animationFrameChanged):

• Api/WebPageCompositor_p.h:

(WebPageCompositorPrivate):

Location:

trunk/Source/WebKit/blackberry

Files:

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

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

@@ -44 +44 @@
     : m_client(client)
     , m_webPage(page)
-    , m_animationTimer(this, &WebPageCompositorPrivate::animationTimerFired)
-    , m_timerClient(new Platform::GenericTimerClient(Platform::userInterfaceThreadTimerClient()))
     , m_pendingAnimationFrame(0.0)
 {
-    m_animationTimer.setClient(m_timerClient);
+    setOneShot(true); // one-shot animation client
 }
 
 WebPageCompositorPrivate::~WebPageCompositorPrivate()
 {
-    m_animationTimer.stop();
-    delete m_timerClient;
+    Platform::AnimationFrameRateController::instance()->removeClient(this);
 }
 
@@ -131 +128 @@
             m_pendingAnimationFrame = m_client->requestAnimationFrame();
         else {
-            m_animationTimer.start(1.0 / 60.0);
+            Platform::AnimationFrameRateController::instance()->addClient(this);
             m_webPage->updateDelegatedOverlays();
         }
@@ -144 +141 @@
 }
 
-void WebPageCompositorPrivate::animationTimerFired()
+void WebPageCompositorPrivate::animationFrameChanged()
 {
     BackingStore* backingStore = m_webPage->m_backingStore;

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

@@ -25 +25 @@
 #include "LayerRenderer.h"
 
+#include <BlackBerryPlatformAnimation.h>
 #include <BlackBerryPlatformGLES2Context.h>
-#include <BlackBerryPlatformTimer.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/RefCounted.h>
@@ -42 +42 @@
 
 // This class may only be used on the compositing thread. So it does not need to be threadsaferefcounted.
-class WebPageCompositorPrivate : public RefCounted<WebPageCompositorPrivate> {
+class WebPageCompositorPrivate : public RefCounted<WebPageCompositorPrivate>, public Platform::AnimationFrameRateClient {
 public:
     static PassRefPtr<WebPageCompositorPrivate> create(WebPagePrivate* page, WebPageCompositorClient* client)
@@ -87 +87 @@
 
 private:
-    void animationTimerFired();
+    void animationFrameChanged();
 
     WebPageCompositorClient* m_client;
@@ -97 +97 @@
     WebCore::IntSize m_contentsSizeForCompositing;
     WebCore::LayerRenderingResults m_lastCompositingResults;
-    BlackBerry::Platform::Timer<WebPageCompositorPrivate> m_animationTimer;
-    BlackBerry::Platform::TimerClient* m_timerClient;
     double m_pendingAnimationFrame;
 };

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-03-27  Andrew Lo  <anlo@rim.com>
+
+        [BlackBerry] Switch WebPageCompositor to use AnimationFrameRateController instead of timer
+        https://bugs.webkit.org/show_bug.cgi?id=82350
+
+        Switch timer in WebPageCompositor to use AnimationFrameRateController.
+
+        Reviewed by Rob Buis.
+
+        * Api/WebPageCompositor.cpp:
+        (BlackBerry::WebKit::WebPageCompositorPrivate::WebPageCompositorPrivate):
+        (BlackBerry::WebKit::WebPageCompositorPrivate::~WebPageCompositorPrivate):
+        (BlackBerry::WebKit::WebPageCompositorPrivate::drawLayers):
+        (BlackBerry::WebKit::WebPageCompositorPrivate::animationFrameChanged):
+        * Api/WebPageCompositor_p.h:
+        (WebPageCompositorPrivate):
+
 2012-03-27  Chris Guan  <chris.guan@torchmobile.com.cn>