Merge WebKit at r74534: Fix conflicts.

.gitignore - keep ours
Android.mk http://trac.webkit.org/changeset/74431
Parser.cpp http://trac.webkit.org/changeset/74377
ImageDecoder.cpp http://trac.webkit.org/changeset/73819
GraphicsContext.cpp http://trac.webkit.org/changeset/73729
ContextMenuItem.h http://trac.webkit.org/changeset/74028
SVGFontFaceUriElement.h http://trac.webkit.org/changeset/74493
RenderView.h http://trac.webkit.org/changeset/74524
RenderSVGResourceSolidColor.cpp http://trac.webkit.org/changeset/72926
InlineTextBox.cpp http://trac.webkit.org/changeset/73548

SliderThumbElement.cpp
RenderSlider.cpp http://trac.webkit.org/changeset/74044

StyleRareInheritedData.cpp|h
CSSStyleSelector.cpp
CSSParser.cpp http://trac.webkit.org/changeset/73219

RenderBox.h http://trac.webkit.org/changeset/73385
FrameLoader.cpp http://trac.webkit.org/changeset/73486 http://trac.webkit.org/changeset/74426
ResourceLoader.cpp http://trac.webkit.org/changeset/74453
DOMWindow.cpp|h http://trac.webkit.org/changeset/73829
HTMLLinkElement.cpp http://trac.webkit.org/changeset/74476
V8NPUtils.cpp: Do not undo http://trac.webkit.org/changeset/78994
RenderSVGResourceSolidColor.cpp http://trac.webkit.org/changeset/72926
Remove loader.cpp http://trac.webkit.org/changeset/74049

Change-Id: I8e97de5b2237d85310e1005e067f0b3a6b14432f

7 files changed, 10 insertions, 170 deletions

diff --git a/WebCore/rendering/InlineTextBox.cpp b/WebCore/rendering/InlineTextBox.cpp
index 73107a8..e357e82 100644
--- a/WebCore/rendering/InlineTextBox.cpp
+++ b/WebCore/rendering/InlineTextBox.cpp
@@ -1203,12 +1203,8 @@ int InlineTextBox::offsetForPosition(int lineOffset, bool includePartialGlyphs)
     return f->offsetForPosition(textRun, lineOffset - logicalLeft(), includePartialGlyphs);
 #else
     return f->offsetForPosition(TextRun(textRenderer()->text()->characters() + m_start, m_len, textRenderer()->allowTabs(), textPos(), m_toAdd, !isLeftToRightDirection(), m_dirOverride || style->visuallyOrdered()),
-<<<<<<< HEAD
-                                lineOffset - logicalLeft(), includePartialGlyphs);
-#endif
-=======
         lineOffset - logicalLeft(), includePartialGlyphs);
->>>>>>> webkit.org at r74534 (trunk)
+#endif
 }
 
 int InlineTextBox::positionForOffset(int offset) const
diff --git a/WebCore/rendering/RenderBox.h b/WebCore/rendering/RenderBox.h
index 3dd7c23..53a4cfe 100644
--- a/WebCore/rendering/RenderBox.h
+++ b/WebCore/rendering/RenderBox.h
@@ -380,16 +380,14 @@ public:
     void flipForWritingMode(IntRect&) const;
     IntSize locationOffsetIncludingFlipping() const;
 
-<<<<<<< HEAD
-#ifdef ANDROID_LAYOUT
-    int getVisibleWidth() const { return m_visibleWidth; }
-#endif
-=======
     IntRect logicalVisualOverflowRectForPropagation(RenderStyle*) const;
     IntRect visualOverflowRectForPropagation(RenderStyle*) const;
     IntRect logicalLayoutOverflowRectForPropagation(RenderStyle*) const;
     IntRect layoutOverflowRectForPropagation(RenderStyle*) const;
->>>>>>> webkit.org at r74534 (trunk)
+
+#ifdef ANDROID_LAYOUT
+    int getVisibleWidth() const { return m_visibleWidth; }
+#endif
 
 protected:
     virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle);
diff --git a/WebCore/rendering/RenderSVGResourceSolidColor.cpp b/WebCore/rendering/RenderSVGResourceSolidColor.cpp
index 105723f..9fbda40 100644
--- a/WebCore/rendering/RenderSVGResourceSolidColor.cpp
+++ b/WebCore/rendering/RenderSVGResourceSolidColor.cpp
@@ -86,20 +86,6 @@ void RenderSVGResourceSolidColor::postApplyResource(RenderObject*, GraphicsConte
         else if (resourceMode & ApplyToStrokeMode)
             context->strokePath(*path);
     }
-<<<<<<< HEAD
-
-#if PLATFORM(SKIA) && !PLATFORM(ANDROID)
-    // FIXME: Move this into the GraphicsContext
-    // WebKit implicitly expects us to reset the path.
-    // For example in fillAndStrokePath() of RenderSVGPath.cpp the path is
-    // added back to the context after filling. This is because internally it
-    // calls CGContextFillPath() which closes the path.
-    context->beginPath();
-    context->platformContext()->setFillShader(0);
-    context->platformContext()->setStrokeShader(0);
-#endif
-=======
->>>>>>> webkit.org at r74534 (trunk)
 }
 
 }
diff --git a/WebCore/rendering/RenderSlider.cpp b/WebCore/rendering/RenderSlider.cpp
index cf8c29b..b73a1ac 100644
--- a/WebCore/rendering/RenderSlider.cpp
+++ b/WebCore/rendering/RenderSlider.cpp
@@ -40,14 +40,6 @@
 #include "StepRange.h"
 #include <wtf/MathExtras.h>
 
-#ifdef ANDROID_LAYOUT
-#include "Settings.h"
-#endif
-
-#if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS)
-#include "TouchEvent.h"
-#endif
-
 using std::min;
 
 namespace WebCore {
@@ -61,130 +53,6 @@ static double sliderPosition(HTMLInputElement* element)
     return range.proportionFromValue(range.valueFromElement(element));
 }
 
-<<<<<<< HEAD
-class SliderThumbElement : public ShadowBlockElement {
-public:
-    static PassRefPtr<SliderThumbElement> create(HTMLElement* shadowParent);
-
-    bool inDragMode() const { return m_inDragMode; }
-
-    virtual void defaultEventHandler(Event*);
-    virtual void detach();
-
-private:        
-    SliderThumbElement(HTMLElement* shadowParent);
-
-    FloatPoint m_offsetToThumb;
-    bool m_inDragMode;
-};
-
-inline SliderThumbElement::SliderThumbElement(HTMLElement* shadowParent)
-    : ShadowBlockElement(shadowParent)
-    , m_inDragMode(false)
-{
-}
-
-inline PassRefPtr<SliderThumbElement> SliderThumbElement::create(HTMLElement* shadowParent)
-{
-    return adoptRef(new SliderThumbElement(shadowParent));
-}
-
-void SliderThumbElement::defaultEventHandler(Event* event)
-{
-    if (!event->isMouseEvent()
-#if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS)
-        && !event->isTouchEvent()
-#endif
-        ) {
-        ShadowBlockElement::defaultEventHandler(event);
-        return;
-    }
-
-    MouseEvent* mouseEvent = static_cast<MouseEvent*>(event);
-    bool isLeftButton = mouseEvent->button() == LeftButton;
-    const AtomicString& eventType = event->type();
-
-    if (eventType == eventNames().mousedownEvent && isLeftButton
-#if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS)
-        || eventType == eventNames().touchstartEvent
-#endif
-        ) {
-        if (document()->frame() && renderer()) {
-            RenderSlider* slider = toRenderSlider(renderer()->parent());
-            if (slider) {
-                if (slider->mouseEventIsInThumb(mouseEvent)) {
-                    // We selected the thumb, we want the cursor to always stay at
-                    // the same position relative to the thumb.
-                    m_offsetToThumb = slider->mouseEventOffsetToThumb(mouseEvent);
-                } else {
-                    // We are outside the thumb, move the thumb to the point were
-                    // we clicked. We'll be exactly at the center of the thumb.
-                    m_offsetToThumb.setX(0);
-                    m_offsetToThumb.setY(0);
-                }
-
-                m_inDragMode = true;
-                document()->frame()->eventHandler()->setCapturingMouseEventsNode(shadowParent());
-                event->setDefaultHandled();
-                return;
-            }
-        }
-    } else if (eventType == eventNames().mouseupEvent && isLeftButton
-#if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS)
-               || eventType == eventNames().touchendEvent
-#endif
-               ) {
-        if (m_inDragMode) {
-            if (Frame* frame = document()->frame())
-                frame->eventHandler()->setCapturingMouseEventsNode(0);      
-            m_inDragMode = false;
-            event->setDefaultHandled();
-            return;
-        }
-    } else if (eventType == eventNames().mousemoveEvent
-#if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS)
-               || eventType == eventNames().touchmoveEvent
-#endif
-               ) {
-        if (m_inDragMode && renderer() && renderer()->parent()) {
-            RenderSlider* slider = toRenderSlider(renderer()->parent());
-            if (slider) {
-                FloatPoint curPoint = slider->absoluteToLocal(mouseEvent->absoluteLocation(), false, true);
-#if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS)
-                // Update the position when it is a touch event
-                if (event->isTouchEvent()) {
-                    TouchEvent* touchEvent = static_cast<TouchEvent*>(event);
-                    if (touchEvent && touchEvent->touches() && touchEvent->touches()->item(0)) {
-                        curPoint.setX(touchEvent->touches()->item(0)->pageX());
-                        curPoint.setY(touchEvent->touches()->item(0)->pageY());
-                        curPoint = slider->absoluteToLocal(curPoint, false, true);
-                    }
-                }
-                // Tell the webview that webkit will handle the following move events
-                event->setDefaultPrevented(true);
-#endif
-                IntPoint eventOffset(curPoint.x() + m_offsetToThumb.x(), curPoint.y() + m_offsetToThumb.y());
-                slider->setValueForPosition(slider->positionForOffset(eventOffset));
-                event->setDefaultHandled();
-                return;
-            }
-        }
-    }
-
-    ShadowBlockElement::defaultEventHandler(event);
-}
-
-void SliderThumbElement::detach()
-{
-    if (m_inDragMode) {
-        if (Frame* frame = document()->frame())
-            frame->eventHandler()->setCapturingMouseEventsNode(0);      
-    }
-    ShadowBlockElement::detach();
-}
-
-=======
->>>>>>> webkit.org at r74534 (trunk)
 RenderSlider::RenderSlider(HTMLInputElement* element)
     : RenderBlock(element)
 {
diff --git a/WebCore/rendering/RenderView.h b/WebCore/rendering/RenderView.h
index dc81b63..2915998 100644
--- a/WebCore/rendering/RenderView.h
+++ b/WebCore/rendering/RenderView.h
@@ -97,14 +97,11 @@ public:
     void updateWidgetPositions();
     void addWidget(RenderWidget*);
     void removeWidget(RenderWidget*);
-<<<<<<< HEAD
+    
+    void notifyWidgets(WidgetNotification);
 #ifdef ANDROID_PLUGINS
     const HashSet<RenderWidget*>& widgets() const { return m_widgets; }
 #endif
-=======
-    
-    void notifyWidgets(WidgetNotification);
->>>>>>> webkit.org at r74534 (trunk)
 
     // layoutDelta is used transiently during layout to store how far an object has moved from its
     // last layout location, in order to repaint correctly.
diff --git a/WebCore/rendering/style/StyleRareInheritedData.cpp b/WebCore/rendering/style/StyleRareInheritedData.cpp
index 1fdf0b2..6138df2 100644
--- a/WebCore/rendering/style/StyleRareInheritedData.cpp
+++ b/WebCore/rendering/style/StyleRareInheritedData.cpp
@@ -71,7 +71,7 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
     , textStrokeColor(o.textStrokeColor)
     , textStrokeWidth(o.textStrokeWidth)
     , textFillColor(o.textFillColor)
-<<<<<<< HEAD
+    , textEmphasisColor(o.textEmphasisColor)
 #ifdef ANDROID_CSS_RING
     , ringFillColor(o.ringFillColor)
     , ringInnerWidth(o.ringInnerWidth)
@@ -86,9 +86,6 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
 #ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR
     , tapHighlightColor(o.tapHighlightColor)
 #endif
-=======
-    , textEmphasisColor(o.textEmphasisColor)
->>>>>>> webkit.org at r74534 (trunk)
     , textShadow(o.textShadow ? new ShadowData(*o.textShadow) : 0)
     , highlight(o.highlight)
     , cursorData(o.cursorData)
diff --git a/WebCore/rendering/style/StyleRareInheritedData.h b/WebCore/rendering/style/StyleRareInheritedData.h
index e488909..a370934 100644
--- a/WebCore/rendering/style/StyleRareInheritedData.h
+++ b/WebCore/rendering/style/StyleRareInheritedData.h
@@ -55,7 +55,8 @@ public:
     Color textStrokeColor;
     float textStrokeWidth;
     Color textFillColor;
-<<<<<<< HEAD
+    Color textEmphasisColor;
+
 #ifdef ANDROID_CSS_RING
     Color ringFillColor;
     Length ringInnerWidth;
@@ -70,9 +71,6 @@ public:
 #ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR
     Color tapHighlightColor;
 #endif
-=======
-    Color textEmphasisColor;
->>>>>>> webkit.org at r74534 (trunk)
 
     ShadowData* textShadow; // Our text shadow information for shadowed text drawing.
     AtomicString highlight; // Apple-specific extension for custom highlight rendering.