diff options
Diffstat (limited to 'WebCore/platform/graphics')
| -rw-r--r-- | WebCore/platform/graphics/MediaPlayer.cpp | 4 |
1 files changed, 1 insertions, 3 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 { |