Skip to content

Commit

Permalink
Revert of Revert "Remove resetScrollbars" (patchset #1 id:1 of https:…
Browse files Browse the repository at this point in the history
…//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 ebcbf43.
> 
> Speculative revert.
> 
> NOTRY=True
> BUG=409708
> [email protected]
> 
> 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
  • Loading branch information
[email protected] committed Sep 14, 2014
1 parent 191f718 commit b8f893e
Showing 1 changed file with 0 additions and 13 deletions.
13 changes: 0 additions & 13 deletions Source/core/frame/FrameView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ FrameView::~FrameView()
m_didScrollTimer.stop();

removeFromAXObjectCache();
resetScrollbars();

// Custom scrollbars should already be destroyed at this point
ASSERT(!horizontalScrollbar() || !horizontalScrollbar()->isCustomScrollbar());
Expand Down Expand Up @@ -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();
Expand Down

0 comments on commit b8f893e

Please sign in to comment.