WebKit Bugzilla
New
Browse
Search+
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
[patch]
new WIP patch
up.diff (text/plain), 39.22 KB, created by
Balazs Kelemen
on 2013-03-19 06:52:57 PDT
(
hide
)
Description:
new WIP patch
Filename:
MIME Type:
Creator:
Balazs Kelemen
Created:
2013-03-19 06:52:57 PDT
Size:
39.22 KB
patch
obsolete
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index ceda890..fb5cb1a 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,75 @@ >+2013-03-19 Balazs Kelemen <kbalazs@webkit.org> >+ >+ [CoordGfx] Speed up web process rendering with double buffering >+ https://bugs.webkit.org/show_bug.cgi?id=109579 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ WIP patch, have rendering glitches on http://media.24ways.org/2009/15/space.html. >+ Render the new frame ahead of time while the UI process is updating. For this to >+ work we need to handle that CoordinatedGraphicsState can be a result of multiple flushes. >+ >+ No new tests (OOPS!). >+ >+ * platform/graphics/texmap/coordinated/AreaAllocator.cpp: >+ (WebCore::GeneralAreaAllocator::GeneralAreaAllocator): >+ (WebCore): >+ (WebCore::GeneralAreaAllocator::initTree): >+ (WebCore::GeneralAreaAllocator::splitNode): >+ (WebCore::GeneralAreaAllocator::release): >+ (WebCore::GeneralAreaAllocator::releaseNode): >+ (WebCore::GeneralAreaAllocator::markAllocations): >+ (WebCore::GeneralAreaAllocator::clear): >+ (WebCore::GeneralAreaAllocator::hasAllocations): >+ * platform/graphics/texmap/coordinated/AreaAllocator.h: >+ (AreaAllocator): >+ (GeneralAreaAllocator): >+ * platform/graphics/texmap/coordinated/CoordinatedBackingStore.cpp: >+ (WebCore::CoordinatedBackingStoreTile::swapBuffers): >+ (WebCore::CoordinatedBackingStoreTile::addUpdate): >+ (WebCore::CoordinatedBackingStore::updateTile): >+ * platform/graphics/texmap/coordinated/CoordinatedBackingStore.h: >+ (CoordinatedBackingStoreTile): >+ (WebCore::CoordinatedBackingStoreTile::Update::Update): >+ (Update): >+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp: >+ (WebCore::CoordinatedGraphicsLayer::flushCompositingStateForThisLayerOnly): >+ (WebCore::CoordinatedGraphicsLayer::didCommitLayerState): >+ (WebCore::CoordinatedGraphicsLayer::createTile): >+ (WebCore::CoordinatedGraphicsLayer::updateTile): >+ (WebCore::CoordinatedGraphicsLayer::removeTile): >+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h: >+ (CoordinatedGraphicsLayer): >+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp: >+ (WebCore::CoordinatedGraphicsScene::createTilesIfNeeded): >+ (WebCore::CoordinatedGraphicsScene::removeTilesIfNeeded): >+ (WebCore::CoordinatedGraphicsScene::updateTilesIfNeeded): >+ (WebCore::CoordinatedGraphicsScene::commitSceneState): >+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h: >+ (WebCore): >+ (TileCreationInfo): >+ (WebCore::TileCreationInfo::TileCreationInfo): >+ (WebCore::TileCreationInfoHash::hash): >+ (WebCore::TileCreationInfoHash::equal): >+ (TileCreationInfoHash): >+ (TileCreationInfoHashTraits): >+ (WebCore::TileCreationInfoHashTraits::emptyValue): >+ (WebCore::TileCreationInfoHashTraits::isEmptyValue): >+ (WebCore::TileCreationInfoHashTraits::constructEmtpyValue): >+ (WebCore::TileCreationInfoHashTraits::deletedValue): >+ (WebCore::TileCreationInfoHashTraits::isDeletedValue): >+ (WebCore::TileCreationInfoHashTraits::constructDeletedValue): >+ (CoordinatedGraphicsLayerState): >+ (CoordinatedGraphicsState): >+ * platform/graphics/texmap/coordinated/UpdateAtlas.cpp: >+ (WebCore::UpdateAtlas::UpdateAtlas): >+ (WebCore::UpdateAtlas::didCommitBuffers): >+ (WebCore::UpdateAtlas::didSwapBuffers): >+ (WebCore::UpdateAtlas::beginPaintingOnAvailableBuffer): >+ * platform/graphics/texmap/coordinated/UpdateAtlas.h: >+ (UpdateAtlas): >+ (WebCore::UpdateAtlas::isInUse): >+ > 2013-03-19 Mario Sanchez Prada <mario.prada@samsung.com> > > [GTK] Wrong guard USE(GLX) in RedirectedXCompositeWindow >diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/AreaAllocator.cpp b/Source/WebCore/platform/graphics/texmap/coordinated/AreaAllocator.cpp >index 9f54185..bf10ffb 100644 >--- a/Source/WebCore/platform/graphics/texmap/coordinated/AreaAllocator.cpp >+++ b/Source/WebCore/platform/graphics/texmap/coordinated/AreaAllocator.cpp >@@ -71,7 +71,15 @@ IntSize AreaAllocator::roundAllocation(const IntSize& size) const > > GeneralAreaAllocator::GeneralAreaAllocator(const IntSize& size) > : AreaAllocator(nextPowerOfTwo(size)) >+ , m_root(0) > { >+ initTree(); >+ setMinimumAllocation(IntSize(8, 8)); >+} >+ >+void GeneralAreaAllocator::initTree() >+{ >+ freeNode(m_root); > m_root = new Node(); > m_root->rect = IntRect(0, 0, m_size.width(), m_size.height()); > m_root->largestFree = m_size; >@@ -79,7 +87,6 @@ GeneralAreaAllocator::GeneralAreaAllocator(const IntSize& size) > m_root->left = 0; > m_root->right = 0; > m_nodeCount = 1; >- setMinimumAllocation(IntSize(8, 8)); > } > > GeneralAreaAllocator::~GeneralAreaAllocator() >@@ -239,8 +246,7 @@ IntPoint GeneralAreaAllocator::allocateFromNode(const IntSize& size, Node* node) > return IntPoint(-1, -1); > } > >-GeneralAreaAllocator::Node* GeneralAreaAllocator::splitNode >- (Node* node, Split split) >+GeneralAreaAllocator::Node* GeneralAreaAllocator::splitNode(Node* node, Split split) > { > Node* left = new Node(); > Node* right = new Node(); >@@ -300,6 +306,11 @@ void GeneralAreaAllocator::release(const IntRect& rect) > if (!node) > return; > >+ releaseNode(node); >+} >+ >+void GeneralAreaAllocator::releaseNode(Node* node) >+{ > // Mark the node as free and then work upwards through the tree > // recombining and deleting nodes until we reach a sibling > // that is still allocated. >@@ -330,6 +341,50 @@ int GeneralAreaAllocator::overhead() const > return m_nodeCount * sizeof(Node); > } > >+void GeneralAreaAllocator::markAllocations() >+{ >+ ASSERT(m_markedNodes.isEmpty()); >+ >+ // Push allocated leaves into the snapshot. >+ WTF::Vector<Node*, 4> stack; >+ stack.append(m_root); >+ while (!stack.isEmpty()) { >+ Node* current = stack.last(); >+ stack.removeLast(); >+ Node* left = current->left; >+ Node* right = current->right; >+ if (current->largestFree.isEmpty() && !left && !right) >+ m_markedNodes.append(current); >+ else { >+ if (left) >+ stack.append(left); >+ if (right) >+ stack.append(right); >+ } >+ } >+} >+ >+void GeneralAreaAllocator::clear() >+{ >+ if (m_markedNodes.isEmpty()) { >+ initTree(); >+ return; >+ } >+ >+ for (size_t i = 0; i < m_markedNodes.size(); ++i) { >+ Node* n = m_markedNodes[i]; >+ ASSERT(n->largestFree.isEmpty() && !n->left && !n->right); >+ releaseNode(n); >+ } >+ m_markedNodes.clear(); >+} >+ >+bool GeneralAreaAllocator::hasAllocations() const >+{ >+ ASSERT(m_root->largestFree == m_size || (m_root->left || m_root->right)); >+ return m_root->largestFree != m_size; >+} >+ > } // namespace WebCore > > #endif // USE(COORDINATED_GRAPHICS) >diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/AreaAllocator.h b/Source/WebCore/platform/graphics/texmap/coordinated/AreaAllocator.h >index 4180cae..ea87303 100644 >--- a/Source/WebCore/platform/graphics/texmap/coordinated/AreaAllocator.h >+++ b/Source/WebCore/platform/graphics/texmap/coordinated/AreaAllocator.h >@@ -23,6 +23,7 @@ > #include "IntPoint.h" > #include "IntRect.h" > #include "IntSize.h" >+#include <wtf/Vector.h> > > #if USE(COORDINATED_GRAPHICS) > >@@ -67,6 +68,12 @@ public: > > virtual int overhead() const; > >+ virtual void markAllocations() = 0; >+ // Clears the previously marked allocations or all if there was no marking. >+ virtual void clear() = 0; >+ >+ virtual bool hasAllocations() const = 0; >+ > protected: > IntSize m_size; > IntSize m_minAlloc; >@@ -85,7 +92,14 @@ public: > void release(const IntRect&); > int overhead() const; > >+ virtual void markAllocations() OVERRIDE; >+ virtual void clear() OVERRIDE; >+ >+ virtual bool hasAllocations() const OVERRIDE; >+ > private: >+ void initTree(); >+ > enum Split { SplitOnX, SplitOnY }; > > struct Node { >@@ -96,11 +110,15 @@ private: > Node* right; > }; > >+ typedef Vector<Node*, 8> NodeList; >+ > Node* m_root; >+ NodeList m_markedNodes; > int m_nodeCount; > > static void freeNode(Node*); > IntPoint allocateFromNode(const IntSize&, Node*); >+ void releaseNode(Node*); > Node* splitNode(Node*, Split); > static void updateLargestFree(Node*); > }; >diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedBackingStore.cpp b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedBackingStore.cpp >index cd5a12d..f265515 100644 >--- a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedBackingStore.cpp >+++ b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedBackingStore.cpp >@@ -30,7 +30,7 @@ namespace WebCore { > > void CoordinatedBackingStoreTile::swapBuffers(TextureMapper* textureMapper) > { >- if (!m_surface) >+ if (m_updates.isEmpty()) > return; > > FloatRect tileRect(m_tileRect); >@@ -49,18 +49,21 @@ void CoordinatedBackingStoreTile::swapBuffers(TextureMapper* textureMapper) > > ASSERT(textureMapper->maxTextureSize().width() >= m_tileRect.size().width() && textureMapper->maxTextureSize().height() >= m_tileRect.size().height()); > if (shouldReset) >- texture->reset(m_tileRect.size(), m_surface->supportsAlpha()); >+ texture->reset(m_tileRect.size(), m_updates.first().surface->supportsAlpha()); > >- m_surface->copyToTexture(texture, m_sourceRect, m_surfaceOffset); >- m_surface.clear(); >+ for (size_t i = 0; i < m_updates.size(); ++i) { >+ Update& update = m_updates[i]; >+ update.surface->copyToTexture(texture, update.sourceRect, update.surfaceOffset); >+ } >+ m_updates.clear(); > } > >-void CoordinatedBackingStoreTile::setBackBuffer(const IntRect& tileRect, const IntRect& sourceRect, PassRefPtr<CoordinatedSurface> buffer, const IntPoint& offset) >+void CoordinatedBackingStoreTile::addUpdate(const IntRect& tileRect, const IntRect& sourceRect, PassRefPtr<CoordinatedSurface> buffer, const IntPoint& offset) > { >- m_sourceRect = sourceRect; >+ // Make sure we don't mix incompatible updates. >+ ASSERT(m_tileRect == tileRect || m_updates.isEmpty()); > m_tileRect = tileRect; >- m_surfaceOffset = offset; >- m_surface = buffer; >+ m_updates.append(Update(buffer, sourceRect, offset)); > } > > void CoordinatedBackingStore::createTile(uint32_t id, float scale) >@@ -86,7 +89,7 @@ void CoordinatedBackingStore::updateTile(uint32_t id, const IntRect& sourceRect, > { > CoordinatedBackingStoreTileMap::iterator it = m_tiles.find(id); > ASSERT(it != m_tiles.end()); >- it->value.setBackBuffer(tileRect, sourceRect, backBuffer, offset); >+ it->value.addUpdate(tileRect, sourceRect, backBuffer, offset); > } > > PassRefPtr<BitmapTexture> CoordinatedBackingStore::texture() const >diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedBackingStore.h b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedBackingStore.h >index 4201454..9ba8310 100644 >--- a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedBackingStore.h >+++ b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedBackingStore.h >@@ -27,6 +27,7 @@ > #include "TextureMapperTile.h" > #include <wtf/HashMap.h> > #include <wtf/HashSet.h> >+#include <wtf/Vector.h> > > namespace WebCore { > >@@ -42,13 +43,21 @@ public: > > inline float scale() const { return m_scale; } > void swapBuffers(TextureMapper*); >- void setBackBuffer(const IntRect&, const IntRect&, PassRefPtr<CoordinatedSurface> buffer, const IntPoint&); >+ void addUpdate(const IntRect&, const IntRect&, PassRefPtr<CoordinatedSurface> buffer, const IntPoint&); > > private: >- RefPtr<CoordinatedSurface> m_surface; >- IntRect m_sourceRect; >+ struct Update { >+ Update(PassRefPtr<CoordinatedSurface> surface, const IntRect& sourceRect, const IntPoint& offset) >+ : surface(surface) >+ , sourceRect(sourceRect) >+ , surfaceOffset(offset) >+ { } >+ RefPtr<CoordinatedSurface> surface; >+ IntRect sourceRect; >+ IntPoint surfaceOffset; >+ }; >+ Vector<Update> m_updates; > IntRect m_tileRect; >- IntPoint m_surfaceOffset; > float m_scale; > }; > >diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp >index 36ae047..d41df78 100644 >--- a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp >+++ b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp >@@ -760,17 +760,15 @@ void CoordinatedGraphicsLayer::flushCompositingStateForThisLayerOnly() > syncCanvas(); > #endif > >- if (m_layerState.hasPendingChanges()) { >+ if (m_layerState.hasPendingChanges()) > m_coordinator->syncLayerState(m_id, m_layerState); >- resetLayerState(); >- } > > // Only unset m_movingVisibleRect after we have updated the visible rect after the animation stopped. > if (!hasActiveTransformAnimation) > m_movingVisibleRect = false; > } > >-void CoordinatedGraphicsLayer::resetLayerState() >+void CoordinatedGraphicsLayer::didCommitLayerState() > { > m_layerState.changeMask = 0; > m_layerState.tilesToCreate.clear(); >@@ -921,7 +919,11 @@ void CoordinatedGraphicsLayer::createTile(uint32_t tileID, const SurfaceUpdateIn > creationInfo.tileID = tileID; > creationInfo.scale = updateInfo.scaleFactor; > >- m_layerState.tilesToCreate.append(creationInfo); >+ CoordinatedGraphicsLayerState::TileCreationInfoSet::AddResult addResult = m_layerState.tilesToCreate.add(creationInfo); >+ if (!addResult.isNewEntry) { >+ m_layerState.tilesToUpdate.remove(tileID); >+ *addResult.iterator = creationInfo; >+ } > updateTile(tileID, updateInfo, tileRect); > } > >@@ -934,14 +936,40 @@ void CoordinatedGraphicsLayer::updateTile(uint32_t tileID, const SurfaceUpdateIn > tileUpdateInfo.tileID = tileID; > tileUpdateInfo.tileRect = tileRect; > tileUpdateInfo.updateInfo = updateInfo; >- m_layerState.tilesToUpdate.append(tileUpdateInfo); >+ >+ CoordinatedGraphicsLayerState::TileUpdateMap::AddResult addResult = m_layerState.tilesToUpdate.add(tileID, Vector<TileUpdateInfo>(1, tileUpdateInfo)); >+ if (!addResult.isNewEntry) { >+ // Remove old updates if imcompatible with or covered by the new one. >+ Vector<TileUpdateInfo> newUpdates; >+ Vector<TileUpdateInfo>& updates = addResult.iterator->value; >+ for (size_t i = 0; i < updates.size(); ++i) { >+ TileUpdateInfo& oldUpdate = updates[i]; >+ if (tileUpdateInfo.tileRect != oldUpdate.tileRect >+ || tileUpdateInfo.updateInfo.updateRect.contains(oldUpdate.updateInfo.updateRect)) >+ continue; >+ newUpdates.append(oldUpdate); >+ } >+ newUpdates.append(tileUpdateInfo); >+ updates.swap(newUpdates); >+ } > } > > void CoordinatedGraphicsLayer::removeTile(uint32_t tileID) > { > ASSERT(m_coordinator); > ASSERT(m_coordinator->isFlushingLayerChanges() || m_isPurging); >- m_layerState.tilesToRemove.append(tileID); >+ CoordinatedGraphicsLayerState::TileCreationInfoSet::iterator toCreate = m_layerState.tilesToCreate.find(tileID); >+ if (toCreate != m_layerState.tilesToCreate.end()) { >+ m_layerState.tilesToCreate.remove(toCreate); >+ m_layerState.tilesToUpdate.remove(tileID); >+ return; >+ } >+ >+ CoordinatedGraphicsLayerState::TileUpdateMap::iterator toUpdate = m_layerState.tilesToUpdate.find(tileID); >+ if (toUpdate != m_layerState.tilesToUpdate.end()) >+ m_layerState.tilesToUpdate.remove(toUpdate); >+ >+ m_layerState.tilesToRemove.add(tileID); > } > > void CoordinatedGraphicsLayer::updateContentBuffers() >diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h >index 45bfb27..c911a45 100644 >--- a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h >+++ b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h >@@ -144,6 +144,7 @@ public: > void setNeedsVisibleRectAdjustment(); > void purgeBackingStores(); > bool hasPendingVisibleChanges(); >+ void didCommitLayerState(); > > private: > #if USE(GRAPHICS_SURFACE) >@@ -174,7 +175,6 @@ private: > #endif > void didChangeImageBacking(); > >- void resetLayerState(); > void syncLayerState(); > void syncAnimations(); > void syncChildren(); >diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp >index eb085fc..f575f5c 100644 >--- a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp >+++ b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp >@@ -486,8 +486,8 @@ void CoordinatedGraphicsScene::createTilesIfNeeded(GraphicsLayer* layer, const C > RefPtr<CoordinatedBackingStore> backingStore = m_backingStores.get(layer); > ASSERT(backingStore); > >- for (size_t i = 0; i < state.tilesToCreate.size(); ++i) >- backingStore->createTile(state.tilesToCreate[i].tileID, state.tilesToCreate[i].scale); >+ for (CoordinatedGraphicsLayerState::TileCreationInfoSet::const_iterator it = state.tilesToCreate.begin(), end = state.tilesToCreate.end(); it != end; ++it) >+ backingStore->createTile(it->tileID, it->scale); > } > > void CoordinatedGraphicsScene::removeTilesIfNeeded(GraphicsLayer* layer, const CoordinatedGraphicsLayerState& state) >@@ -499,8 +499,8 @@ void CoordinatedGraphicsScene::removeTilesIfNeeded(GraphicsLayer* layer, const C > if (!backingStore) > return; > >- for (size_t i = 0; i < state.tilesToRemove.size(); ++i) >- backingStore->removeTile(state.tilesToRemove[i]); >+ for (HashSet<CoordinatedTileID>::const_iterator it = state.tilesToRemove.begin(), end = state.tilesToRemove.end(); it != end; ++it) >+ backingStore->removeTile(*it); > > m_backingStoresWithPendingBuffers.add(backingStore); > } >@@ -513,16 +513,17 @@ void CoordinatedGraphicsScene::updateTilesIfNeeded(GraphicsLayer* layer, const C > RefPtr<CoordinatedBackingStore> backingStore = m_backingStores.get(layer); > ASSERT(backingStore); > >- for (size_t i = 0; i < state.tilesToUpdate.size(); ++i) { >- const TileUpdateInfo& tileInfo = state.tilesToUpdate[i]; >- const SurfaceUpdateInfo& surfaceUpdateInfo = tileInfo.updateInfo; >- >- SurfaceMap::iterator surfaceIt = m_surfaces.find(surfaceUpdateInfo.atlasID); >- ASSERT(surfaceIt != m_surfaces.end()); >- >- backingStore->updateTile(tileInfo.tileID, surfaceUpdateInfo.updateRect, tileInfo.tileRect, surfaceIt->value, surfaceUpdateInfo.surfaceOffset); >- m_backingStoresWithPendingBuffers.add(backingStore); >+ for (CoordinatedGraphicsLayerState::TileUpdateMap::const_iterator it = state.tilesToUpdate.begin(), end = state.tilesToUpdate.end(); it != end; ++it) { >+ const Vector<TileUpdateInfo>& updateInfos = it->value; >+ for (size_t i = 0; i < updateInfos.size(); ++i) { >+ const TileUpdateInfo& info = updateInfos[i]; >+ RefPtr<CoordinatedSurface> surface = m_surfaces.get(info.updateInfo.atlasID); >+ ASSERT(surface); >+ backingStore->updateTile(info.tileID, info.updateInfo.updateRect, info.tileRect, surface, info.updateInfo.surfaceOffset); >+ } > } >+ >+ m_backingStoresWithPendingBuffers.add(backingStore); > } > > void CoordinatedGraphicsScene::createUpdateAtlas(uint32_t atlasID, PassRefPtr<CoordinatedSurface> surface) >@@ -621,11 +622,11 @@ void CoordinatedGraphicsScene::commitSceneState(const CoordinatedGraphicsState& > if (state.backgroundColor != m_backgroundColor) > setBackgroundColor(state.backgroundColor); > >- for (size_t i = 0; i < state.imagesToUpdate.size(); ++i) >- updateImageBacking(state.imagesToUpdate[i].first, state.imagesToUpdate[i].second); >+ for (CoordinatedGraphicsState::SurfaceUpdateMap::const_iterator it = state.imagesToUpdate.begin(), end = state.imagesToUpdate.end(); it != end; ++it) >+ updateImageBacking(it->key, it->value); > >- for (size_t i = 0; i < state.layersToUpdate.size(); ++i) >- setLayerState(state.layersToUpdate[i].first, state.layersToUpdate[i].second); >+ for (CoordinatedGraphicsState::LayerUpdateMap::const_iterator it = state.layersToUpdate.begin(), end = state.layersToUpdate.end(); it != end; ++it) >+ setLayerState(it->key, it->value); > > m_rootLayer->flushCompositingState(FloatRect()); > commitPendingBackingStoreOperations(); >diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h >index 8caf90b..6293f67 100644 >--- a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h >+++ b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h >@@ -37,6 +37,8 @@ > #include "IntSize.h" > #include "SurfaceUpdateInfo.h" > #include "TransformationMatrix.h" >+#include <wtf/HashMap.h> >+#include <wtf/HashSet.h> > > #if ENABLE(CSS_FILTERS) > #include "FilterOperations.h" >@@ -50,6 +52,9 @@ namespace WebCore { > > class CoordinatedSurface; > >+typedef uint32_t CoordinatedTileID; >+enum { InvalidCoordinatedTileID = 0 }; >+ > typedef uint32_t CoordinatedLayerID; > enum { InvalidCoordinatedLayerID = 0 }; > >@@ -63,10 +68,38 @@ struct TileUpdateInfo { > }; > > struct TileCreationInfo { >- uint32_t tileID; >+ // Default scale argument is used for passing an id as key. >+ TileCreationInfo(CoordinatedTileID id = 0, float scale = 0) >+ : tileID(id) >+ , scale(scale) >+ { } >+ >+ CoordinatedTileID tileID; > float scale; > }; > >+struct TileCreationInfoHash { >+ static unsigned hash(const TileCreationInfo& info) >+ { >+ ASSERT(info.tileID != InvalidCoordinatedTileID); >+ return WTF::intHash(info.tileID); >+ } >+ static bool equal(const TileCreationInfo& a, const TileCreationInfo& b) { return a.tileID == b.tileID; } >+ static const bool safeToCompareToEmptyOrDeleted = true; >+}; >+ >+struct TileCreationInfoHashTraits : WTF::GenericHashTraits<TileCreationInfo> { >+ static const bool emptyValueIsZero = true; >+ static const bool hasIsEmptyValueFunction = true; >+ static const bool needsDestruction = false; >+ static TileCreationInfo emptyValue() { return TileCreationInfo(InvalidCoordinatedTileID, 0); } >+ static bool isEmptyValue(const TileCreationInfo& value) { return value.tileID == InvalidCoordinatedTileID && !value.scale; } >+ static void constructEmtpyValue(TileCreationInfo& slot) { slot = emptyValue(); } >+ static TileCreationInfo deletedValue() { return TileCreationInfo(InvalidCoordinatedTileID, -1); } >+ static bool isDeletedValue(const TileCreationInfo& value) { return value.tileID == InvalidCoordinatedTileID && value.scale == -1; } >+ static void constructDeletedValue(TileCreationInfo& slot) { slot = deletedValue(); } >+}; >+ > struct CoordinatedGraphicsLayerState { > union { > struct { >@@ -149,14 +182,18 @@ struct CoordinatedGraphicsLayerState { > #endif > GraphicsLayerAnimations animations; > Vector<uint32_t> children; >- Vector<TileCreationInfo> tilesToCreate; >- Vector<uint32_t> tilesToRemove; >+ >+ typedef HashSet<TileCreationInfo, TileCreationInfoHash, TileCreationInfoHashTraits> TileCreationInfoSet; >+ TileCreationInfoSet tilesToCreate; >+ HashSet<CoordinatedTileID> tilesToRemove; >+ > CoordinatedLayerID replica; > CoordinatedLayerID mask; > CoordinatedImageBackingID imageID; > > unsigned repaintCount; >- Vector<TileUpdateInfo> tilesToUpdate; >+ typedef HashMap<CoordinatedTileID, Vector<TileUpdateInfo> > TileUpdateMap; >+ TileUpdateMap tilesToUpdate; > > #if USE(GRAPHICS_SURFACE) > IntSize canvasSize; >@@ -173,14 +210,16 @@ struct CoordinatedGraphicsLayerState { > }; > > struct CoordinatedGraphicsState { >- uint32_t rootCompositingLayer; >+ CoordinatedLayerID rootCompositingLayer; > Color backgroundColor; > FloatPoint scrollPosition; > IntSize contentsSize; > IntRect coveredRect; > >- Vector<std::pair<CoordinatedLayerID, CoordinatedGraphicsLayerState> > layersToUpdate; >- Vector<std::pair<CoordinatedImageBackingID, RefPtr<CoordinatedSurface> > > imagesToUpdate; >+ typedef HashMap<CoordinatedLayerID, CoordinatedGraphicsLayerState> LayerUpdateMap; >+ LayerUpdateMap layersToUpdate; >+ typedef HashMap<CoordinatedImageBackingID, RefPtr<CoordinatedSurface> > SurfaceUpdateMap; >+ SurfaceUpdateMap imagesToUpdate; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/UpdateAtlas.cpp b/Source/WebCore/platform/graphics/texmap/coordinated/UpdateAtlas.cpp >index 364f068..4dc1711 100644 >--- a/Source/WebCore/platform/graphics/texmap/coordinated/UpdateAtlas.cpp >+++ b/Source/WebCore/platform/graphics/texmap/coordinated/UpdateAtlas.cpp >@@ -37,6 +37,8 @@ UpdateAtlas::UpdateAtlas(UpdateAtlasClient* client, int dimension, CoordinatedSu > m_ID = ++nextID; > IntSize size = nextPowerOfTwo(IntSize(dimension, dimension)); > m_surface = CoordinatedSurface::create(size, flags); >+ m_areaAllocator = adoptPtr(new GeneralAreaAllocator(this->size())); >+ m_areaAllocator->setMinimumAllocation(IntSize(32, 32)); > > // FIXME: Currently, if sending the message fails, UpdateAtlas gives up drawing anything implicitly. > if (!m_client->createUpdateAtlas(m_ID, m_surface)) >@@ -49,23 +51,19 @@ UpdateAtlas::~UpdateAtlas() > m_client->removeUpdateAtlas(m_ID); > } > >-void UpdateAtlas::buildLayoutIfNeeded() >+void UpdateAtlas::didCommitBuffers() > { >- if (!m_areaAllocator) { >- m_areaAllocator = adoptPtr(new GeneralAreaAllocator(size())); >- m_areaAllocator->setMinimumAllocation(IntSize(32, 32)); >- } >+ m_areaAllocator->markAllocations(); > } > > void UpdateAtlas::didSwapBuffers() > { >- m_areaAllocator.clear(); >+ m_areaAllocator->clear(); > } > > PassOwnPtr<GraphicsContext> UpdateAtlas::beginPaintingOnAvailableBuffer(uint32_t& atlasID, const IntSize& size, IntPoint& offset) > { > m_inactivityInSeconds = 0; >- buildLayoutIfNeeded(); > IntRect rect = m_areaAllocator->allocate(size); > > // No available buffer was found, returning null. >diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/UpdateAtlas.h b/Source/WebCore/platform/graphics/texmap/coordinated/UpdateAtlas.h >index 48a6bf8..9cadd50 100644 >--- a/Source/WebCore/platform/graphics/texmap/coordinated/UpdateAtlas.h >+++ b/Source/WebCore/platform/graphics/texmap/coordinated/UpdateAtlas.h >@@ -47,6 +47,7 @@ public: > > // Returns a null pointer of there is no available buffer. > PassOwnPtr<GraphicsContext> beginPaintingOnAvailableBuffer(uint32_t& atlasID, const IntSize&, IntPoint& offset); >+ void didCommitBuffers(); > void didSwapBuffers(); > bool supportsAlpha() const { return m_surface->supportsAlpha(); } > >@@ -60,7 +61,7 @@ public: > const double inactiveSecondsTolerance = 3; > return m_inactivityInSeconds > inactiveSecondsTolerance; > } >- bool isInUse() const { return m_areaAllocator; } >+ bool isInUse() const { return m_areaAllocator->hasAllocations(); } > > private: > void buildLayoutIfNeeded(); >diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog >index 6eeac9b..0f8956b 100644 >--- a/Source/WebKit2/ChangeLog >+++ b/Source/WebKit2/ChangeLog >@@ -1,3 +1,32 @@ >+2013-03-19 Balazs Kelemen <kbalazs@webkit.org> >+ >+ [CoordGfx] Speed up web process rendering with double buffering >+ https://bugs.webkit.org/show_bug.cgi?id=109579 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ WIP patch, have rendering glitches on http://media.24ways.org/2009/15/space.html. >+ Render the new frame ahead of time while the UI process is updating. >+ For this to work we need to handle that CoordinatedGraphicsState can >+ be a result of multiple flushes. >+ >+ * Platform/CoreIPC/ArgumentCoders.h: >+ * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp: >+ (CoreIPC::::encode): >+ (CoreIPC::::decode): >+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp: >+ (WebKit::CoordinatedLayerTreeHost::CoordinatedLayerTreeHost): >+ (WebKit::CoordinatedLayerTreeHost::scheduleLayerFlush): >+ (WebKit::CoordinatedLayerTreeHost::shouldFlushLayerChanges): >+ (WebKit): >+ (WebKit::CoordinatedLayerTreeHost::flushPendingLayerChanges): >+ (WebKit::CoordinatedLayerTreeHost::commitFrame): >+ (WebKit::CoordinatedLayerTreeHost::syncLayerState): >+ (WebKit::CoordinatedLayerTreeHost::performScheduledLayerFlush): >+ (WebKit::CoordinatedLayerTreeHost::updateImageBacking): >+ (WebKit::CoordinatedLayerTreeHost::renderNextFrame): >+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h: >+ > 2013-03-19 Tim Horton <timothy_horton@apple.com> > > [wk2] Should support multiple page overlays, like the API suggests >diff --git a/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h b/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h >index 6c8241e..3a66aff 100644 >--- a/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h >+++ b/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h >@@ -30,6 +30,7 @@ > #include "ArgumentEncoder.h" > #include <utility> > #include <wtf/Forward.h> >+#include <wtf/HashSet.h> > #include <wtf/HashMap.h> > #include <wtf/TypeTraits.h> > #include <wtf/Vector.h> >@@ -157,6 +158,40 @@ template<typename T> struct VectorArgumentCoder<true, T> { > > template<typename T> struct ArgumentCoder<Vector<T> > : VectorArgumentCoder<WTF::IsArithmetic<T>::value, T> { }; > >+template<typename ValueArg, typename HashArg, typename TraitsArg> >+struct ArgumentCoder<HashSet<ValueArg, HashArg, TraitsArg> > { >+ typedef HashSet<ValueArg, HashArg, TraitsArg> HashSetType; >+ >+ static void encode(ArgumentEncoder &encoder, const HashSetType& hashSet) >+ { >+ encoder << uint64_t(hashSet.size()); >+ for (typename HashSetType::const_iterator it = hashSet.begin(), end = hashSet.end(); it != end; ++it) >+ encoder << *it; >+ } >+ >+ static bool decode(ArgumentDecoder& decoder, HashSetType& hashSet) >+ { >+ uint64_t size; >+ if (!decoder.decode(size)) >+ return false; >+ >+ HashSetType tempHashSet; >+ for (uint64_t i = 0; i < size; ++i) { >+ ValueArg value; >+ if (!decoder.decode(value)) >+ return false; >+ if (!tempHashSet.add(value).isNewEntry) { >+ // Inconsistent set, bail. >+ decoder.markInvalid(); >+ return false; >+ } >+ } >+ >+ hashSet.swap(tempHashSet); >+ return true; >+ } >+}; >+ > template<typename KeyArg, typename MappedArg, typename HashArg, typename KeyTraitsArg, typename MappedTraitsArg> struct ArgumentCoder<HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg> > { > typedef HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg> HashMapType; > >diff --git a/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp b/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp >index c78cb1b..9ce4093 100644 >--- a/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp >+++ b/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp >@@ -1023,16 +1023,13 @@ void ArgumentCoder<CoordinatedGraphicsState>::encode(ArgumentEncoder& encoder, c > // That's why we cannot use simple std::pair encoder. > encoder << static_cast<uint64_t>(state.imagesToUpdate.size()); > >- typedef Vector<std::pair<CoordinatedImageBackingID, RefPtr<CoordinatedSurface> > > SurfaceUpdatePairVector; >- SurfaceUpdatePairVector::const_iterator end = state.imagesToUpdate.end(); >- for (SurfaceUpdatePairVector::const_iterator it = state.imagesToUpdate.begin(); it != end; ++it) { >- >- WebCoordinatedSurface* webCoordinatedSurface = static_cast<WebCoordinatedSurface*>(it->second.get()); >+ for (CoordinatedGraphicsState::SurfaceUpdateMap::const_iterator it = state.imagesToUpdate.begin(), end = state.imagesToUpdate.end(); it != end; ++it) { >+ WebCoordinatedSurface* webCoordinatedSurface = static_cast<WebCoordinatedSurface*>(it->value.get()); > WebCoordinatedSurface::Handle handle; > if (!webCoordinatedSurface->createHandle(handle)) > return; > >- encoder << it->first; >+ encoder << it->key; > encoder << handle; > } > } >@@ -1071,7 +1068,9 @@ bool ArgumentCoder<CoordinatedGraphicsState>::decode(ArgumentDecoder& decoder, C > return false; > > RefPtr<CoordinatedSurface> surface = WebCoordinatedSurface::create(handle); >- state.imagesToUpdate.append(std::make_pair(imageID, surface.release())); >+ CoordinatedGraphicsState::SurfaceUpdateMap::AddResult addResult = state.imagesToUpdate.add(imageID, surface.release()); >+ if (!addResult.isNewEntry) >+ return false; > } > > return true; >diff --git a/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp b/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp >index 3e470a1..9f46e6d 100644 >--- a/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp >+++ b/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp >@@ -56,6 +56,8 @@ > #include "ValidatedCustomFilterOperation.h" > #endif > >+#include <wkreleaseassert.h> >+ > using namespace WebCore; > > namespace WebKit { >@@ -85,6 +87,7 @@ CoordinatedLayerTreeHost::CoordinatedLayerTreeHost(WebPage* webPage) > , m_isFlushingLayerChanges(false) > , m_waitingForUIProcess(true) > , m_isSuspended(false) >+ , m_useDoubleBuffering(true) // FIXME: Currently it will stay enabled forerev. We should disable it on low memory situations. > , m_shouldSyncFrame(false) > , m_didInitializeRootCompositingLayer(false) > , m_layerFlushTimer(this, &CoordinatedLayerTreeHost::layerFlushTimerFired) >@@ -146,6 +149,9 @@ void CoordinatedLayerTreeHost::scheduleLayerFlush() > if (!m_layerFlushSchedulingEnabled) > return; > >+ // Invalidate prerendered frame if we made one. >+ m_didRenderFrameInBackBuffers = false; >+ > if (!m_layerFlushTimer.isActive()) > m_layerFlushTimer.startOneShot(0); > } >@@ -283,11 +289,23 @@ void CoordinatedLayerTreeHost::setPageOverlayOpacity(PageOverlay*, float value) > scheduleLayerFlush(); > } > >+bool CoordinatedLayerTreeHost::shouldFlushLayerChanges() >+{ >+ if (m_useDoubleBuffering) >+ return !m_didRenderFrameInBackBuffers; >+ >+ return !m_waitingForUIProcess; >+} >+ > bool CoordinatedLayerTreeHost::flushPendingLayerChanges() > { >- if (m_waitingForUIProcess) >+ if (!shouldFlushLayerChanges()) > return false; > >+ ASSERT(!m_isFlushingLayerChanges); >+ ASSERT(!m_didRenderFrameInBackBuffers); >+ ASSERT(!m_waitingForUIProcess || m_useDoubleBuffering); >+ > TemporaryChange<bool> protector(m_isFlushingLayerChanges, true); > > createCompositingLayers(); >@@ -305,20 +323,13 @@ bool CoordinatedLayerTreeHost::flushPendingLayerChanges() > > deleteCompositingLayers(); > >- if (m_shouldSyncFrame) { >+ if (m_waitingForUIProcess) >+ m_didRenderFrameInBackBuffers = true; >+ else if (m_shouldSyncFrame) { > didSync = true; >- >- m_state.contentsSize = roundedIntSize(m_nonCompositedContentLayer->size()); >- m_state.coveredRect = toCoordinatedGraphicsLayer(m_nonCompositedContentLayer.get())->coverRect(); >- m_state.scrollPosition = m_visibleContentsRect.location(); >- >- m_webPage->send(Messages::CoordinatedLayerTreeHostProxy::CommitCoordinatedGraphicsState(m_state)); >- >- m_state.layersToUpdate.clear(); >- m_state.imagesToUpdate.clear(); >- >- m_waitingForUIProcess = true; >- m_shouldSyncFrame = false; >+ commitFrame(); >+ if (m_useDoubleBuffering && !m_layerFlushTimer.isActive()) >+ m_layerFlushTimer.startOneShot(0); > } else > unlockAnimations(); > >@@ -330,6 +341,28 @@ bool CoordinatedLayerTreeHost::flushPendingLayerChanges() > return didSync; > } > >+void CoordinatedLayerTreeHost::commitFrame() >+{ >+ m_state.contentsSize = roundedIntSize(m_nonCompositedContentLayer->size()); >+ m_state.coveredRect = toCoordinatedGraphicsLayer(m_nonCompositedContentLayer.get())->coverRect(); >+ m_state.scrollPosition = m_visibleContentsRect.location(); >+ >+ m_webPage->send(Messages::CoordinatedLayerTreeHostProxy::CommitCoordinatedGraphicsState(m_state)); >+ >+ m_state.layersToUpdate.clear(); >+ m_state.imagesToUpdate.clear(); >+ >+ m_waitingForUIProcess = true; >+ m_didRenderFrameInBackBuffers = false; >+ m_shouldSyncFrame = false; >+ >+ for (size_t i = 0; i < m_updateAtlases.size(); ++i) >+ m_updateAtlases[i]->didCommitBuffers(); >+ >+ for (LayerMap::iterator it = m_registeredLayers.begin(); it != m_registeredLayers.end(); ++it) >+ toCoordinatedGraphicsLayer(it->value)->didCommitLayerState(); >+} >+ > void CoordinatedLayerTreeHost::createCompositingLayers() > { > if (m_layersToCreate.isEmpty()) >@@ -382,7 +415,7 @@ void CoordinatedLayerTreeHost::syncLayerState(CoordinatedLayerID id, Coordinated > prepareCustomFilterProxiesIfNeeded(state); > #endif > >- m_state.layersToUpdate.append(std::make_pair(id, state)); >+ m_state.layersToUpdate.set(id, state); > } > > #if ENABLE(CSS_SHADERS) >@@ -481,7 +514,7 @@ void CoordinatedLayerTreeHost::unlockAnimations() > > void CoordinatedLayerTreeHost::performScheduledLayerFlush() > { >- if (m_isSuspended || m_waitingForUIProcess) >+ if (m_isSuspended || !shouldFlushLayerChanges()) > return; > > // We lock the animations while performing layout, to avoid flickers caused by animations continuing in the UI process while >@@ -575,7 +608,7 @@ bool CoordinatedLayerTreeHost::updateImageBacking(CoordinatedImageBackingID imag > if (!webCoordinatedSurface->createHandle(handle)) > return false; > >- m_state.imagesToUpdate.append(std::make_pair(imageID, coordinatedSurface)); >+ m_state.imagesToUpdate.set(imageID, coordinatedSurface); > return true; > } > >@@ -731,9 +764,14 @@ void CoordinatedLayerTreeHost::animationFrameReady() > void CoordinatedLayerTreeHost::renderNextFrame() > { > m_waitingForUIProcess = false; >- scheduleLayerFlush(); >+ > for (unsigned i = 0; i < m_updateAtlases.size(); ++i) > m_updateAtlases[i]->didSwapBuffers(); >+ >+ if (m_didRenderFrameInBackBuffers && m_shouldSyncFrame) >+ commitFrame(); >+ >+ scheduleLayerFlush(); > } > > void CoordinatedLayerTreeHost::purgeBackingStores() >diff --git a/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h b/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h >index b07edc1..986bafa 100644 >--- a/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h >+++ b/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h >@@ -144,6 +144,8 @@ private: > void syncDisplayState(); > void lockAnimations(); > void unlockAnimations(); >+ void commitFrame(); >+ bool shouldFlushLayerChanges(); > > void layerFlushTimerFired(WebCore::Timer<CoordinatedLayerTreeHost>*); > >@@ -195,6 +197,10 @@ private: > > bool m_waitingForUIProcess; > bool m_isSuspended; >+ >+ bool m_useDoubleBuffering; >+ bool m_didRenderFrameInBackBuffers; >+ > WebCore::FloatRect m_visibleContentsRect; > > LayerTreeContext m_layerTreeContext;
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=193815">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 109579
:
187859
|
187860
|
187861
|
193815
|
194567
|
196015
|
196150