Merge WebKit at r82507: Fix conflicts

- RenderLayerBacking.cpp
  Due to ANDROID_OVERFLOW_SCROLL
  http://trac.webkit.org/changeset/81715

- Document.cpp
  Due to domTreeVersion and ANDROID_STYLE_VERSION
  http://trac.webkit.org/changeset/80797

- CachedResourceLoader.cpp
  Due to temporary debugging and ANDROID_BLOCK_NETWORK_IMAGE
  http://trac.webkit.org/changeset/80695

- Settings.cpp/h
  http://trac.webkit.org/changeset/81289
  http://trac.webkit.org/changeset/81635

- MediaPlayer.cpp
  Whitespace only
  http://trac.webkit.org/changeset/80874

- RenderBox.cpp
  Due to isHorizontalWritingMode
  http://trac.webkit.org/changeset/81716

- RenderLayer.cpp/h
  Due to ANDROID_OVERFLOW_SCROLL
  http://trac.webkit.org/changeset/81981

- CSSStyleSelector.cpp
  Due to ANDROID_CSS_RING
  http://trac.webkit.org/changeset/80582
  http://trac.webkit.org/changeset/80993
  http://trac.webkit.org/changeset/80998
  http://trac.webkit.org/changeset/81684
  http://trac.webkit.org/changeset/82378

- CSSParser.cpp
  Due to ANDROID_CSS_RING
  http://trac.webkit.org/changeset/80582
  http://trac.webkit.org/changeset/81684

- StyleElement.cpp
  Due to cherry pick of http://trac.webkit.org/changeset/80787
  http://trac.webkit.org/changeset/82054

- EventHandler.cpp
  Due to ANDROID_PLUGINS
  http://trac.webkit.org/changeset/81618
  http://trac.webkit.org/changeset/81835

- SliderThumbElement.cpp
  Due to touch events
  http://trac.webkit.org/changeset/81216

- MediaControls.cpp
  Due to touch events
  http://trac.webkit.org/changeset/80857
  Note that the WebKit history for this file is confusing as it was
  renamed in http://trac.webkit.org/changeset/83545 and then re-added in
  http://trac.webkit.org/changeset/84222 but trac is not smart enough to
  track history backwards from http://trac.webkit.org/changeset/84222.

Change-Id: Ie1f80e09ae7c3befa7a18773cf846ff130e4354e

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();