diff options
| author | Russell Brenner <russellbrenner@google.com> | 2010-11-19 09:57:40 -0800 |
|---|---|---|
| committer | Russell Brenner <russellbrenner@google.com> | 2010-12-02 13:47:21 -0800 |
| commit | 1dc835977a4eb41ef79490200c176352bae43cc1 (patch) | |
| tree | 5fb80efa49b8492d1d4d3f4b1eae329c085626ee /WebCore/platform | |
| parent | 6b70adc33054f8aee8c54d0f460458a9df11b8a5 (diff) | |
| download | external_webkit-1dc835977a4eb41ef79490200c176352bae43cc1.zip external_webkit-1dc835977a4eb41ef79490200c176352bae43cc1.tar.gz external_webkit-1dc835977a4eb41ef79490200c176352bae43cc1.tar.bz2 | |
Merge WebKit at r72272: Fix conflicts.
WebCore/Android.v8bindings.mk
http://trac.webkit.org/changeset/71802
WebCore/bindings/v8/V8Proxy.cpp
http://trac.webkit.org/changeset/71735
WebCore/css/CSSParser.cpp
http://trac.webkit.org/changeset/71767
http://trac.webkit.org/changeset/72116 (several APIs purged)
WebCore/loader/ResourceLoader.cpp
http://trac.webkit.org/changeset/71884
WebCore/platform/graphics/MediaPlayer.cpp
http://trac.webkit.org/changeset/72117
WebCore/platform/image-decoders/ImageDecoder.cpp
http://trac.webkit.org/changeset/72130
WebCore/rendering/RenderBlockLineLayout.cpp
http://trac.webkit.org/changeset/72235
WebCore/rendering/RenderView.cpp
http://trac.webkit.org/changeset/71851
Change-Id: If0a3466754b9755c1f4be97bf589f88c48eece0a
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. |