Merge WebKit at r75993: Fix conflicts.

StyleElement.cpp
Do not undo cherry pick of http://trac.webkit.org/changeset/80787
Conflict due to intermediate change
http://trac.webkit.org/changeset/75338

SliderThumbElement.cpp
Conflict due to Android TOUCH_EVENTS addition and
http://trac.webkit.org/changeset/75749

DOMWindow.cpp
Conflict due to clearDomStorage and
http://trac.webkit.org/changeset/75739

Page.cpp
Conflict due to Android APPLICATION_INSTALLED addition and
http://trac.webkit.org/changeset/75604

DragData.h
See http://trac.webkit.org/changeset/75523

RenderBox.cpp
Conflict due to PLATFORM_ANDROID addition and
http://trac.webkit.org/changeset/75837

.gitignore - keep ours

RenderSVGSolidColor.cpp
This file moved, so copy over our edits.

Change-Id: Ieeb1f0056987d718e3522cc7cd8097a90fc642fb

3 files changed, 5 insertions, 100 deletions

diff --git a/Source/WebCore/rendering/RenderBox.cpp b/Source/WebCore/rendering/RenderBox.cpp
index 93228e1..e218d85 100644
--- a/Source/WebCore/rendering/RenderBox.cpp
+++ b/Source/WebCore/rendering/RenderBox.cpp
@@ -39,13 +39,7 @@
 #include "FloatQuad.h"
 #include "Frame.h"
 #include "Page.h"
-<<<<<<< HEAD
-#if PLATFORM(ANDROID)
-#include "PlatformBridge.h"
-#endif
-=======
 #include "PaintInfo.h"
->>>>>>> WebKit.org @ r75993
 #include "RenderArena.h"
 #include "RenderFlexibleBox.h"
 #include "RenderInline.h"
@@ -64,6 +58,10 @@
 #include "WMLNames.h"
 #endif
 
+#if PLATFORM(ANDROID)
+#include "PlatformBridge.h"
+#endif
+
 using namespace std;
 
 namespace WebCore {
diff --git a/Source/WebCore/rendering/RenderSVGResourceSolidColor.cpp b/Source/WebCore/rendering/RenderSVGResourceSolidColor.cpp
deleted file mode 100644
index 9fbda40..0000000
--- a/Source/WebCore/rendering/RenderSVGResourceSolidColor.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) Research In Motion Limited 2010. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#include "config.h"
-
-#if ENABLE(SVG)
-#include "RenderSVGResourceSolidColor.h"
-
-#include "GraphicsContext.h"
-#include "RenderStyle.h"
-#include "SVGRenderSupport.h"
-
-#if PLATFORM(SKIA) && !PLATFORM(ANDROID)
-#include "PlatformContextSkia.h"
-#endif
-
-namespace WebCore {
-
-RenderSVGResourceType RenderSVGResourceSolidColor::s_resourceType = SolidColorResourceType;
-
-RenderSVGResourceSolidColor::RenderSVGResourceSolidColor()
-{
-}
-
-RenderSVGResourceSolidColor::~RenderSVGResourceSolidColor()
-{
-}
-
-bool RenderSVGResourceSolidColor::applyResource(RenderObject* object, RenderStyle* style, GraphicsContext*& context, unsigned short resourceMode)
-{
-    // We are NOT allowed to ASSERT(object) here, unlike all other resources.
-    // RenderSVGResourceSolidColor is the only resource which may be used from HTML, when rendering
-    // SVG Fonts for a HTML document. This will be indicated by a null RenderObject pointer.
-    ASSERT(context);
-    ASSERT(resourceMode != ApplyToDefaultMode);
-
-    const SVGRenderStyle* svgStyle = style ? style->svgStyle() : 0;
-    ColorSpace colorSpace = style ? style->colorSpace() : ColorSpaceDeviceRGB;
-
-    if (resourceMode & ApplyToFillMode) {
-        context->setAlpha(svgStyle ? svgStyle->fillOpacity() : 1.0f);
-        context->setFillColor(m_color, colorSpace);
-        context->setFillRule(svgStyle ? svgStyle->fillRule() : RULE_NONZERO);
-
-        if (resourceMode & ApplyToTextMode)
-            context->setTextDrawingMode(TextModeFill);
-    } else if (resourceMode & ApplyToStrokeMode) {
-        context->setAlpha(svgStyle ? svgStyle->strokeOpacity() : 1.0f);
-        context->setStrokeColor(m_color, colorSpace);
-
-        if (style)
-            SVGRenderSupport::applyStrokeStyleToContext(context, style, object);
-
-        if (resourceMode & ApplyToTextMode)
-            context->setTextDrawingMode(TextModeStroke);
-    }
-
-    return true;
-}
-
-void RenderSVGResourceSolidColor::postApplyResource(RenderObject*, GraphicsContext*& context, unsigned short resourceMode, const Path* path)
-{
-    ASSERT(context);
-    ASSERT(resourceMode != ApplyToDefaultMode);
-
-    if (path && !(resourceMode & ApplyToTextMode)) {
-        if (resourceMode & ApplyToFillMode)
-            context->fillPath(*path);
-        else if (resourceMode & ApplyToStrokeMode)
-            context->strokePath(*path);
-    }
-}
-
-}
-
-#endif
diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp b/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp
index 9f6c063..99ea763 100644
--- a/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp
+++ b/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp
@@ -26,7 +26,7 @@
 #include "RenderStyle.h"
 #include "SVGRenderSupport.h"
 
-#if PLATFORM(SKIA)
+#if PLATFORM(SKIA) && !PLATFORM(ANDROID)
 #include "PlatformContextSkia.h"
 #endif