Changeset 60156 in webkit

Timestamp:

May 25, 2010 5:44:36 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-05-25 Kenneth Rohde Christiansen <​kenneth.christiansen@openbossa.org>

Reviewed by Laszlo Gombos.

[Qt] Running with accelerated compositing enabled sometimes result in a crash
​https://bugs.webkit.org/show_bug.cgi?id=39609

Check if we have a scene before applying the workaround for
the QGraphicsScene bug where opacity change doesn't always have
immediate effect.

• platform/graphics/qt/GraphicsLayerQt.cpp: (WebCore::OpacityAnimationQt::applyFrame):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/GraphicsLayerQt.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-05-25  Kenneth Rohde Christiansen  <kenneth.christiansen@openbossa.org>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] Running with accelerated compositing enabled sometimes result in a crash
+        https://bugs.webkit.org/show_bug.cgi?id=39609
+
+        Check if we have a scene before applying the workaround for
+        the QGraphicsScene bug where opacity change doesn't always have
+        immediate effect.
+
+        * platform/graphics/qt/GraphicsLayerQt.cpp:
+        (WebCore::OpacityAnimationQt::applyFrame):
+
 2010-05-25  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp

@@ -1362 +1362 @@
             setCurrentTime(1);
     }
+
     virtual void applyFrame(const qreal& fromValue, const qreal& toValue, qreal progress)
     {
@@ -1368 +1369 @@
         // FIXME: This is a hack, due to a probable QGraphicsScene bug.
         // Without this the opacity change doesn't always have immediate effect.
-        if (!m_layer.data()->opacity() && opacity)
+        if (m_layer.data()->scene() && !m_layer.data()->opacity() && opacity)
             m_layer.data()->scene()->update();