diff options
| author | John Reck <jreck@google.com> | 2012-03-20 17:41:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-20 17:41:49 -0700 |
| commit | d77fa7bfea2cf8a2d29b5f3d994b45a270443a51 (patch) | |
| tree | d50ad5a55d2a86d0ddd80db8bc67e95880084c1a /Source | |
| parent | c2992cfb02b098d6e8579b6a0ba7f7a11c7753fe (diff) | |
| parent | 1f0bae25e3c0f8b27565947a791ba7d77fcaa641 (diff) | |
| download | external_webkit-d77fa7bfea2cf8a2d29b5f3d994b45a270443a51.zip external_webkit-d77fa7bfea2cf8a2d29b5f3d994b45a270443a51.tar.gz external_webkit-d77fa7bfea2cf8a2d29b5f3d994b45a270443a51.tar.bz2 | |
Merge "Attempt to fix the GPL build"
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/CanvasTexture.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/CanvasTexture.h b/Source/WebCore/platform/graphics/android/CanvasTexture.h index 5e54c77..8850705 100644 --- a/Source/WebCore/platform/graphics/android/CanvasTexture.h +++ b/Source/WebCore/platform/graphics/android/CanvasTexture.h @@ -31,8 +31,7 @@ #include "CanvasLayer.h" #include <wtf/RefPtr.h> -#include <utils/Mutex.h> -#include <utils/StrongPointer.h> +#include <utils/threads.h> namespace android { class SurfaceTexture; |