| Index: Source/core/frame/FrameView.cpp
|
| diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
|
| index 5d42bdac25b2d6c954d44fa2973ecd91db2e3f19..534be3ec7343da1276a08710fa82e0ea557d89ae 100644
|
| --- a/Source/core/frame/FrameView.cpp
|
| +++ b/Source/core/frame/FrameView.cpp
|
| @@ -156,6 +156,7 @@ FrameView::~FrameView()
|
| m_didScrollTimer.stop();
|
|
|
| removeFromAXObjectCache();
|
| + resetScrollbars();
|
|
|
| // Custom scrollbars should already be destroyed at this point
|
| ASSERT(!horizontalScrollbar() || !horizontalScrollbar()->isCustomScrollbar());
|
| @@ -212,6 +213,18 @@ void FrameView::removeFromAXObjectCache()
|
| cache->remove(this);
|
| }
|
|
|
| +void FrameView::resetScrollbars()
|
| +{
|
| + // Reset the document's scrollbars back to our defaults before we yield the floor.
|
| + m_firstLayout = true;
|
| + setScrollbarsSuppressed(true);
|
| + if (m_canHaveScrollbars)
|
| + setScrollbarModes(ScrollbarAuto, ScrollbarAuto);
|
| + else
|
| + setScrollbarModes(ScrollbarAlwaysOff, ScrollbarAlwaysOff);
|
| + setScrollbarsSuppressed(false);
|
| +}
|
| +
|
| void FrameView::init()
|
| {
|
| reset();
|
|
|