diff options
author | John Reck <jreck@google.com> | 2012-06-07 13:04:22 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-07 13:04:22 -0700 |
commit | b9070541457219b188819603f9468d8dbd1b8180 (patch) | |
tree | 6e202778709665c3838929cd85445c92ef649ae0 /Source | |
parent | 6ea3dda4e2f83431b6297247460b98e9dd5ac905 (diff) | |
parent | 110b238cc7d53427764b65c9351c820743ae83a3 (diff) | |
download | external_webkit-b9070541457219b188819603f9468d8dbd1b8180.zip external_webkit-b9070541457219b188819603f9468d8dbd1b8180.tar.gz external_webkit-b9070541457219b188819603f9468d8dbd1b8180.tar.bz2 |
am 110b238c: am 0d4f6046: Remove unnecessary Android code from hitTestForLayer
* commit '110b238cc7d53427764b65c9351c820743ae83a3':
Remove unnecessary Android code from hitTestForLayer
Diffstat (limited to 'Source')
-rw-r--r-- | Source/WebCore/rendering/RenderLayer.cpp | 10 | ||||
-rw-r--r-- | Source/WebCore/rendering/RenderLayer.h | 22 |
2 files changed, 0 insertions, 32 deletions
diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp index 1ffa0de..bad0668 100644 --- a/Source/WebCore/rendering/RenderLayer.cpp +++ b/Source/WebCore/rendering/RenderLayer.cpp @@ -3152,14 +3152,6 @@ RenderLayer* RenderLayer::hitTestLayer(RenderLayer* rootLayer, RenderLayer* cont candidateLayer = hitLayer; } -#if ENABLE(ANDROID_OVERFLOW_SCROLL) - if (hasOverflowParent()) { - ClipRects clipRects; - calculateClipRects(rootLayer, clipRects, useTemporaryClipRects); - fgRect.intersect(clipRects.hitTestClip()); - bgRect.intersect(clipRects.hitTestClip()); - } -#endif // Next we want to see if the mouse pos is inside the child RenderObjects of the layer. if (fgRect.intersects(hitTestArea) && isSelfPaintingLayer()) { // Hit test with a temporary HitTestResult, because we only want to commit to 'result' if we know we're frontmost. @@ -3451,8 +3443,6 @@ void RenderLayer::calculateClipRects(const RenderLayer* rootLayer, ClipRects& cl if (renderer()->hasOverflowClip()) { IntRect newOverflowClip = toRenderBox(renderer())->overflowClipRect(x, y, relevancy); #if ENABLE(ANDROID_OVERFLOW_SCROLL) - clipRects.setHitTestClip(intersection(clipRects.fixed() ? clipRects.fixedClipRect() - : newOverflowClip, clipRects.hitTestClip())); if (hasOverflowScroll()) { RenderBox* box = toRenderBox(renderer()); newOverflowClip = diff --git a/Source/WebCore/rendering/RenderLayer.h b/Source/WebCore/rendering/RenderLayer.h index 5e421f0..ceb9026 100644 --- a/Source/WebCore/rendering/RenderLayer.h +++ b/Source/WebCore/rendering/RenderLayer.h @@ -80,9 +80,6 @@ public: : m_overflowClipRect(r) , m_fixedClipRect(r) , m_posClipRect(r) -#if ENABLE(ANDROID_OVERFLOW_SCROLL) - , m_hitTestClip(r) -#endif , m_refCnt(0) , m_fixed(false) { @@ -92,9 +89,6 @@ public: : m_overflowClipRect(other.overflowClipRect()) , m_fixedClipRect(other.fixedClipRect()) , m_posClipRect(other.posClipRect()) -#if ENABLE(ANDROID_OVERFLOW_SCROLL) - , m_hitTestClip(other.hitTestClip()) -#endif , m_refCnt(0) , m_fixed(other.fixed()) { @@ -105,9 +99,6 @@ public: m_overflowClipRect = r; m_fixedClipRect = r; m_posClipRect = r; -#if ENABLE(ANDROID_OVERFLOW_SCROLL) - m_hitTestClip = r; -#endif m_fixed = false; } @@ -119,10 +110,6 @@ public: const IntRect& posClipRect() const { return m_posClipRect; } void setPosClipRect(const IntRect& r) { m_posClipRect = r; } -#if ENABLE(ANDROID_OVERFLOW_SCROLL) - const IntRect& hitTestClip() const { return m_hitTestClip; } - void setHitTestClip(const IntRect& r) { m_hitTestClip = r; } -#endif bool fixed() const { return m_fixed; } void setFixed(bool fixed) { m_fixed = fixed; } @@ -143,9 +130,6 @@ public: return m_overflowClipRect == other.overflowClipRect() && m_fixedClipRect == other.fixedClipRect() && m_posClipRect == other.posClipRect() && -#if ENABLE(ANDROID_OVERFLOW_SCROLL) - m_hitTestClip == other.hitTestClip() && -#endif m_fixed == other.fixed(); } @@ -154,9 +138,6 @@ public: m_overflowClipRect = other.overflowClipRect(); m_fixedClipRect = other.fixedClipRect(); m_posClipRect = other.posClipRect(); -#if ENABLE(ANDROID_OVERFLOW_SCROLL) - m_hitTestClip = other.hitTestClip(); -#endif m_fixed = other.fixed(); return *this; } @@ -169,9 +150,6 @@ private: IntRect m_overflowClipRect; IntRect m_fixedClipRect; IntRect m_posClipRect; -#if ENABLE(ANDROID_OVERFLOW_SCROLL) - IntRect m_hitTestClip; -#endif unsigned m_refCnt : 31; bool m_fixed : 1; }; |