Title: [125381] trunk/Source/WebKit/blackberry
Revision
125381
Author
[email protected]
Date
2012-08-12 15:59:27 -0700 (Sun, 12 Aug 2012)

Log Message

[BlackBerry] Tap highlight sometimes doesn't disappear
https://bugs.webkit.org/show_bug.cgi?id=93711

Patch by Arvid Nilsson <[email protected]> on 2012-08-12
Reviewed by Antonio Gomes.

The WebOverlayOverride implementation just changes properties of a
LayerCompositingThread directly, which means the changes will
immediately be overwritten on the next commit. Therefore, when the tap
highlight implementation adds a fade out animation, that animation will
instantly be removed again if a commit happens for any reason.

The reason is I totally botched the implementation of
WebOverlayOverride, it's not wrapping WebCore::LayerOverride at all,
instead for some reason it's manipulating the LayerCompositingThread
directly.

Fixed by actually mapping WebOverlayOverride calls to the corresponding
WebCore::LayerOverride method, and scheduling a compositing run to make
the change visible and kick off animations.

Reviewed internally by Sean Wang.

PR 188453

* Api/WebOverlay.cpp:
(BlackBerry::WebKit::WebOverlayPrivate::override):
* Api/WebOverlayOverride.cpp:
(BlackBerry::WebKit::WebOverlayOverride::WebOverlayOverride):
(BlackBerry::WebKit::WebOverlayOverride::~WebOverlayOverride):
(BlackBerry::WebKit::WebOverlayOverride::setPosition):
(BlackBerry::WebKit::WebOverlayOverride::setAnchorPoint):
(BlackBerry::WebKit::WebOverlayOverride::setSize):
(BlackBerry::WebKit::WebOverlayOverride::setTransform):
(BlackBerry::WebKit::WebOverlayOverride::setOpacity):
(BlackBerry::WebKit::WebOverlayOverride::addAnimation):
(BlackBerry::WebKit::WebOverlayOverride::removeAnimation):
* Api/WebOverlayOverride.h:
* Api/WebOverlay_p.h:
(WebOverlayPrivate):
(WebOverlayPrivateWebKitThread):
(WebOverlayPrivateCompositingThread):

Modified Paths

Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebOverlay.cpp (125380 => 125381)


--- trunk/Source/WebKit/blackberry/Api/WebOverlay.cpp	2012-08-12 18:14:30 UTC (rev 125380)
+++ trunk/Source/WebKit/blackberry/Api/WebOverlay.cpp	2012-08-12 22:59:27 UTC (rev 125381)
@@ -215,10 +215,13 @@
 
 WebOverlayOverride* WebOverlayPrivate::override()
 {
+    if (!m_override)
+        m_override = adoptPtr(new WebOverlayOverride(this));
+
     // Page might have changed if we were removed from the page and added to
     // some other page.
-    if (m_override)
-        m_override->d->setPage(page());
+    m_override->d->setPage(page());
+
     return m_override.get();
 }
 
@@ -244,16 +247,6 @@
     m_layerCompositingThread = m_layer->platformLayer()->layerCompositingThread();
 }
 
-WebOverlayOverride* WebOverlayPrivateWebKitThread::override()
-{
-    if (!m_override) {
-        WebOverlayPrivate* tmp = new WebOverlayPrivateCompositingThread(m_layerCompositingThread.get());
-        m_override = adoptPtr(new WebOverlayOverride(tmp, true));
-    }
-
-    return WebOverlayPrivate::override();
-}
-
 FloatPoint WebOverlayPrivateWebKitThread::position() const
 {
     return m_layer->position();
@@ -499,14 +492,6 @@
         m_layerCompositingThreadClient->setClient(q, client);
 }
 
-WebOverlayOverride* WebOverlayPrivateCompositingThread::override()
-{
-    if (!m_override)
-        m_override = adoptPtr(new WebOverlayOverride(this, false));
-
-    return WebOverlayPrivate::override();
-}
-
 FloatPoint WebOverlayPrivateCompositingThread::position() const
 {
     return m_layerCompositingThread->position();

Modified: trunk/Source/WebKit/blackberry/Api/WebOverlayOverride.cpp (125380 => 125381)


--- trunk/Source/WebKit/blackberry/Api/WebOverlayOverride.cpp	2012-08-12 18:14:30 UTC (rev 125380)
+++ trunk/Source/WebKit/blackberry/Api/WebOverlayOverride.cpp	2012-08-12 22:59:27 UTC (rev 125381)
@@ -27,57 +27,69 @@
 #include "WebString.h"
 
 #include <BlackBerryPlatformMessageClient.h>
+#include <wtf/CurrentTime.h>
 
 namespace BlackBerry {
 namespace WebKit {
 
 using namespace WebCore;
 
-WebOverlayOverride::WebOverlayOverride(WebOverlayPrivate* d, bool owned)
+WebOverlayOverride::WebOverlayOverride(WebOverlayPrivate* d)
     : d(d)
-    , m_owned(owned)
 {
 }
 
 WebOverlayOverride::~WebOverlayOverride()
 {
-    if (m_owned)
-        delete d;
 }
 
 void WebOverlayOverride::setPosition(const Platform::FloatPoint& position)
 {
-    d->setPosition(position);
+    d->layerCompositingThread()->override()->setPosition(position);
+    d->scheduleCompositingRun();
 }
 
 void WebOverlayOverride::setAnchorPoint(const Platform::FloatPoint& anchor)
 {
-    d->setAnchorPoint(anchor);
+    d->layerCompositingThread()->override()->setAnchorPoint(anchor);
+    d->scheduleCompositingRun();
 }
 
 void WebOverlayOverride::setSize(const Platform::FloatSize& size)
 {
-    d->setSize(size);
+    d->layerCompositingThread()->override()->setBounds(IntSize(size.width(), size.height()));
+    d->scheduleCompositingRun();
 }
 
 void WebOverlayOverride::setTransform(const Platform::TransformationMatrix& transform)
 {
-    d->setTransform(reinterpret_cast<const TransformationMatrix&>(transform));
+    d->layerCompositingThread()->override()->setTransform(reinterpret_cast<const TransformationMatrix&>(transform));
+    d->scheduleCompositingRun();
 }
 
 void WebOverlayOverride::setOpacity(float opacity)
 {
-    d->setOpacity(opacity);
+    d->layerCompositingThread()->override()->setOpacity(opacity);
+    d->scheduleCompositingRun();
 }
 
 void WebOverlayOverride::addAnimation(const WebAnimation& animation)
 {
-    d->addAnimation(animation.d->name, animation.d->animation.get(), animation.d->keyframes);
+    LayerCompositingThread* layerCompositingThread = d->layerCompositingThread();
+    LayerOverride* override = layerCompositingThread->override();
+
+    IntSize boxSize = override->isBoundsSet() ? override->bounds() : layerCompositingThread->bounds();
+    RefPtr<LayerAnimation> layerAnimation = LayerAnimation::create(animation.d->keyframes, boxSize, animation.d->animation.get(), animation.d->name, 0.0);
+    layerAnimation->setStartTime(currentTime());
+
+    override->addAnimation(layerAnimation);
+    d->scheduleCompositingRun();
 }
 
 void WebOverlayOverride::removeAnimation(const WebString& name)
 {
-    d->removeAnimation(String(PassRefPtr<StringImpl>(name.impl())));
+    d->layerCompositingThread()->override()->removeAnimation(String(PassRefPtr<StringImpl>(name.impl())));
+    d->scheduleCompositingRun();
 }
 
 }

Modified: trunk/Source/WebKit/blackberry/Api/WebOverlayOverride.h (125380 => 125381)


--- trunk/Source/WebKit/blackberry/Api/WebOverlayOverride.h	2012-08-12 18:14:30 UTC (rev 125380)
+++ trunk/Source/WebKit/blackberry/Api/WebOverlayOverride.h	2012-08-12 22:59:27 UTC (rev 125381)
@@ -39,7 +39,7 @@
 class BLACKBERRY_EXPORT WebOverlayOverride {
 public:
     // Don't use this, call WebOverlay::override() instead
-    WebOverlayOverride(WebOverlayPrivate*, bool owned);
+    WebOverlayOverride(WebOverlayPrivate*);
     ~WebOverlayOverride();
 
     void setPosition(const Platform::FloatPoint&);

Modified: trunk/Source/WebKit/blackberry/Api/WebOverlay_p.h (125380 => 125381)


--- trunk/Source/WebKit/blackberry/Api/WebOverlay_p.h	2012-08-12 18:14:30 UTC (rev 125380)
+++ trunk/Source/WebKit/blackberry/Api/WebOverlay_p.h	2012-08-12 22:59:27 UTC (rev 125381)
@@ -69,7 +69,7 @@
 
     virtual void setClient(WebOverlayClient* c) { client = c; }
 
-    virtual WebOverlayOverride* override();
+    WebOverlayOverride* override();
 
     virtual WebCore::FloatPoint position() const = 0;
     virtual void setPosition(const WebCore::FloatPoint&) = 0;
@@ -128,8 +128,6 @@
 public:
     WebOverlayPrivateWebKitThread(WebCore::GraphicsLayerClient* = 0);
 
-    virtual WebOverlayOverride* override();
-
     virtual WebCore::FloatPoint position() const;
     virtual void setPosition(const WebCore::FloatPoint&);
 
@@ -220,7 +218,6 @@
     ~WebOverlayPrivateCompositingThread();
 
     virtual void setClient(WebOverlayClient*);
-    virtual WebOverlayOverride* override();
 
     virtual WebCore::FloatPoint position() const;
     virtual void setPosition(const WebCore::FloatPoint&);

Modified: trunk/Source/WebKit/blackberry/ChangeLog (125380 => 125381)


--- trunk/Source/WebKit/blackberry/ChangeLog	2012-08-12 18:14:30 UTC (rev 125380)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-08-12 22:59:27 UTC (rev 125381)
@@ -1,3 +1,47 @@
+2012-08-12  Arvid Nilsson  <[email protected]>
+
+        [BlackBerry] Tap highlight sometimes doesn't disappear
+        https://bugs.webkit.org/show_bug.cgi?id=93711
+
+        Reviewed by Antonio Gomes.
+
+        The WebOverlayOverride implementation just changes properties of a
+        LayerCompositingThread directly, which means the changes will
+        immediately be overwritten on the next commit. Therefore, when the tap
+        highlight implementation adds a fade out animation, that animation will
+        instantly be removed again if a commit happens for any reason.
+
+        The reason is I totally botched the implementation of
+        WebOverlayOverride, it's not wrapping WebCore::LayerOverride at all,
+        instead for some reason it's manipulating the LayerCompositingThread
+        directly.
+
+        Fixed by actually mapping WebOverlayOverride calls to the corresponding
+        WebCore::LayerOverride method, and scheduling a compositing run to make
+        the change visible and kick off animations.
+
+        Reviewed internally by Sean Wang.
+
+        PR 188453
+
+        * Api/WebOverlay.cpp:
+        (BlackBerry::WebKit::WebOverlayPrivate::override):
+        * Api/WebOverlayOverride.cpp:
+        (BlackBerry::WebKit::WebOverlayOverride::WebOverlayOverride):
+        (BlackBerry::WebKit::WebOverlayOverride::~WebOverlayOverride):
+        (BlackBerry::WebKit::WebOverlayOverride::setPosition):
+        (BlackBerry::WebKit::WebOverlayOverride::setAnchorPoint):
+        (BlackBerry::WebKit::WebOverlayOverride::setSize):
+        (BlackBerry::WebKit::WebOverlayOverride::setTransform):
+        (BlackBerry::WebKit::WebOverlayOverride::setOpacity):
+        (BlackBerry::WebKit::WebOverlayOverride::addAnimation):
+        (BlackBerry::WebKit::WebOverlayOverride::removeAnimation):
+        * Api/WebOverlayOverride.h:
+        * Api/WebOverlay_p.h:
+        (WebOverlayPrivate):
+        (WebOverlayPrivateWebKitThread):
+        (WebOverlayPrivateCompositingThread):
+
 2012-08-10  Benjamin C Meyer  <[email protected]>
 
         Introduce _javascript_Variant object.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to