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

3 files changed, 8 insertions, 15 deletions

diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp
index f05e8b2..de59083 100644
--- a/Source/WebCore/page/EventHandler.cpp
+++ b/Source/WebCore/page/EventHandler.cpp
@@ -98,13 +98,12 @@
 #include "TouchEvent.h"
 #endif
 
-<<<<<<< HEAD
-#if defined(ANDROID_PLUGINS)
-#include "WebViewCore.h"
-=======
 #if ENABLE(GESTURE_RECOGNIZER)
 #include "PlatformGestureRecognizer.h"
->>>>>>> webkit.org at r82507
+#endif
+
+#if defined(ANDROID_PLUGINS)
+#include "WebViewCore.h"
 #endif
 
 namespace WebCore {
diff --git a/Source/WebCore/page/Settings.cpp b/Source/WebCore/page/Settings.cpp
index eb8c903..5cf20d6 100644
--- a/Source/WebCore/page/Settings.cpp
+++ b/Source/WebCore/page/Settings.cpp
@@ -173,7 +173,8 @@ Settings::Settings(Page* page)
     , m_usePreHTML5ParserQuirks(false)
     , m_hyperlinkAuditingEnabled(false)
     , m_crossOriginCheckInGetMatchedCSSRulesDisabled(false)
-<<<<<<< HEAD
+    , m_useQuickLookResourceCachingQuirks(false)
+    , m_forceCompositingMode(false)
 #ifdef ANDROID_LAYOUT
     , m_useWideViewport(false)
 #endif
@@ -189,10 +190,6 @@ Settings::Settings(Page* page)
 #ifdef ANDROID_PLUGINS
     , m_pluginsOnDemand(false)
 #endif
-=======
-    , m_useQuickLookResourceCachingQuirks(false)
-    , m_forceCompositingMode(false)
->>>>>>> webkit.org at r82507
 {
     // A Frame may not have been created yet, so we initialize the AtomicString 
     // hash before trying to use it.
diff --git a/Source/WebCore/page/Settings.h b/Source/WebCore/page/Settings.h
index e8e791a..35446c5 100644
--- a/Source/WebCore/page/Settings.h
+++ b/Source/WebCore/page/Settings.h
@@ -575,7 +575,8 @@ namespace WebCore {
         bool m_usePreHTML5ParserQuirks: 1;
         bool m_hyperlinkAuditingEnabled : 1;
         bool m_crossOriginCheckInGetMatchedCSSRulesDisabled : 1;
-<<<<<<< HEAD
+        bool m_useQuickLookResourceCachingQuirks : 1;
+        bool m_forceCompositingMode : 1;
 #ifdef ANDROID_META_SUPPORT
         // default is yes
         bool m_viewport_user_scalable : 1;
@@ -605,10 +606,6 @@ namespace WebCore {
 #ifdef ANDROID_PLUGINS
         bool m_pluginsOnDemand : 1;
 #endif
-=======
-        bool m_useQuickLookResourceCachingQuirks : 1;
-        bool m_forceCompositingMode : 1;
->>>>>>> webkit.org at r82507
 
 #if USE(SAFARI_THEME)
         static bool gShouldPaintNativeControls;