summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/graphics/android/TilesManager.h
diff options
context:
space:
mode:
authorNicolas Roard <nicolasroard@google.com>2011-03-23 15:46:41 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-23 15:46:41 -0700
commit6fd1c35298bb73147bb585e01b86d5b7c1c8f640 (patch)
tree18b23352122a8aa070481d70ab5d0f54c632b666 /WebCore/platform/graphics/android/TilesManager.h
parent28b632cb7811e88493697f19a1be5d989651633f (diff)
parent5bdfd148249f6196a184550910f1cd8cb138fe8c (diff)
downloadexternal_webkit-6fd1c35298bb73147bb585e01b86d5b7c1c8f640.zip
external_webkit-6fd1c35298bb73147bb585e01b86d5b7c1c8f640.tar.gz
external_webkit-6fd1c35298bb73147bb585e01b86d5b7c1c8f640.tar.bz2
am 5bdfd148: Merge "Regression fix from bug:4136077 Plus animations improvement bug:3389597" into honeycomb-mr1
* commit '5bdfd148249f6196a184550910f1cd8cb138fe8c': Regression fix from bug:4136077 Plus animations improvement bug:3389597
Diffstat (limited to 'WebCore/platform/graphics/android/TilesManager.h')
-rw-r--r--WebCore/platform/graphics/android/TilesManager.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/platform/graphics/android/TilesManager.h b/WebCore/platform/graphics/android/TilesManager.h
index 8c44bea..5a4e28a 100644
--- a/WebCore/platform/graphics/android/TilesManager.h
+++ b/WebCore/platform/graphics/android/TilesManager.h
@@ -67,9 +67,9 @@ public:
m_pixmapsGenerationThread->removeOperationsForTexture(texture);
}
- void scheduleOperation(QueuedOperation* operation)
+ void scheduleOperation(QueuedOperation* operation, bool scheduleFirst = false)
{
- m_pixmapsGenerationThread->scheduleOperation(operation);
+ m_pixmapsGenerationThread->scheduleOperation(operation, scheduleFirst);
}
ShaderProgram* shader() { return &m_shader; }