diff options
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/graphics/MediaPlayer.cpp | 4 | ||||
| -rw-r--r-- | WebCore/platform/image-decoders/ImageDecoder.cpp | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/WebCore/platform/graphics/MediaPlayer.cpp b/WebCore/platform/graphics/MediaPlayer.cpp index 83e84d9..dc743bf 100644 --- a/WebCore/platform/graphics/MediaPlayer.cpp +++ b/WebCore/platform/graphics/MediaPlayer.cpp @@ -64,12 +64,10 @@ #endif #elif PLATFORM(CHROMIUM) #include "MediaPlayerPrivateChromium.h" -<<<<<<< HEAD +#define PlatformMediaEngineClassName MediaPlayerPrivate #elif PLATFORM(ANDROID) #include "MediaPlayerPrivateAndroid.h" -======= #define PlatformMediaEngineClassName MediaPlayerPrivate ->>>>>>> webkit.org at r72274 #endif namespace WebCore { diff --git a/WebCore/platform/image-decoders/ImageDecoder.cpp b/WebCore/platform/image-decoders/ImageDecoder.cpp index a9d5131..49c2a61 100644 --- a/WebCore/platform/image-decoders/ImageDecoder.cpp +++ b/WebCore/platform/image-decoders/ImageDecoder.cpp @@ -53,15 +53,11 @@ static unsigned copyFromSharedBuffer(char* buffer, unsigned bufferLength, const return bytesExtracted; } -<<<<<<< HEAD #if !OS(ANDROID) // This method requires BMPImageDecoder, PNGImageDecoder, ICOImageDecoder and // JPEGDecoder, which aren't used on Android, and which don't all compile. // TODO: Find a better fix. -ImageDecoder* ImageDecoder::create(const SharedBuffer& data, bool premultiplyAlpha) -======= ImageDecoder* ImageDecoder::create(const SharedBuffer& data, bool premultiplyAlpha, bool ignoreGammaAndColorProfile) ->>>>>>> webkit.org at r72274 { // We need at least 4 bytes to figure out what kind of image we're dealing // with. |