summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/rendering/Surface.cpp
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2012-05-29 13:58:06 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-29 13:58:06 -0700
commitbc9eaa14e2e64f58d9b23bb4909870d185b4246e (patch)
tree5078ff5d531430ad988f167d22a4d850e33882fe /Source/WebCore/platform/graphics/android/rendering/Surface.cpp
parent6184a1dfef36741a1e5602f5bf24ac99fcfa0aec (diff)
parentcfbfb3bbc3ed10f3e061b52c70e5c7935e96a45a (diff)
downloadexternal_webkit-bc9eaa14e2e64f58d9b23bb4909870d185b4246e.zip
external_webkit-bc9eaa14e2e64f58d9b23bb4909870d185b4246e.tar.gz
external_webkit-bc9eaa14e2e64f58d9b23bb4909870d185b4246e.tar.bz2
Merge "Reduce UI-thread computation" into jb-dev
Diffstat (limited to 'Source/WebCore/platform/graphics/android/rendering/Surface.cpp')
-rw-r--r--Source/WebCore/platform/graphics/android/rendering/Surface.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/Surface.cpp b/Source/WebCore/platform/graphics/android/rendering/Surface.cpp
index 94b7b6e..106b045 100644
--- a/Source/WebCore/platform/graphics/android/rendering/Surface.cpp
+++ b/Source/WebCore/platform/graphics/android/rendering/Surface.cpp
@@ -264,12 +264,12 @@ bool Surface::drawGL(bool layerTilesDisabled)
return askRedraw;
}
-void Surface::swapTiles()
+void Surface::swapTiles(bool calculateFrameworkInvals)
{
if (!m_surfaceBacking)
return;
- if (m_surfaceBacking->swapTiles())
+ if (m_surfaceBacking->swapTiles() && calculateFrameworkInvals)
addFrameworkInvals();
}