Merge WebKit at r60074: Fix conflicts

DeviceOrientation
- WebCore/Android.derived.jscbindings.mk
- WebCore/Android.derived.v8bindings.mk
- WebCore/page/Page.cpp

Trivial
- WebCore/css/CSSParser.cpp
- WebCore/page/Settings.cpp
- WebCore/page/Settings.h
- WebCore/rendering/style/RenderStyle.h

Code deletion - See http://trac.webkit.org/changeset/59749
- WebCore/html/HTMLTokenizer.cpp

PluginView JSC guards uspstreaming
- WebCore/plugins/PluginView.cpp
- WebCore/plugins/PluginView.h

Refactoring, see http://trac.webkit.org/changeset/59784
- WebCore/rendering/RenderLayer.cpp

RenderBlock::columnGap() and columnRects() are now public, see http://trac.webkit.org/changeset/59784
- WebCore/rendering/RenderBlock.h

Change-Id: I409c68d334d60c3854b4b0365c18e6f63884afa6

3 files changed, 2 insertions, 12 deletions

diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp
index 1988040..ae7c9ad 100644
--- a/WebCore/page/Page.cpp
+++ b/WebCore/page/Page.cpp
@@ -113,7 +113,6 @@ static void networkStateChanged()
         frames[i]->document()->dispatchWindowEvent(Event::create(eventName, false, false));
 }
 
-<<<<<<< HEAD
 #if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
 static void onPackageResultAvailable()
 {
@@ -125,10 +124,7 @@ static void onPackageResultAvailable()
 }
 #endif
 
-Page::Page(ChromeClient* chromeClient, ContextMenuClient* contextMenuClient, EditorClient* editorClient, DragClient* dragClient, InspectorClient* inspectorClient, PluginHalterClient* pluginHalterClient, GeolocationControllerClient* geolocationControllerClient)
-=======
 Page::Page(ChromeClient* chromeClient, ContextMenuClient* contextMenuClient, EditorClient* editorClient, DragClient* dragClient, InspectorClient* inspectorClient, PluginHalterClient* pluginHalterClient, GeolocationControllerClient* geolocationControllerClient, DeviceOrientationClient* deviceOrientationClient)
->>>>>>> webkit.org at r60074
     : m_chrome(new Chrome(this, chromeClient))
     , m_dragCaretController(new SelectionController(0, true))
 #if ENABLE(DRAG_SUPPORT)
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp
index 883875b..268d8ae 100644
--- a/WebCore/page/Settings.cpp
+++ b/WebCore/page/Settings.cpp
@@ -144,13 +144,10 @@ Settings::Settings(Page* page)
     , m_webGLEnabled(false)
     , m_loadDeferringEnabled(true)
     , m_tiledBackingStoreEnabled(false)
-<<<<<<< HEAD
+    , m_html5ParserEnabled(false)
 #ifdef ANDROID_PLUGINS
     , m_pluginsOnDemand(false)
 #endif
-=======
-    , m_html5ParserEnabled(false)
->>>>>>> webkit.org at r60074
 {
     // A Frame may not have been created yet, so we initialize the AtomicString 
     // hash before trying to use it.
diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h
index 9b76517..2f9637b 100644
--- a/WebCore/page/Settings.h
+++ b/WebCore/page/Settings.h
@@ -493,13 +493,10 @@ namespace WebCore {
         bool m_webGLEnabled : 1;
         bool m_loadDeferringEnabled : 1;
         bool m_tiledBackingStoreEnabled : 1;
-<<<<<<< HEAD
+        bool m_html5ParserEnabled: 1;
 #ifdef ANDROID_PLUGINS
         bool m_pluginsOnDemand : 1;
 #endif
-=======
-        bool m_html5ParserEnabled: 1;
->>>>>>> webkit.org at r60074
 
 #if USE(SAFARI_THEME)
         static bool gShouldPaintNativeControls;