diff options
| author | Nicolas Roard <nicolas@android.com> | 2011-02-18 19:48:25 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-18 19:48:25 -0800 |
| commit | dd17d165c8aefdc123104908cef4cb5f742f2296 (patch) | |
| tree | 7aa98e88ef3c2e78f018dac39fb6826146dee826 | |
| parent | 6c92fe3486d362d49c3d2a0399611797d35173d1 (diff) | |
| parent | bdbce22a3ad0e8abea6b824e7ec9fd5ae3ea9637 (diff) | |
| download | external_webkit-dd17d165c8aefdc123104908cef4cb5f742f2296.zip external_webkit-dd17d165c8aefdc123104908cef4cb5f742f2296.tar.gz external_webkit-dd17d165c8aefdc123104908cef4cb5f742f2296.tar.bz2 | |
am bdbce22a: DO NOT MERGE Clip layers if the texture size is too large for the GPU
* commit 'bdbce22a3ad0e8abea6b824e7ec9fd5ae3ea9637':
DO NOT MERGE Clip layers if the texture size is too large for the GPU
| -rw-r--r-- | WebCore/platform/graphics/android/LayerAndroid.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/LayerAndroid.cpp b/WebCore/platform/graphics/android/LayerAndroid.cpp index 42104dc..16f7189 100644 --- a/WebCore/platform/graphics/android/LayerAndroid.cpp +++ b/WebCore/platform/graphics/android/LayerAndroid.cpp @@ -671,7 +671,9 @@ void LayerAndroid::computeTextureSize() // If we are under the maximum, and the layer inspected // needs a texture less than the maxLayerSize, use the full texture. if ((total < max) && - (layer->fullTextureSize() < maxLayerSize)) { + (layer->fullTextureSize() < maxLayerSize) && + (layer->getWidth() * m_scale < TilesManager::instance()->getMaxTextureSize()) && + (layer->getHeight() * m_scale < TilesManager::instance()->getMaxTextureSize())) { IntRect full(0, 0, layer->getWidth(), layer->getHeight()); layer->m_layerTextureRect = full; clipped = false; |