diff options
Diffstat (limited to 'Source/WebCore/platform')
-rw-r--r-- | Source/WebCore/platform/graphics/MediaPlayer.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Source/WebCore/platform/graphics/MediaPlayer.h b/Source/WebCore/platform/graphics/MediaPlayer.h index 5872c88..ff304ea 100644 --- a/Source/WebCore/platform/graphics/MediaPlayer.h +++ b/Source/WebCore/platform/graphics/MediaPlayer.h @@ -182,16 +182,12 @@ public: IntSize naturalSize(); bool hasVideo() const; bool hasAudio() const; -<<<<<<< HEAD #if PLATFORM(ANDROID) enum MediaElementType { Video, Audio }; void setMediaElementType(MediaElementType type) { m_mediaElementType = type; } MediaElementType mediaElementType() { return m_mediaElementType; } #endif - -======= ->>>>>>> webkit.org at r82507 void setFrameView(FrameView* frameView) { m_frameView = frameView; } FrameView* frameView() { return m_frameView; } bool inMediaDocument(); |