diff options
author | John Reck <jreck@google.com> | 2012-05-03 19:55:39 -0700 |
---|---|---|
committer | John Reck <jreck@google.com> | 2012-05-04 10:00:45 -0700 |
commit | d30efeae4fa6b64029cfa478fe80981232f502e5 (patch) | |
tree | 911d9a55ebeaf92a667ecc29dae57f4accfd449b /Source/WebKit/android/jni/WebViewCore.cpp | |
parent | 897f9bc8d6e51ba1d0209f219e4c98c8565927e9 (diff) | |
download | external_webkit-d30efeae4fa6b64029cfa478fe80981232f502e5.zip external_webkit-d30efeae4fa6b64029cfa478fe80981232f502e5.tar.gz external_webkit-d30efeae4fa6b64029cfa478fe80981232f502e5.tar.bz2 |
Broaden fast inval path
Bug: 6445600
Clip fast partial invals to the screen instead of an arbitrary size
limit
Change-Id: Iafcbcb427566db87420b8bfc54eb9148530913ce
Diffstat (limited to 'Source/WebKit/android/jni/WebViewCore.cpp')
-rw-r--r-- | Source/WebKit/android/jni/WebViewCore.cpp | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp index 34740a8..58341bb 100644 --- a/Source/WebKit/android/jni/WebViewCore.cpp +++ b/Source/WebKit/android/jni/WebViewCore.cpp @@ -123,6 +123,7 @@ #include "SkUtils.h" #include "Text.h" #include "TextIterator.h" +#include "TilesManager.h" #include "TypingCommand.h" #include "WebCache.h" #include "WebCoreFrameBridge.h" @@ -732,38 +733,42 @@ void WebViewCore::paintContents(WebCore::GraphicsContext* gc, WebCore::IntRect& SkCanvas* WebViewCore::createPrerenderCanvas(PrerenderedInval* prerendered) { - IntRect screen(m_scrollOffsetX, m_scrollOffsetY, m_screenWidth, m_screenHeight); - if (prerendered->area.isEmpty() || !prerendered->area.intersects(screen)) + if (prerendered->area.isEmpty()) return 0; + FloatRect scaleTemp(m_scrollOffsetX, m_scrollOffsetY, m_screenWidth, m_screenHeight); + scaleTemp.scale(m_scale); + IntRect visibleTileClip = enclosingIntRect(scaleTemp); FloatRect scaledArea = prerendered->area; scaledArea.scale(m_scale); IntRect enclosingScaledArea = enclosingIntRect(scaledArea); if (enclosingScaledArea.isEmpty()) return 0; + // "round out" the screen to tile boundaries so that we can clip yet still + // cover any visible tiles with the prerender + int tw = TilesManager::tileWidth(); + int th = TilesManager::tileHeight(); + float left = tw * (int) (visibleTileClip.x() / tw); + float top = th * (int) (visibleTileClip.y() / th); + float right = tw * (int) ceilf(visibleTileClip.maxX() / (float) tw); + float bottom = th * (int) ceilf(visibleTileClip.maxY() / (float) th); + visibleTileClip = IntRect(left, top, right - left, bottom - top); + enclosingScaledArea.intersect(visibleTileClip); + if (enclosingScaledArea.isEmpty()) + return 0; prerendered->screenArea = enclosingScaledArea; FloatRect enclosingDocArea(enclosingScaledArea); enclosingDocArea.scale(1 / m_scale); prerendered->area = enclosingIntRect(enclosingDocArea); if (prerendered->area.isEmpty()) return 0; - // TODO: We need a better heuristic for this. We should change this to: - // 1) Limit by area, not width/height (as we care more about the RAM than size) - // 2) Clip by the screen, but "round out" to make sure we cover partially - // visible tiles - int maxWidth = ceilf(m_screenWidth * m_scale); - int maxHeight = ceilf(m_screenHeight * m_scale); - if (enclosingScaledArea.width() <= maxWidth - && enclosingScaledArea.height() <= maxHeight) { - prerendered->bitmap.setConfig(SkBitmap::kARGB_8888_Config, - enclosingScaledArea.width(), - enclosingScaledArea.height()); - prerendered->bitmap.allocPixels(); - SkCanvas* bitmapCanvas = new SkCanvas(prerendered->bitmap); - bitmapCanvas->scale(m_scale, m_scale); - bitmapCanvas->translate(-enclosingDocArea.x(), -enclosingDocArea.y()); - return bitmapCanvas; - } - return 0; + prerendered->bitmap.setConfig(SkBitmap::kARGB_8888_Config, + enclosingScaledArea.width(), + enclosingScaledArea.height()); + prerendered->bitmap.allocPixels(); + SkCanvas* bitmapCanvas = new SkCanvas(prerendered->bitmap); + bitmapCanvas->scale(m_scale, m_scale); + bitmapCanvas->translate(-enclosingDocArea.x(), -enclosingDocArea.y()); + return bitmapCanvas; } void WebViewCore::notifyAnimationStarted() |