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

2 files changed, 0 insertions, 10 deletions

diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.cpp b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
index 3b6a0b2..9103eff 100644
--- a/Source/WebCore/loader/cache/CachedResourceLoader.cpp
+++ b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
@@ -85,13 +85,9 @@ CachedResourceLoader::CachedResourceLoader(Document* document)
     , m_autoLoadImages(true)
     , m_loadFinishing(false)
     , m_allowStaleResources(false)
-<<<<<<< HEAD
 #ifdef ANDROID_BLOCK_NETWORK_IMAGE
     , m_blockNetworkImage(false)
 #endif
-    , m_isInMethod(0)
-=======
->>>>>>> webkit.org at r82507
 {
 }
 
diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.h b/Source/WebCore/loader/cache/CachedResourceLoader.h
index a68ebd3..881ad2f 100644
--- a/Source/WebCore/loader/cache/CachedResourceLoader.h
+++ b/Source/WebCore/loader/cache/CachedResourceLoader.h
@@ -153,15 +153,9 @@ private:
     bool m_autoLoadImages : 1;
     bool m_loadFinishing : 1;
     bool m_allowStaleResources : 1;
-<<<<<<< HEAD
 #ifdef ANDROID_BLOCK_NETWORK_IMAGE
     bool m_blockNetworkImage : 1;
 #endif
-    
-    // FIME: For debugging, remove.
-    unsigned m_isInMethod;
-=======
->>>>>>> webkit.org at r82507
 };
 
 }