diff options
| author | Steve Block <steveblock@google.com> | 2009-12-17 13:32:53 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-01-05 14:29:48 +0000 |
| commit | f912b6f62505f60109e7300787c93111dbd70560 (patch) | |
| tree | 2432507bd57c2620b2e167f8368e548506c041f1 /WebCore/loader | |
| parent | 8c8c7b43f311d492d2c13ee68bc91875262ae072 (diff) | |
| download | external_webkit-f912b6f62505f60109e7300787c93111dbd70560.zip external_webkit-f912b6f62505f60109e7300787c93111dbd70560.tar.gz external_webkit-f912b6f62505f60109e7300787c93111dbd70560.tar.bz2 | |
Defines PLATFORM(SKIA), instead of PLATFROM(SGL) for Android.
Skia is used by Chromium, which defines PLATFORM(SKIA).
Android also uses Skia, but currently defines PLATFORM(SGL) to account for
platform-specific differences between Android and Chromum.
We now use PLATFORM(SKIA) on Android and remove PLATFORM(SGL).
Platform-specific differences are achieved with PLATFORM(ANDROID) guards.
This reduces our diff with webkit.org.
Change-Id: Ibf920b1929e7c3cdabb025ae61ceae3df67258bb
Diffstat (limited to 'WebCore/loader')
| -rw-r--r-- | WebCore/loader/CachedImage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/loader/CachedImage.cpp b/WebCore/loader/CachedImage.cpp index a91f126..780d7ee 100644 --- a/WebCore/loader/CachedImage.cpp +++ b/WebCore/loader/CachedImage.cpp @@ -252,7 +252,7 @@ inline void CachedImage::createImage() } #endif m_image = BitmapImage::create(this); -#if PLATFORM(SGL) +#if PLATFORM(ANDROID) m_image->setURL(url()); #endif } |