Skip to content
Permalink
Browse files
Unreviewed, rolling out r146373.
http://trac.webkit.org/changeset/146373
https://bugs.webkit.org/show_bug.cgi?id=113731

broke autosizing shrinking past previous size (Requested by
thorton on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2013-04-01

* page/FrameView.cpp:
(WebCore::FrameView::autoSizeIfEnabled):

Canonical link: https://commits.webkit.org/132052@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@147369 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
WebKit Review Bot authored and webkit-commit-queue committed Apr 1, 2013
1 parent 4f0f68a commit 470c9634fbaa6a02bbea14ada01b1f2bd4dd7ec9
Showing 2 changed files with 17 additions and 1 deletion.
@@ -1,3 +1,15 @@
2013-04-01 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r146373.
http://trac.webkit.org/changeset/146373
https://bugs.webkit.org/show_bug.cgi?id=113731

broke autosizing shrinking past previous size (Requested by
thorton on #webkit).

* page/FrameView.cpp:
(WebCore::FrameView::autoSizeIfEnabled):

2013-04-01 Timothy Hatcher <timothy@apple.com>

Allow changing Web Inspector dock sides without undocking first.
@@ -2778,6 +2778,10 @@ void FrameView::autoSizeIfEnabled()
if (!documentView || !documentElement)
return;

RenderBox* documentRenderBox = documentElement->renderBox();
if (!documentRenderBox)
return;

// If this is the first time we run autosize, start from small height and
// allow it to grow.
if (!m_didRunAutosize)
@@ -2791,7 +2795,7 @@ void FrameView::autoSizeIfEnabled()
// Update various sizes including contentsSize, scrollHeight, etc.
document->updateLayoutIgnorePendingStylesheets();
int width = documentView->minPreferredLogicalWidth();
int height = documentView->documentRect().height();
int height = documentRenderBox->scrollHeight();
IntSize newSize(width, height);

// Check to see if a scrollbar is needed for a given dimension and

0 comments on commit 470c963

Please sign in to comment.