diff options
| author | Steve Block <steveblock@google.com> | 2010-09-22 12:09:32 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-29 17:45:49 +0100 |
| commit | 2595a6309e7fc2ba8fbbfe9363d61bdbb1374eb8 (patch) | |
| tree | e2629c9ef78a19ff1467309af6e268a26fd82cde /WebCore | |
| parent | 2b9fea6f8b26a3ee80e2c4ae416c034d3466e422 (diff) | |
| download | external_webkit-2595a6309e7fc2ba8fbbfe9363d61bdbb1374eb8.zip external_webkit-2595a6309e7fc2ba8fbbfe9363d61bdbb1374eb8.tar.gz external_webkit-2595a6309e7fc2ba8fbbfe9363d61bdbb1374eb8.tar.bz2 | |
Merge WebKit at r67908: Remove call to SharedGraphicsContext3D::removeTexturesFor()
See http://trac.webkit.org/changeset/67412
Change-Id: I327df5aa81770a4eab885933ac6339ae26aca62a
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/platform/graphics/skia/NativeImageSkia.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/WebCore/platform/graphics/skia/NativeImageSkia.cpp b/WebCore/platform/graphics/skia/NativeImageSkia.cpp index 3cc89cc..94f9b75 100644 --- a/WebCore/platform/graphics/skia/NativeImageSkia.cpp +++ b/WebCore/platform/graphics/skia/NativeImageSkia.cpp @@ -58,7 +58,15 @@ NativeImageSkia::NativeImageSkia(const SkBitmap& other) NativeImageSkia::~NativeImageSkia() { +#if PLATFORM(ANDROID) + // SharedGraphicsContext3D::removeTexturesFor() takes a NativeImagePtr. On + // Chromium, this is NativeImageSkia, which inherits from SkBitmap. On + // Android, NativeImagePtr is a SkBitmapRef, which is a wrapper around + // SkBitmap. Failing to call removeTexturesFor() probably causes a leak. + // TODO: Fix this. See http://b/3047425 +#else SharedGraphicsContext3D::removeTexturesFor(this); +#endif } int NativeImageSkia::decodedSize() const |