diff options
| author | Derek Sollenberger <djsollen@google.com> | 2010-12-20 11:55:52 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-20 11:55:52 -0800 |
| commit | a1e0fec47adb2c0838ef3376d3853fceaa05f006 (patch) | |
| tree | 930439374c62f260a5c30a94ad16c81ccc2d3019 /WebCore | |
| parent | ad95cbb2c0f10d0b0942d95c505c95fd4b799aae (diff) | |
| parent | e7257bf64164fc2bbc9170824c5c1b3bde54e180 (diff) | |
| download | external_webkit-a1e0fec47adb2c0838ef3376d3853fceaa05f006.zip external_webkit-a1e0fec47adb2c0838ef3376d3853fceaa05f006.tar.gz external_webkit-a1e0fec47adb2c0838ef3376d3853fceaa05f006.tar.bz2 | |
Merge "Prevent media layers from allocating textures."
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/platform/graphics/android/LayerAndroid.h | 2 | ||||
| -rw-r--r-- | WebCore/platform/graphics/android/MediaLayer.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/LayerAndroid.h b/WebCore/platform/graphics/android/LayerAndroid.h index fb6c4c7..1156601 100644 --- a/WebCore/platform/graphics/android/LayerAndroid.h +++ b/WebCore/platform/graphics/android/LayerAndroid.h @@ -109,7 +109,7 @@ public: void reserveGLTextures(); void createGLTextures(); - bool needsTexture(); + virtual bool needsTexture(); void checkForObsolescence(); virtual bool drawGL(SkMatrix&); diff --git a/WebCore/platform/graphics/android/MediaLayer.h b/WebCore/platform/graphics/android/MediaLayer.h index 2ff3197..eb56440 100644 --- a/WebCore/platform/graphics/android/MediaLayer.h +++ b/WebCore/platform/graphics/android/MediaLayer.h @@ -44,6 +44,7 @@ public: virtual bool drawGL(SkMatrix&); virtual void paintBitmapGL() const { }; + virtual bool needsTexture() { return false; } virtual bool isMedia() const { return true; } virtual LayerAndroid* copy() const { return new MediaLayer(*this); } |