Merge WebKit at r75315: Fix conflicts

- HTMLInputElement.cpp
  Conflict due to ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS
  See http://trac.webkit.org/changeset/74895

- HTMLInputElement.cpp and RangeInputType.cpp
  Conflict due to refactoring of event handling on input elements
  See http://trac.webkit.org/changeset/74549

- DOMWindow.cpp
  Conflict due to DOMWindow::clearDOMStorage()
  See http://trac.webkit.org/changeset/74800

- EventHandler.cpp
  Conflict due to longpress and doubletap vs touch event refactoring
  See http://trac.webkit.org/changeset/74553

- History.cpp
  Trivial conflict due to cherry-pick
  See http://trac.webkit.org/changeset/74853

- GraphicsContext.cpp
  Conflict due to PLATFORM(ANDROID) guard
  See http://trac.webkit.org/changeset/74662

- InlineTextBox.cpp
  Conflict due to ANDROID_DISABLE_ROUNDING_HACKS
  See http://trac.webkit.org/changeset/74971

Change-Id: I5c1abe54b9d78f667a41e83a871e9a21be0a89d5

1 files changed, 2 insertions, 7 deletions

diff --git a/Source/WebCore/rendering/InlineTextBox.cpp b/Source/WebCore/rendering/InlineTextBox.cpp
index 8884ed1..aa00b7f 100644
--- a/Source/WebCore/rendering/InlineTextBox.cpp
+++ b/Source/WebCore/rendering/InlineTextBox.cpp
@@ -1221,24 +1221,19 @@ int InlineTextBox::offsetForPosition(int lineOffset, bool includePartialGlyphs)
     RenderText* text = toRenderText(renderer());
     RenderStyle* style = text->style(m_firstLine);
     const Font* f = &style->font();
-<<<<<<< HEAD:WebCore/rendering/InlineTextBox.cpp
 #ifdef ANDROID_DISABLE_ROUNDING_HACKS
     TextRun textRun = TextRun(textRenderer()->text()->characters() + m_start, m_len, textRenderer()->allowTabs(), textPos(), m_toAdd, !isLeftToRightDirection(), m_dirOverride || style->visuallyOrdered());
     if (m_disableRoundingHacks)
         textRun.disableRoundingHacks();
-    return f->offsetForPosition(textRun, lineOffset - logicalLeft(), includePartialGlyphs);
+    int offset = 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()),
-        lineOffset - logicalLeft(), includePartialGlyphs);
-#endif
-=======
     int offset = f->offsetForPosition(TextRun(textRenderer()->text()->characters() + m_start, m_len,
         textRenderer()->allowTabs(), textPos(), m_toAdd, !isLeftToRightDirection(), m_dirOverride || style->visuallyOrdered()),
         lineOffset - logicalLeft(), includePartialGlyphs);
+#endif
     if (blockIsInOppositeDirection && (!offset || offset == m_len))
         return !offset ? m_len : 0;
     return offset;
->>>>>>> webkit.org at r75315:Source/WebCore/rendering/InlineTextBox.cpp
 }
 
 int InlineTextBox::positionForOffset(int offset) const