Merge WebKit at r64523 : Fix conflicts due to ANDROID_HITTEST_WITHSIZE

A modified version of this Android-specific code was upstreamed in
http://trac.webkit.org/changeset/64272

For the most part, the differences between the Android and upstreamed
versions are syntactic only. In these cases, we take the upstream
version.

In a small number of cases, logical changes exist. In these cases, the
Android logic has been retained, guarded with ANDROID_HITTEST_WITHSIZE,
but using the new syntax.

In particular ...
- Android's HitTestResult::intersects(x, y, rect) is logically equivalent
  to the uspstream IntRect::intersects(HitTestPoint::rectFromPoint(x, y))).
- Android's HitTestResult::addRawNode() is logically equivalent to the
  upstream HitTestResult::m_rectBasedTestResult.add().
- Android's HitTestResult::isRegionTest() is slightly different from the
  upstream HitTestResult::isRectBasedTest(). The latter is modified with
  a new ANDROID_HITTEST_WITHSIZE guard in HitTestResult::HitTestResult()
  to maintain the same behaviour.
- The upstreamed code uses
  HitTestResult::addNodeToRectBasedTestResult() as a helper method in
  place of inline logic in the Android version. The slight difference
  in behaviour between this helper and the Android logic is reflected in
  the new ANDROID_HITTEST_WITHSIZE guard in the helper.

This change should introduce no change in behaviour.

Change-Id: I974d68e3ac963f18334418e32b08c3fd9ab1182e

0 files changed, 0 insertions, 0 deletions