diff options
author | Steve Block <steveblock@google.com> | 2010-08-12 12:11:09 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2010-08-27 12:08:54 +0100 |
commit | 08c1068d9fd18289b9812c3d1fbcfccb8dfa3e60 (patch) | |
tree | 469af86f91a7ff00b9a9294b825f79ba7cea824d /WebCore/rendering/RenderLineBoxList.cpp | |
parent | d6a678bd9ba533f341e478d39d4d37328e56edc0 (diff) | |
download | external_webkit-08c1068d9fd18289b9812c3d1fbcfccb8dfa3e60.zip external_webkit-08c1068d9fd18289b9812c3d1fbcfccb8dfa3e60.tar.gz external_webkit-08c1068d9fd18289b9812c3d1fbcfccb8dfa3e60.tar.bz2 |
Use upstream version of ANDROID_HITTEST_WITHSIZE
This change removes the last occurrences of ANDROID_HITTEST_WITHSIZE
and updates WebKit to use the upstream version of this logic. This
follows on from https://android-git.corp.google.com/g/#change,60166 which
merged the upstream logic into the Android tree but maintained the existing
behaviour for Android, guarded with ANDROID_HITTEST_WITHSIZE.
This change introduces the following functional changes ...
- HitTestResult::addNodeToRectBasedTestResult()
The Android version proceeded with the containment test if the node is null.
We now early out and continue the hit test. We also record the node's
shadowAncestorNode, rather than the node itself.
- RenderLayer::hitTestList()
The android version always updates the result, but only updates the
result layer if the result is not a rect based result.
We now always update result layer, but only update the result if the
result is not a rect based result.
- RenderSVGRoot::nodeAtPoint()
The Android version returned true only if it's not a rect based hit test.
Now we return true always.
- HitTestResult::m_isRectBased
In the Android version, a padding must have positive width and height.
Now we allow one of the two to be zero, provided the other is positive
All other changes are non-functional and should probably have been done as
part of https://android-git.corp.google.com/g/#change,60166
Note that the change to RenderBlock::nodeAtPoint() is a non-functional change
because we don't pass a rect to addNodeToRectBasedTestResult(), so the default
zero rect is used and the hit test always fails.
Change-Id: I4163fddad59ad6485df40cd48794aa262f76ced7
Diffstat (limited to 'WebCore/rendering/RenderLineBoxList.cpp')
-rw-r--r-- | WebCore/rendering/RenderLineBoxList.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/WebCore/rendering/RenderLineBoxList.cpp b/WebCore/rendering/RenderLineBoxList.cpp index d8b4e75..4d0dcd6 100644 --- a/WebCore/rendering/RenderLineBoxList.cpp +++ b/WebCore/rendering/RenderLineBoxList.cpp @@ -31,9 +31,6 @@ #include "HitTestResult.h" #include "InlineTextBox.h" -#ifdef ANDROID_HITTEST_WITHSIZE -#include "HitTestResult.h" -#endif #include "RenderArena.h" #include "RenderInline.h" #include "RenderView.h" |