summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2011-01-04 13:29:57 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-04 13:29:57 -0800
commit788c470e17f9565ebbba7d68613f3555be3572b1 (patch)
tree696a563ed03b996be905f2b25e51830734a803c4
parent29f7b6285a17b04529f2284d01450111aa82fb07 (diff)
parent80a8f204862f643ff395a680c3e3ea835605f7c5 (diff)
downloadexternal_webkit-788c470e17f9565ebbba7d68613f3555be3572b1.zip
external_webkit-788c470e17f9565ebbba7d68613f3555be3572b1.tar.gz
external_webkit-788c470e17f9565ebbba7d68613f3555be3572b1.tar.bz2
Merge "Remove the div element check."
-rw-r--r--WebCore/rendering/RenderLayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/rendering/RenderLayer.cpp b/WebCore/rendering/RenderLayer.cpp
index 27ff32f..adcbafe 100644
--- a/WebCore/rendering/RenderLayer.cpp
+++ b/WebCore/rendering/RenderLayer.cpp
@@ -1934,7 +1934,7 @@ bool RenderLayer::hasOverflowControls() const
#if ENABLE(ANDROID_OVERFLOW_SCROLL)
bool RenderLayer::hasOverflowScroll() const
{
- if (!enclosingElement() || !enclosingElement()->hasTagName(HTMLNames::divTag))
+ if (!enclosingElement())
return false;
if (m_scrollDimensionsDirty)
return false;