Changeset 59934 in webkit
- Timestamp:
- May 21, 2010 8:28:36 AM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r59933 r59934 1 2010-05-21 Tasuku Suzuki <tasuku.suzuki@nokia.com> 2 3 Reviewed by Simon Hausmann. 4 5 [Qt] Fix compilation with QT_NO_GRAPHICSEFFECT 6 https://bugs.webkit.org/show_bug.cgi?id=38324 7 8 * platform/graphics/qt/GraphicsLayerQt.cpp: 9 (WebCore::GraphicsLayerQtImpl::flushChanges): 10 1 11 2010-05-21 Jedrzej Nowacki <jedrzej.nowacki@nokia.com> 2 12 -
trunk/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
r59510 r59934 44 44 namespace WebCore { 45 45 46 #ifndef QT_NO_GRAPHICSEFFECT 46 47 class MaskEffectQt : public QGraphicsEffect { 47 48 public: … … 92 93 QGraphicsItem* m_maskLayer; 93 94 }; 95 #endif // QT_NO_GRAPHICSEFFECT 94 96 95 97 class GraphicsLayerQtImpl : public QGraphicsObject { … … 180 182 bool m_transformAnimationRunning; 181 183 bool m_opacityAnimationRunning; 184 #ifndef QT_NO_GRAPHICSEFFECT 182 185 QWeakPointer<MaskEffectQt> m_maskEffect; 186 #endif 183 187 184 188 struct ContentData { … … 528 532 // itself is ready... we'll have to wait till this layer tries to paint 529 533 setFlag(ItemClipsChildrenToShape, m_layer->maskLayer() || m_layer->masksToBounds()); 534 #ifndef QT_NO_GRAPHICSEFFECT 530 535 setGraphicsEffect(0); 531 536 if (m_layer->maskLayer()) { … … 535 540 } 536 541 } 542 #endif 537 543 } 538 544 … … 619 625 prepareGeometryChange(); 620 626 627 #ifndef QT_NO_GRAPHICSEFFECT 621 628 if (m_maskEffect) 622 629 m_maskEffect.data()->update(); … … 629 636 m_pendingContent.regionToUpdate = QRegion(); 630 637 } 638 #endif 631 639 632 640 if ((m_changeMask & BackgroundColorChange) && (m_pendingContent.backgroundColor != m_currentContent.backgroundColor))
Note: See TracChangeset
for help on using the changeset viewer.