Changeset 79595 in webkit

Timestamp:

Feb 24, 2011 11:31:59 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-02-24 Misha Tyutyunik <​michael.tyutyunik@nokia.com>

Reviewed by Andreas Kling.

[Qt] Dont use QPixmapCache if QPixmapCache::cacheLimit() is too small
(2048Kb for now).
​https://bugs.webkit.org/show_bug.cgi?id=54887

No new tests required.

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

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-24  Misha Tyutyunik  <michael.tyutyunik@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Dont use QPixmapCache if QPixmapCache::cacheLimit() is too small 
+        (2048Kb for now).
+        https://bugs.webkit.org/show_bug.cgi?id=54887
+
+        No new tests required.
+
+        * platform/graphics/qt/GraphicsLayerQt.cpp:
+        (WebCore::GraphicsLayerQtImpl::allowAcceleratedCompositingCache):
+        (WebCore::GraphicsLayerQtImpl::drawLayerContent):
+        (WebCore::GraphicsLayerQtImpl::paint):
+        (WebCore::GraphicsLayerQtImpl::flushChanges):
+
 2011-02-20  Martin Robinson  <mrobinson@igalia.com>
 

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

@@ -55 +55 @@
 #endif
 
-
 #define QT_DEBUG_RECACHE 0
 #define QT_DEBUG_CACHEDUMP 0
@@ -62 +61 @@
 
 namespace WebCore {
+
+static const int gMinimumPixmapCacheLimit = 2048;
 
 #ifndef QT_NO_GRAPHICSEFFECT
@@ -207 +208 @@
     virtual Color tiledBackingStoreBackgroundColor() const;
 #endif
+
+    static bool allowAcceleratedCompositingCache() { return QPixmapCache::cacheLimit() > gMinimumPixmapCacheLimit; }
+
+    void drawLayerContent(QPainter*, const QRect&);
 
 public slots:
@@ -382 +387 @@
 }
 
+
+void GraphicsLayerQtImpl::drawLayerContent(QPainter* painter, const QRect& clipRect)
+{
+    painter->setClipRect(clipRect, Qt::IntersectClip);
+    painter->setCompositionMode(QPainter::CompositionMode_SourceOver);
+    GraphicsContext gc(painter);
+    m_layer->paintGraphicsLayerContents(gc, clipRect);
+}
+
 QPixmap GraphicsLayerQtImpl::recache(const QRegion& regionToUpdate)
 {
@@ -631 +645 @@
     case HTMLContentType:
         if (m_state.drawsContent) {
-            QPixmap backingStore;
-            // We might need to recache, in case we try to paint and the cache was purged (e.g. if it was full).
-            if (!QPixmapCache::find(m_backingStore.key, &backingStore) || backingStore.size() != m_size.toSize())
-                backingStore = recache(QRegion(m_state.contentsRect));
-            const QRectF bounds(0, 0, m_backingStore.size.width(), m_backingStore.size.height());
-            painter->drawPixmap(0, 0, backingStore);
+            if (!allowAcceleratedCompositingCache())
+                drawLayerContent(painter, option->exposedRect.toRect());
+            else {
+                QPixmap backingStore;
+                // We might need to recache, in case we try to paint and the cache was purged (e.g. if it was full).
+                if (!QPixmapCache::find(m_backingStore.key, &backingStore) || backingStore.size() != m_size.toSize())
+                    backingStore = recache(QRegion(m_state.contentsRect));
+                const QRectF bounds(0, 0, m_backingStore.size.width(), m_backingStore.size.height());
+                painter->drawPixmap(0, 0, backingStore);
+            }
         }
         break;
@@ -838 +856 @@
         // We only need to do this for HTML content, there's no point in caching directly composited
         // content like images or solid rectangles.
-        if (m_pendingContent.contentType == HTMLContentType)
+        if (m_pendingContent.contentType == HTMLContentType && allowAcceleratedCompositingCache())
             recache(m_pendingContent.regionToUpdate);
 #endif