Changeset 60665 in webkit

Timestamp:

Jun 4, 2010 1:44:20 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-04 No'am Rosenthal <​noam.rosenthal@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

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

The #ifdef QT_NO_GRAPHICSEFFECT was in the wrong place, would have
made AC not work at all.

No new tests.

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

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-04  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Fix compilation with QT_NO_FEATURE
+        https://bugs.webkit.org/show_bug.cgi?id=38324
+
+        The #ifdef QT_NO_GRAPHICSEFFECT was in the wrong place, would have
+        made AC not work at all.
+
+        No new tests.
+
+        * platform/graphics/qt/GraphicsLayerQt.cpp:
+        (WebCore::GraphicsLayerQtImpl::flushChanges):
+
 2010-06-04  Qi Zhang  <qi.2.zhang@nokia.com>
 

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

@@ -671 +671 @@
     if (m_maskEffect)
         m_maskEffect.data()->update();
-    else if (m_changeMask & DisplayChange) {
+    else
+#endif
+    if (m_changeMask & DisplayChange) {
         // Recache now: all the content is ready and we don't want to wait until the paint event.
         // We only need to do this for HTML content, there's no point in caching directly composited
@@ -680 +682 @@
         m_pendingContent.regionToUpdate = QRegion();
     }
-#endif
 
     if ((m_changeMask & BackgroundColorChange)