summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/graphics/android/TilesManager.h
diff options
context:
space:
mode:
authorNicolas Roard <nicolas@android.com>2011-01-26 15:00:58 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-26 15:00:58 -0800
commit7a7307a06aa1a2f811de4355ea0e772213f2da67 (patch)
tree597920fceac180cd831b2f2f99057e0f792bac65 /WebCore/platform/graphics/android/TilesManager.h
parent1e31eaae2b57a140a60c3469077f5aeeeb2db9c9 (diff)
parent4c0f1a51d7d3b51a1f241aa700f9ed5b3b23998c (diff)
downloadexternal_webkit-7a7307a06aa1a2f811de4355ea0e772213f2da67.zip
external_webkit-7a7307a06aa1a2f811de4355ea0e772213f2da67.tar.gz
external_webkit-7a7307a06aa1a2f811de4355ea0e772213f2da67.tar.bz2
Merge "Fix the flickering bug. We return any previous textures used by the layer until we get the new one ready." into honeycomb
Diffstat (limited to 'WebCore/platform/graphics/android/TilesManager.h')
-rw-r--r--WebCore/platform/graphics/android/TilesManager.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/TilesManager.h b/WebCore/platform/graphics/android/TilesManager.h
index c09a388..0338ece 100644
--- a/WebCore/platform/graphics/android/TilesManager.h
+++ b/WebCore/platform/graphics/android/TilesManager.h
@@ -72,7 +72,7 @@ public:
void printLayersTextures(const char* s);
void cleanupLayersTextures(LayerAndroid* layer, bool forceCleanup = false);
LayerTexture* getExistingTextureForLayer(LayerAndroid* layer, const IntRect& rect,
- bool any = false);
+ bool any = false, LayerTexture* texture = 0);
LayerTexture* createTextureForLayer(LayerAndroid* layer, const IntRect& rect);
void markGeneratorAsReady()