Commit d713c15e authored by vollick@chromium.org's avatar vollick@chromium.org

Revert of Revert "Remove resetScrollbars" (patchset #1 id:1 of...

Revert of Revert "Remove resetScrollbars" (patchset #1 id:1 of https://codereview.chromium.org/534103003/)

Reason for revert:
This was reverted speculatively and was not the cause of the failure.

Original issue's description:
> Revert "Remove resetScrollbars"
> 
> This reverts commit ebcbf43b12652bf96a1d1d94d8dbb5bdfd363ce6.
> 
> Speculative revert.
> 
> NOTRY=True
> BUG=409708
> TBR=skobes@chromium.org
> 
> Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=181275

TBR=
NOTREECHECKS=true
NOTRY=true
BUG=409708

Review URL: https://codereview.chromium.org/568303002

git-svn-id: svn://svn.chromium.org/blink/trunk@181958 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent a2b453d4
......@@ -155,7 +155,6 @@ FrameView::~FrameView()
m_didScrollTimer.stop();
removeFromAXObjectCache();
resetScrollbars();
// Custom scrollbars should already be destroyed at this point
ASSERT(!horizontalScrollbar() || !horizontalScrollbar()->isCustomScrollbar());
......@@ -214,18 +213,6 @@ void FrameView::removeFromAXObjectCache()
}
}
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();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment