diff options
| author | Chris Craik <ccraik@google.com> | 2012-06-02 15:07:58 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-02 15:07:58 -0700 |
| commit | 06100d01966af4c0332fd964d9deb20f052c308d (patch) | |
| tree | 918e3de5269d015372568f056de5f51a2b3b091a /Source/WebCore/platform/graphics/android/rendering | |
| parent | 6b850721064920ae1ddb114964c5c2bb4a745532 (diff) | |
| parent | 25c25a826222bf0fa1df56f6cfd8582296357b49 (diff) | |
| download | external_webkit-06100d01966af4c0332fd964d9deb20f052c308d.zip external_webkit-06100d01966af4c0332fd964d9deb20f052c308d.tar.gz external_webkit-06100d01966af4c0332fd964d9deb20f052c308d.tar.bz2 | |
Merge "Disable clipping on the base surface" into jb-dev
Diffstat (limited to 'Source/WebCore/platform/graphics/android/rendering')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/Surface.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/Surface.cpp b/Source/WebCore/platform/graphics/android/rendering/Surface.cpp index 9df1a7a..d68051d 100644 --- a/Source/WebCore/platform/graphics/android/rendering/Surface.cpp +++ b/Source/WebCore/platform/graphics/android/rendering/Surface.cpp @@ -230,17 +230,15 @@ bool Surface::drawGL(bool layerTilesDisabled) if (singleLayer() && !getFirstLayer()->visible()) return false; - bool isBaseLayer = isBase() - || getFirstLayer()->subclassType() == LayerAndroid::FixedBackgroundImageLayer - || getFirstLayer()->subclassType() == LayerAndroid::ForegroundBaseLayer; - - FloatRect drawClip = getFirstLayer()->drawClip(); - if (!singleLayer()) { - for (unsigned int i = 1; i < m_layers.size(); i++) - drawClip.unite(m_layers[i]->drawClip()); + if (!isBase()) { + FloatRect drawClip = getFirstLayer()->drawClip(); + if (!singleLayer()) { + for (unsigned int i = 1; i < m_layers.size(); i++) + drawClip.unite(m_layers[i]->drawClip()); + } + FloatRect clippingRect = TilesManager::instance()->shader()->rectInInvViewCoord(drawClip); + TilesManager::instance()->shader()->clip(clippingRect); } - FloatRect clippingRect = TilesManager::instance()->shader()->rectInInvViewCoord(drawClip); - TilesManager::instance()->shader()->clip(clippingRect); bool askRedraw = false; if (m_surfaceBacking && !tilesDisabled) { |