Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(476)

Unified Diff: third_party/WebKit/Source/core/frame/FrameViewAutoSizeInfo.cpp

Issue 2393313002: reflow comments in core/frame (Closed)
Patch Set: tweak Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/frame/FrameViewAutoSizeInfo.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameViewAutoSizeInfo.cpp b/third_party/WebKit/Source/core/frame/FrameViewAutoSizeInfo.cpp
index 3a8de6c695887a00f57e869bf3bd5bbfdc3cae02..61f06a1b71c7fc122588c239aceb04de51b3c8f8 100644
--- a/third_party/WebKit/Source/core/frame/FrameViewAutoSizeInfo.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameViewAutoSizeInfo.cpp
@@ -58,8 +58,9 @@ void FrameViewAutoSizeInfo::autoSizeIfNeeded() {
IntSize size = m_frameView->frameRect().size();
- // Do the resizing twice. The first time is basically a rough calculation using the preferred width
- // which may result in a height change during the second iteration.
+ // Do the resizing twice. The first time is basically a rough calculation
+ // using the preferred width which may result in a height change during the
+ // second iteration.
for (int i = 0; i < 2; i++) {
// Update various sizes including contentsSize, scrollHeight, etc.
document->updateStyleAndLayoutIgnorePendingStylesheets();
@@ -107,7 +108,8 @@ void FrameViewAutoSizeInfo::autoSizeIfNeeded() {
// Ensure the size is at least the min bounds.
newSize = newSize.expandedTo(m_minAutoSize);
- // Bound the dimensions by the max bounds and determine what scrollbars to show.
+ // Bound the dimensions by the max bounds and determine what scrollbars to
+ // show.
ScrollbarMode horizonalScrollbarMode = ScrollbarAlwaysOff;
if (newSize.width() > m_maxAutoSize.width()) {
newSize.setWidth(m_maxAutoSize.width());
@@ -122,8 +124,9 @@ void FrameViewAutoSizeInfo::autoSizeIfNeeded() {
if (newSize == size)
continue;
- // While loading only allow the size to increase (to avoid twitching during intermediate smaller states)
- // unless autoresize has just been turned on or the maximum size is smaller than the current size.
+ // While loading only allow the size to increase (to avoid twitching during
+ // intermediate smaller states) unless autoresize has just been turned on or
+ // the maximum size is smaller than the current size.
if (m_didRunAutosize && size.height() <= m_maxAutoSize.height() &&
size.width() <= m_maxAutoSize.width() &&
!m_frameView->frame().document()->loadEventFinished() &&
@@ -131,8 +134,10 @@ void FrameViewAutoSizeInfo::autoSizeIfNeeded() {
break;
m_frameView->resize(newSize.width(), newSize.height());
- // Force the scrollbar state to avoid the scrollbar code adding them and causing them to be needed. For example,
- // a vertical scrollbar may cause text to wrap and thus increase the height (which is the only reason the scollbar is needed).
+ // Force the scrollbar state to avoid the scrollbar code adding them and
+ // causing them to be needed. For example, a vertical scrollbar may cause
+ // text to wrap and thus increase the height (which is the only reason the
+ // scollbar is needed).
m_frameView->setVerticalScrollbarLock(false);
m_frameView->setHorizontalScrollbarLock(false);
m_frameView->setScrollbarModes(horizonalScrollbarMode,
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameView.cpp ('k') | third_party/WebKit/Source/core/frame/History.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698