diff options
author | Steve Block <steveblock@google.com> | 2010-02-02 18:46:10 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2010-02-04 22:46:59 +0000 |
commit | 9c4df4389f9d998ce8b59b1665a018b69a2eb865 (patch) | |
tree | 938ee942cded36361be8f4a3e257dd9649472784 /WebCore/platform/graphics/android/ImageSourceAndroid.cpp | |
parent | 77dd3843724f8ca0ae8084012c79af6ffbaef528 (diff) | |
download | external_webkit-9c4df4389f9d998ce8b59b1665a018b69a2eb865.zip external_webkit-9c4df4389f9d998ce8b59b1665a018b69a2eb865.tar.gz external_webkit-9c4df4389f9d998ce8b59b1665a018b69a2eb865.tar.bz2 |
Merge webkit.org at r54127 : GIFImageDecoder now requires ImageDecoder.
ImageDecoder requires numerous additional include paths.
Change-Id: I047d36db7b5f28e7602f55eeeedc04beb713c079
Diffstat (limited to 'WebCore/platform/graphics/android/ImageSourceAndroid.cpp')
-rw-r--r-- | WebCore/platform/graphics/android/ImageSourceAndroid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/ImageSourceAndroid.cpp b/WebCore/platform/graphics/android/ImageSourceAndroid.cpp index ba65e92..c486a6a 100644 --- a/WebCore/platform/graphics/android/ImageSourceAndroid.cpp +++ b/WebCore/platform/graphics/android/ImageSourceAndroid.cpp @@ -45,7 +45,7 @@ #ifdef ANDROID_ANIMATED_GIF #include "EmojiFont.h" - #include "gif/GIFImageDecoder.h" + #include "GIFImageDecoder.h" using namespace android; #endif |