diff options
| author | Nicolas Roard <nicolasroard@google.com> | 2011-10-13 08:47:58 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-13 08:47:58 -0700 |
| commit | 9bd214662e776fb18e43d1ad32ce274803ec309a (patch) | |
| tree | 6c41ab0ae4fff5c7cf62ea6ced261e28e62c0186 /Source/WebKit/android/jni | |
| parent | 5ed31e7bc52e99103e4da5755d944f9ca98305b3 (diff) | |
| parent | 9651fe9381af8dcc55a6370c3d2a65fcbdab846e (diff) | |
| download | external_webkit-9bd214662e776fb18e43d1ad32ce274803ec309a.zip external_webkit-9bd214662e776fb18e43d1ad32ce274803ec309a.tar.gz external_webkit-9bd214662e776fb18e43d1ad32ce274803ec309a.tar.bz2 | |
Merge "Refactor the image sharing code" into ics-mr0
Diffstat (limited to 'Source/WebKit/android/jni')
| -rw-r--r-- | Source/WebKit/android/jni/ViewStateSerializer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebKit/android/jni/ViewStateSerializer.cpp b/Source/WebKit/android/jni/ViewStateSerializer.cpp index c896637..93f4375 100644 --- a/Source/WebKit/android/jni/ViewStateSerializer.cpp +++ b/Source/WebKit/android/jni/ViewStateSerializer.cpp @@ -27,6 +27,7 @@ #include "BaseLayerAndroid.h" #include "CreateJavaOutputStreamAdaptor.h" +#include "ImagesManager.h" #include "Layer.h" #include "LayerAndroid.h" #include "PictureSet.h" @@ -302,7 +303,7 @@ void serializeLayer(LayerAndroid* layer, SkWStream* stream) SkFlattenableWriteBuffer buffer(1024); buffer.setFlags(SkFlattenableWriteBuffer::kCrossProcess_Flag); ImageTexture* imagetexture = - TilesManager::instance()->getTextureForImage(layer->m_imageRef, false); + ImagesManager::instance()->getTextureForImage(layer->m_imageRef, false); if (imagetexture && imagetexture->bitmap()) imagetexture->bitmap()->flatten(buffer); stream->write32(buffer.size()); |