Changeset 60350 in webkit

Timestamp:

May 28, 2010 6:28:07 AM (14 years ago)

Author:

antti.j.koivisto@nokia.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=39874
[Qt] Make tiled backing store more configurable

Reviewed by Kenneth Rohde Christiansen.

Make tile size, tile creation delay and tiling area dynamically configurable.

WebCore:

• platform/graphics/TiledBackingStore.cpp:

(WebCore::TiledBackingStore::TiledBackingStore):
(WebCore::TiledBackingStore::setTileSize):
(WebCore::TiledBackingStore::setTileCreationDelay):
(WebCore::TiledBackingStore::setKeepAndCoverAreaMultipliers):
(WebCore::TiledBackingStore::createTiles):

• platform/graphics/TiledBackingStore.h:

(WebCore::TiledBackingStore::tileSize):
(WebCore::TiledBackingStore::tileCreationDelay):
(WebCore::TiledBackingStore::getKeepAndCoverAreaMultipliers):

WebKit/qt:

• Api/qwebpage.cpp:

(QWebPagePrivate::dynamicPropertyChangeEvent):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/TiledBackingStore.cpp (modified) (5 diffs)
• WebCore/platform/graphics/TiledBackingStore.h (modified) (2 diffs)
• WebKit/qt/Api/qwebpage.cpp (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-05-28  Antti Koivisto  <koivisto@iki.fi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        https://bugs.webkit.org/show_bug.cgi?id=39874
+        [Qt] Make tiled backing store more configurable
+    
+        Make tile size, tile creation delay and tiling area dynamically configurable.
+
+        * platform/graphics/TiledBackingStore.cpp:
+        (WebCore::TiledBackingStore::TiledBackingStore):
+        (WebCore::TiledBackingStore::setTileSize):
+        (WebCore::TiledBackingStore::setTileCreationDelay):
+        (WebCore::TiledBackingStore::setKeepAndCoverAreaMultipliers):
+        (WebCore::TiledBackingStore::createTiles):
+        * platform/graphics/TiledBackingStore.h:
+        (WebCore::TiledBackingStore::tileSize):
+        (WebCore::TiledBackingStore::tileCreationDelay):
+        (WebCore::TiledBackingStore::getKeepAndCoverAreaMultipliers):
+
 2010-05-28  Eric Seidel  <eric@webkit.org>
 

trunk/WebCore/platform/graphics/TiledBackingStore.cpp

@@ -36 +36 @@
     , m_tileCreationTimer(new TileTimer(this, &TiledBackingStore::tileCreationTimerFired))
     , m_tileSize(defaultTileWidth, defaultTileHeight)
+    , m_tileCreationDelay(0.01)
+    , m_keepAreaMultiplier(2.f, 3.5f)
+    , m_coverAreaMultiplier(1.5f, 2.5f)
     , m_contentsScale(1.f)
     , m_pendingScale(0)
@@ -46 +49 @@
     delete m_tileBufferUpdateTimer;
     delete m_tileCreationTimer;
+}
+    
+void TiledBackingStore::setTileSize(const IntSize& size)
+{
+    m_tileSize = size;
+    m_tiles.clear();
+    startTileCreationTimer();
+}
+
+void TiledBackingStore::setTileCreationDelay(double delay)
+{
+    m_tileCreationDelay = delay;
+}
+
+void TiledBackingStore::setKeepAndCoverAreaMultipliers(const FloatSize& keepMultiplier, const FloatSize& coverMultiplier)
+{
+    m_keepAreaMultiplier = keepMultiplier;
+    m_coverAreaMultiplier = coverMultiplier;
+    startTileCreationTimer();
 }
 
@@ -189 +211 @@
     dropOverhangingTiles();
 
-    // FIXME: Make configurable/adapt to memory.
     IntRect keepRect = visibleRect;
-    keepRect.inflateX(visibleRect.width());
-    keepRect.inflateY(3 * visibleRect.height());
+    keepRect.inflateX(visibleRect.width() * (m_keepAreaMultiplier.width() - 1.f));
+    keepRect.inflateY(visibleRect.height() * (m_keepAreaMultiplier.height() - 1.f));
     keepRect.intersect(contentsRect());
     
@@ -198 +219 @@
     
     IntRect coverRect = visibleRect;
-    coverRect.inflateX(visibleRect.width() / 2);
-    coverRect.inflateY(2 * visibleRect.height());
+    coverRect.inflateX(visibleRect.width() * (m_coverAreaMultiplier.width() - 1.f));
+    coverRect.inflateY(visibleRect.height() * (m_coverAreaMultiplier.height() - 1.f));
     coverRect.intersect(contentsRect());
     
@@ -241 +262 @@
     // Keep creating tiles until the whole coverRect is covered.
     if (requiredTileCount)
-        m_tileCreationTimer->startOneShot(0);
+        m_tileCreationTimer->startOneShot(m_tileCreationDelay);
 }
 

trunk/WebCore/platform/graphics/TiledBackingStore.h

@@ -52 +52 @@
     void invalidate(const IntRect& dirtyRect);
     void paint(GraphicsContext*, const IntRect&);
+    
+    IntSize tileSize() { return m_tileSize; }
+    void setTileSize(const IntSize&);
+    
+    double tileCreationDelay() const { return m_tileCreationDelay; }
+    void setTileCreationDelay(double delay);
+    
+    // Tiled are dropped outside the keep area, and created for cover area. The values a relative to the viewport size.
+    void getKeepAndCoverAreaMultipliers(FloatSize& keepMultiplier, FloatSize& coverMultiplier)
+    {
+        keepMultiplier = m_keepAreaMultiplier;
+        coverMultiplier = m_coverAreaMultiplier;
+    }
+    void setKeepAndCoverAreaMultipliers(const FloatSize& keepMultiplier, const FloatSize& coverMultiplier);    
 
 private:
@@ -95 +109 @@
 
     IntSize m_tileSize;
+    double m_tileCreationDelay;
+    FloatSize m_keepAreaMultiplier;
+    FloatSize m_coverAreaMultiplier;
     
     IntRect m_previousVisibleRect;

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -1221 +1221 @@
         double timeDelay = q->property("_q_HTMLTokenizerTimeDelay").toDouble();
         q->handle()->page->setCustomHTMLTokenizerTimeDelay(timeDelay);
+    } else if (event->propertyName() == "_q_TiledBackingStoreTileSize") {
+        QSize tileSize = q->property("_q_TiledBackingStoreTileSize").toSize();
+        WebCore::Frame* frame = QWebFramePrivate::core(q->mainFrame());
+        frame->tiledBackingStore()->setTileSize(tileSize);
+    } else if (event->propertyName() == "_q_TiledBackingStoreTileCreationDelay") {
+        int tileCreationDelay = q->property("_q_TiledBackingStoreTileCreationDelay").toInt();
+        WebCore::Frame* frame = QWebFramePrivate::core(q->mainFrame());
+        frame->tiledBackingStore()->setTileCreationDelay(static_cast<double>(tileCreationDelay) / 1000.);
+    } else if (event->propertyName() == "_q_TiledBackingStoreKeepAreaMultiplier") {
+        FloatSize keepMultiplier;
+        FloatSize coverMultiplier;
+        WebCore::Frame* frame = QWebFramePrivate::core(q->mainFrame());
+        frame->tiledBackingStore()->getKeepAndCoverAreaMultipliers(keepMultiplier, coverMultiplier);
+        QSizeF qSize = q->property("_q_TiledBackingStoreKeepAreaMultiplier").toSizeF();
+        keepMultiplier = FloatSize(qSize.width(), qSize.height());
+        frame->tiledBackingStore()->setKeepAndCoverAreaMultipliers(keepMultiplier, coverMultiplier);
+    } else if (event->propertyName() == "_q_TiledBackingStoreCoverAreaMultiplier") {
+        FloatSize keepMultiplier;
+        FloatSize coverMultiplier;
+        WebCore::Frame* frame = QWebFramePrivate::core(q->mainFrame());
+        frame->tiledBackingStore()->getKeepAndCoverAreaMultipliers(keepMultiplier, coverMultiplier);
+        QSizeF qSize = q->property("_q_TiledBackingStoreCoverAreaMultiplier").toSizeF();
+        coverMultiplier = FloatSize(qSize.width(), qSize.height());
+        frame->tiledBackingStore()->setKeepAndCoverAreaMultipliers(keepMultiplier, coverMultiplier);
     }
 }

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-05-28  Antti Koivisto  <koivisto@iki.fi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        https://bugs.webkit.org/show_bug.cgi?id=39874
+        [Qt] Make tiled backing store more configurable
+    
+        Make tile size, tile creation delay and tiling area dynamically configurable.
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::dynamicPropertyChangeEvent):
+
 2010-05-28  Yael Aharon  <yael.aharon@nokia.com>