Changeset 59934 in webkit

Timestamp:

May 21, 2010 8:28:36 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-05-21 Tasuku Suzuki <​tasuku.suzuki@nokia.com>

Reviewed by Simon Hausmann.

[Qt] Fix compilation with QT_NO_GRAPHICSEFFECT
​https://bugs.webkit.org/show_bug.cgi?id=38324

• platform/graphics/qt/GraphicsLayerQt.cpp: (WebCore::GraphicsLayerQtImpl::flushChanges):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-05-21  Tasuku Suzuki  <tasuku.suzuki@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix compilation with QT_NO_GRAPHICSEFFECT
+        https://bugs.webkit.org/show_bug.cgi?id=38324
+
+        * platform/graphics/qt/GraphicsLayerQt.cpp:
+        (WebCore::GraphicsLayerQtImpl::flushChanges):
+
 2010-05-21  Jedrzej Nowacki  <jedrzej.nowacki@nokia.com>
 

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

@@ -44 +44 @@
 namespace WebCore {
 
+#ifndef QT_NO_GRAPHICSEFFECT
 class MaskEffectQt : public QGraphicsEffect {
 public:
@@ -92 +93 @@
     QGraphicsItem* m_maskLayer;
 };
+#endif // QT_NO_GRAPHICSEFFECT
 
 class GraphicsLayerQtImpl : public QGraphicsObject {
@@ -180 +182 @@
     bool m_transformAnimationRunning;
     bool m_opacityAnimationRunning;
+#ifndef QT_NO_GRAPHICSEFFECT
     QWeakPointer<MaskEffectQt> m_maskEffect;
+#endif
 
     struct ContentData {
@@ -528 +532 @@
         // itself is ready... we'll have to wait till this layer tries to paint
         setFlag(ItemClipsChildrenToShape, m_layer->maskLayer() || m_layer->masksToBounds());
+#ifndef QT_NO_GRAPHICSEFFECT
         setGraphicsEffect(0);
         if (m_layer->maskLayer()) {
@@ -535 +540 @@
             }
         }
+#endif
     }
 
@@ -619 +625 @@
         prepareGeometryChange();
 
+#ifndef QT_NO_GRAPHICSEFFECT
     if (m_maskEffect)
         m_maskEffect.data()->update();
@@ -629 +636 @@
         m_pendingContent.regionToUpdate = QRegion();
     }
+#endif
 
     if ((m_changeMask & BackgroundColorChange) && (m_pendingContent.backgroundColor != m_currentContent.backgroundColor))