diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-03-25 10:35:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-25 10:35:14 -0700 |
| commit | 8527f14d378e1fb4ba315d791f3c8c7b776bff4c (patch) | |
| tree | 57cf9f775f93718a128e13647d5283caa5a7081b /WebCore/platform/graphics/android/SharedTexture.h | |
| parent | 70e1ff0b3913af6a122390bbe4768c2c0fea045d (diff) | |
| parent | 92c3acf6b42939215be09fe379bfef07ab703216 (diff) | |
| download | external_webkit-8527f14d378e1fb4ba315d791f3c8c7b776bff4c.zip external_webkit-8527f14d378e1fb4ba315d791f3c8c7b776bff4c.tar.gz external_webkit-8527f14d378e1fb4ba315d791f3c8c7b776bff4c.tar.bz2 | |
am 92c3acf6: Fix error where mediaLayer is derefed on UI thread prior to being derefed in Webkit.
* commit '92c3acf6b42939215be09fe379bfef07ab703216':
Fix error where mediaLayer is derefed on UI thread prior to being derefed in Webkit.
Diffstat (limited to 'WebCore/platform/graphics/android/SharedTexture.h')
| -rw-r--r-- | WebCore/platform/graphics/android/SharedTexture.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/WebCore/platform/graphics/android/SharedTexture.h b/WebCore/platform/graphics/android/SharedTexture.h index 731aa5c..37d6091 100644 --- a/WebCore/platform/graphics/android/SharedTexture.h +++ b/WebCore/platform/graphics/android/SharedTexture.h @@ -81,6 +81,7 @@ public: void initSourceTexture(); // producer thread only void deleteSourceTexture(); // producer thread only + void deleteTargetTexture(); // consumer thread only GLuint getSourceTextureId() { return m_sourceTexture.m_textureId; } GLuint getTargetTextureId() { return m_targetTexture.m_textureId; } EGLImageKHR getEGLImage() { return m_eglImage; } |