diff options
| author | Steve Block <steveblock@google.com> | 2009-10-11 23:16:05 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:45:09 +0100 |
| commit | d1368d759438630fc877114bcab860030748cfee (patch) | |
| tree | 24aa45ad20fcee20e398f5453df8fce06be8c49d | |
| parent | 86cfdd09c85781ba25861c20984629b3b5fefa0d (diff) | |
| download | external_webkit-d1368d759438630fc877114bcab860030748cfee.zip external_webkit-d1368d759438630fc877114bcab860030748cfee.tar.gz external_webkit-d1368d759438630fc877114bcab860030748cfee.tar.bz2 | |
Merge webkit.org at R49305 : Remove new file ImageSource.cpp from build.
This file was added in http://trac.webkit.org/changeset/47073 to contain common ImageSource code.
We should refactor Android's ImageSource implementation to make use of this.
Change-Id: Ic9cde960ca96be697983d6b475156b592d82cfaa
| -rw-r--r-- | WebCore/Android.mk | 1 | ||||
| -rw-r--r-- | WebCore/Android.v8.mk | 1 | ||||
| -rw-r--r-- | WebCore/platform/graphics/android/ImageSourceAndroid.cpp | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/Android.mk b/WebCore/Android.mk index bb83f10..52fba89 100644 --- a/WebCore/Android.mk +++ b/WebCore/Android.mk @@ -710,7 +710,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ platform/graphics/GraphicsLayer.cpp \ platform/graphics/GraphicsTypes.cpp \ platform/graphics/Image.cpp \ - platform/graphics/ImageSource.cpp \ platform/graphics/IntRect.cpp \ platform/graphics/MediaPlayer.cpp \ platform/graphics/Path.cpp \ diff --git a/WebCore/Android.v8.mk b/WebCore/Android.v8.mk index e46d7e6..e85cae8 100644 --- a/WebCore/Android.v8.mk +++ b/WebCore/Android.v8.mk @@ -518,7 +518,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ platform/graphics/GraphicsLayer.cpp \ platform/graphics/GraphicsTypes.cpp \ platform/graphics/Image.cpp \ - platform/graphics/ImageSource.cpp \ platform/graphics/IntRect.cpp \ platform/graphics/MediaPlayer.cpp \ platform/graphics/Path.cpp \ diff --git a/WebCore/platform/graphics/android/ImageSourceAndroid.cpp b/WebCore/platform/graphics/android/ImageSourceAndroid.cpp index 5c75a15..fc3b098 100644 --- a/WebCore/platform/graphics/android/ImageSourceAndroid.cpp +++ b/WebCore/platform/graphics/android/ImageSourceAndroid.cpp @@ -44,6 +44,8 @@ using namespace android; #endif +// TODO: We should make use of some of the common code in platform/graphics/ImageSource.cpp. + SkPixelRef* SkCreateRLEPixelRef(const SkBitmap& src); //#define TRACE_SUBSAMPLE_BITMAPS |