third_party/WebKit/Source/core/frame/FrameView.cpp - Issue 2393313002: reflow comments in core/frame

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

Issue 2393313002: reflow comments in core/frame (Closed)

Patch Set: 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

« third_party/WebKit/Source/core/frame/FrameView.h ('K') | « third_party/WebKit/Source/core/frame/FrameView.h ('k') | third_party/WebKit/Source/core/frame/FrameViewAutoSizeInfo.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/frame/FrameView.cpp

diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp

index b2629d51f308b4a93a0b34f2360ec3e0cf900ebd..ff01f91e0d610e4291864a599a668547427b871a 100644

--- a/third_party/WebKit/Source/core/frame/FrameView.cpp

+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp

@@ -138,7 +138,8 @@ namespace blink {

using namespace HTMLNames;

-// The maximum number of updateWidgets iterations that should be done before returning.

+// The maximum number of updateWidgets iterations that should be done before

+// returning.

static const unsigned maxUpdateWidgetsIterations = 2;

static const double resourcePriorityUpdateDelayAfterScroll = 0.250;

@@ -254,7 +255,8 @@ void FrameView::reset() {

}

// Call function for each non-throttled frame view in pre tree order.

-// Note it needs a null check of the frame's layoutView to access it in case of detached frames.

+// Note it needs a null check of the frame's layoutView to access it in case of

+// detached frames.

template <typename Function>

void FrameView::forAllNonThrottledFrameViews(const Function& function) {

if (shouldThrottleRendering())

@@ -327,8 +329,9 @@ void FrameView::dispose() {

void FrameView::detachScrollbars() {

// Previously, we detached custom scrollbars as early as possible to prevent

- // Document::detachLayoutTree() from messing with the view such that its scroll bars

- // won't be torn down. However, scripting in Document::detachLayoutTree() is forbidden

+ // Document::detachLayoutTree() from messing with the view such that its

+ // scroll bars won't be torn down. However, scripting in

+ // Document::detachLayoutTree() is forbidden

// now, so it's not clear if these edge cases can still happen.

// However, for Oilpan, we still need to remove the native scrollbars before

// we lose the connection to the HostWindow, so we just unconditionally

@@ -394,7 +397,8 @@ void FrameView::invalidateRect(const IntRect& rect) {

paintInvalidationRect.move(

(layoutItem.borderLeft() + layoutItem.paddingLeft()).toInt(),

(layoutItem.borderTop() + layoutItem.paddingTop()).toInt());

- // FIXME: We should not allow paint invalidation out of paint invalidation state. crbug.com/457415

+ // FIXME: We should not allow paint invalidation out of paint invalidation

+ // state. crbug.com/457415

DisablePaintInvalidationStateAsserts paintInvalidationAssertDisabler;

layoutItem.invalidatePaintRectangle(LayoutRect(paintInvalidationRect));

}

@@ -491,7 +495,8 @@ bool FrameView::shouldUseCustomScrollbars(

return false;

}

- // FIXME: We need to update the scrollbar dynamically as documents change (or as doc elements and bodies get discovered that have custom styles).

+ // FIXME: We need to update the scrollbar dynamically as documents change (or

+ // as doc elements and bodies get discovered that have custom styles).

Document* doc = m_frame->document();

// Try the <body> element first as a scrollbar source.

@@ -623,8 +628,8 @@ void FrameView::calculateScrollbarModes(

if (!m_canHaveScrollbars && strategy != RulesFromWebContentOnly)

RETURN_SCROLLBAR_MODE(ScrollbarAlwaysOff);

- // This will be the LayoutObject for either the body element or the html element

- // (see Document::viewportDefiningElement).

+ // This will be the LayoutObject for either the body element or the html

+ // element (see Document::viewportDefiningElement).

LayoutObject* viewport = viewportLayoutObject();

if (!viewport || !viewport->style())

RETURN_SCROLLBAR_MODE(ScrollbarAuto);

@@ -745,7 +750,8 @@ GraphicsLayer* FrameView::layerForScrollCorner() const {

}

bool FrameView::isEnclosedInCompositingLayer() const {

- // FIXME: It's a bug that compositing state isn't always up to date when this is called. crbug.com/366314

+ // FIXME: It's a bug that compositing state isn't always up to date when this

+ // is called. crbug.com/366314

DisableCompositingQueryAsserts disabler;

LayoutItem frameOwnerLayoutItem = m_frame->ownerLayoutItem();

@@ -781,20 +787,24 @@ inline void FrameView::forceLayoutParentViewIfNeeded() {

if (svgRoot->everHadLayout() && !svgRoot->needsLayout())

return;

- // If the embedded SVG document appears the first time, the ownerLayoutObject has already finished

- // layout without knowing about the existence of the embedded SVG document, because LayoutReplaced

- // embeddedReplacedContent() returns 0, as long as the embedded document isn't loaded yet. Before

- // bothering to lay out the SVG document, mark the ownerLayoutObject needing layout and ask its

- // FrameView for a layout. After that the LayoutEmbeddedObject (ownerLayoutObject) carries the

- // correct size, which LayoutSVGRoot::computeReplacedLogicalWidth/Height rely on, when laying

- // out for the first time, or when the LayoutSVGRoot size has changed dynamically (eg. via <script>).

+ // If the embedded SVG document appears the first time, the ownerLayoutObject

+ // has already finished layout without knowing about the existence of the

+ // embedded SVG document, because LayoutReplaced embeddedReplacedContent()

+ // returns 0, as long as the embedded document isn't loaded yet. Before

+ // bothering to lay out the SVG document, mark the ownerLayoutObject needing

+ // layout and ask its FrameView for a layout. After that the

+ // LayoutEmbeddedObject (ownerLayoutObject) carries the correct size, which

+ // LayoutSVGRoot::computeReplacedLogicalWidth/Height rely on, when laying out

+ // for the first time, or when the LayoutSVGRoot size has changed dynamically

+ // (eg. via <script>).

FrameView* frameView = ownerLayoutItem.frame()->view();

// Mark the owner layoutObject as needing layout.

ownerLayoutItem.setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(

LayoutInvalidationReason::Unknown);

- // Synchronously enter layout, to layout the view containing the host object/embed/iframe.

+ // Synchronously enter layout, to layout the view containing the host

+ // object/embed/iframe.

ASSERT(frameView);

frameView->layout();

}

@@ -808,7 +818,8 @@ void FrameView::performPreLayoutTasks() {

if (!m_nestedLayoutCount && !m_inSynchronousPostLayout &&

m_postLayoutTasksTimer.isActive()) {

- // This is a new top-level layout. If there are any remaining tasks from the previous layout, finish them now.

+ // This is a new top-level layout. If there are any remaining tasks from the

+ // previous layout, finish them now.

m_inSynchronousPostLayout = true;

performPostLayoutTasks();

m_inSynchronousPostLayout = false;

@@ -819,7 +830,8 @@ void FrameView::performPreLayoutTasks() {

if (wasResized)

document->notifyResizeForViewportUnits();

- // Viewport-dependent or device-dependent media queries may cause us to need completely different style information.

+ // Viewport-dependent or device-dependent media queries may cause us to need

+ // completely different style information.

bool mainFrameRotation =

m_frame->isMainFrame() && m_frame->settings() &&

m_frame->settings()->mainFrameResizesAreOrientationChanges();

@@ -900,8 +912,9 @@ void FrameView::performLayout(bool inSubtreeLayout) {

lifecycle().advanceTo(DocumentLifecycle::InPerformLayout);

// performLayout is the actual guts of layout().

- // FIXME: The 300 other lines in layout() probably belong in other helper functions

- // so that a single human could understand what layout() is actually doing.

+ // FIXME: The 300 other lines in layout() probably belong in other helper

+ // functions so that a single human could understand what layout() is actually

+ // doing.

forceLayoutParentViewIfNeeded();

@@ -917,9 +930,9 @@ void FrameView::performLayout(bool inSubtreeLayout) {

continue;

layoutFromRootObject(*root);

- // We need to ensure that we mark up all layoutObjects up to the LayoutView

- // for paint invalidation. This simplifies our code as we just always

- // do a full tree walk.

+ // We need to ensure that we mark up all layoutObjects up to the

+ // LayoutView for paint invalidation. This simplifies our code as we just

+ // always do a full tree walk.

if (LayoutItem container = LayoutItem(root->container()))

container.setMayNeedPaintInvalidation();

}

@@ -953,10 +966,10 @@ void FrameView::scheduleOrPerformPostLayoutTasks() {

if (!m_postLayoutTasksTimer.isActive() &&

(needsLayout() || m_inSynchronousPostLayout)) {

- // If we need layout or are already in a synchronous call to postLayoutTasks(),

- // defer widget updates and event dispatch until after we return. postLayoutTasks()

- // can make us need to update again, and we can get stuck in a nasty cycle unless

- // we call it through the timer here.

+ // If we need layout or are already in a synchronous call to

+ // postLayoutTasks(), defer widget updates and event dispatch until after we

+ // return. postLayoutTasks() can make us need to update again, and we can

+ // get stuck in a nasty cycle unless we call it through the timer here.

m_postLayoutTasksTimer.startOneShot(0, BLINK_FROM_HERE);

if (needsLayout())

layout();

@@ -992,7 +1005,8 @@ void FrameView::layout() {

Document* document = m_frame->document();

- // TODO(crbug.com/460956): The notion of a single root for layout is no longer applicable. Remove or update this code.

+ // TODO(crbug.com/460956): The notion of a single root for layout is no longer

+ // applicable. Remove or update this code.

LayoutObject* rootForThisLayout = layoutView();

FontCachePurgePreventer fontCachePurgePreventer;

@@ -1002,15 +1016,17 @@ void FrameView::layout() {

updateCounters();

- // If the layout view was marked as needing layout after we added items in the subtree roots we need

- // to clear the roots and do the layout from the layoutView.

+ // If the layout view was marked as needing layout after we added items in

+ // the subtree roots we need to clear the roots and do the layout from the

+ // layoutView.

if (layoutViewItem().needsLayout())

clearLayoutSubtreeRootsAndMarkContainingBlocks();

layoutViewItem().clearHitTestCache();

bool inSubtreeLayout = isSubtreeLayout();

- // TODO(crbug.com/460956): The notion of a single root for layout is no longer applicable. Remove or update this code.

+ // TODO(crbug.com/460956): The notion of a single root for layout is no

+ // longer applicable. Remove or update this code.

if (inSubtreeLayout)

rootForThisLayout = m_layoutSubtreeRootList.randomRoot();

@@ -1049,13 +1065,15 @@ void FrameView::layout() {

m_lastZoomFactor = layoutViewItem().style()->zoom();

// Set the initial vMode to AlwaysOn if we're auto.

- if (vMode == ScrollbarAuto)

- setVerticalScrollbarMode(

- ScrollbarAlwaysOn); // This causes a vertical scrollbar to appear.

+ if (vMode == ScrollbarAuto) {

+ // This causes a vertical scrollbar to appear.

+ setVerticalScrollbarMode(ScrollbarAlwaysOn);

+ }

// Set the initial hMode to AlwaysOff if we're auto.

- if (hMode == ScrollbarAuto)

- setHorizontalScrollbarMode(

- ScrollbarAlwaysOff); // This causes a horizontal scrollbar to disappear.

+ if (hMode == ScrollbarAuto) {

+ // This causes a horizontal scrollbar to disappear.

+ setHorizontalScrollbarMode(ScrollbarAlwaysOff);

+ }

setScrollbarModes(hMode, vMode);

setScrollbarsSuppressed(false);

@@ -1099,7 +1117,8 @@ void FrameView::layout() {

m_frameTimingRequestsDirty = true;

- // FIXME: Could find the common ancestor layer of all dirty subtrees and mark from there. crbug.com/462719

+ // FIXME: Could find the common ancestor layer of all dirty subtrees and mark

+ // from there. crbug.com/462719

layoutViewItem().enclosingLayer()->updateLayerPositionsAfterLayout();

TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(

@@ -1121,7 +1140,8 @@ void FrameView::layout() {

scheduleOrPerformPostLayoutTasks();

checkDoesNotNeedLayout();

- // FIXME: The notion of a single root for layout is no longer applicable. Remove or update this code. crbug.com/460596

+ // FIXME: The notion of a single root for layout is no longer applicable.

+ // Remove or update this code. crbug.com/460596

TRACE_EVENT_END1("devtools.timeline", "Layout", "endData",

InspectorLayoutEvent::endData(rootForThisLayout));

InspectorInstrumentation::didUpdateLayout(m_frame.get());

@@ -1131,7 +1151,8 @@ void FrameView::layout() {

return;

#if ENABLE(ASSERT)

- // Post-layout assert that nobody was re-marked as needing layout during layout.

+ // Post-layout assert that nobody was re-marked as needing layout during

+ // layout.

layoutView()->assertSubtreeIsLaidOut();

#endif

@@ -1245,7 +1266,8 @@ LayoutReplaced* FrameView::embeddedReplacedContent() const {

if (!firstChild || !firstChild->isBox())

return nullptr;

- // Currently only embedded SVG documents participate in the size-negotiation logic.

+ // Currently only embedded SVG documents participate in the size-negotiation

+ // logic.

if (firstChild->isSVGRoot())

return toLayoutSVGRoot(firstChild);

@@ -1265,7 +1287,8 @@ void FrameView::updateWidgetGeometries() {

copyToVector(m_parts, parts);

for (auto part : parts) {

- // Script or plugins could detach the frame so abort processing if that happens.

+ // Script or plugins could detach the frame so abort processing if that

+ // happens.

if (layoutViewItem().isNull())

break;

@@ -1388,12 +1411,12 @@ void FrameView::viewportSizeChanged(bool widthChanged, bool heightChanged) {

DCHECK(widthChanged || heightChanged);

if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {

- // The background must be repainted when the FrameView is resized, even if the initial

- // containing block does not change (so we can't rely on layout to issue the invalidation).

- // This is because the background fills the main GraphicsLayer, which takes the size of the

- // layout viewport.

- // TODO(skobes): Paint non-fixed backgrounds into the scrolling contents layer and avoid

- // this invalidation (http://crbug.com/568847).

+ // The background must be repainted when the FrameView is resized, even if

+ // the initial containing block does not change (so we can't rely on layout

+ // to issue the invalidation). This is because the background fills the

+ // main GraphicsLayer, which takes the size of the layout viewport.

+ // TODO(skobes): Paint non-fixed backgrounds into the scrolling contents

+ // layer and avoid this invalidation (http://crbug.com/568847).

LayoutViewItem lvi = layoutViewItem();

if (!lvi.isNull())

lvi.setShouldDoFullPaintInvalidation();

@@ -1469,8 +1492,9 @@ bool FrameView::invalidateViewportConstrainedObjects() {

"ScrollInvalidationTracking", TRACE_EVENT_SCOPE_THREAD, "data",

InspectorScrollInvalidationTrackingEvent::data(*layoutObject));

- // If the fixed layer has a blur/drop-shadow filter applied on at least one of its parents, we cannot

- // scroll using the fast path, otherwise the outsets of the filter will be moved around the page.

+ // If the fixed layer has a blur/drop-shadow filter applied on at least one

+ // of its parents, we cannot scroll using the fast path, otherwise the

+ // outsets of the filter will be moved around the page.

if (layer->hasAncestorWithFilterThatMovesPixels())

fastPathAllowed = false;

}

@@ -1498,9 +1522,11 @@ bool FrameView::scrollContentsFastPath(const IntSize& scrollDelta) {

void FrameView::scrollContentsSlowPath() {

TRACE_EVENT0("blink", "FrameView::scrollContentsSlowPath");

- // We need full invalidation during slow scrolling. For slimming paint, full invalidation

- // of the LayoutView is not enough. We also need to invalidate all of the objects.

- // FIXME: Find out what are enough to invalidate in slow path scrolling. crbug.com/451090#9.

+ // We need full invalidation during slow scrolling. For slimming paint, full

+ // invalidation of the LayoutView is not enough. We also need to invalidate

+ // all of the objects.

+ // FIXME: Find out what are enough to invalidate in slow path scrolling.

+ // crbug.com/451090#9.

ASSERT(!layoutViewItem().isNull());

if (contentsInCompositedLayer())

layoutViewItem()

@@ -1514,7 +1540,8 @@ void FrameView::scrollContentsSlowPath() {

if (contentsInCompositedLayer()) {

IntRect updateRect = visibleContentRect();

ASSERT(!layoutViewItem().isNull());

- // FIXME: We should not allow paint invalidation out of paint invalidation state. crbug.com/457415

+ // FIXME: We should not allow paint invalidation out of paint invalidation

+ // state. crbug.com/457415

DisablePaintInvalidationStateAsserts disabler;

layoutViewItem().invalidatePaintRectangle(LayoutRect(updateRect));

}

@@ -1525,7 +1552,8 @@ void FrameView::scrollContentsSlowPath() {

frameLayoutItem.borderLeft() + frameLayoutItem.paddingLeft(),

frameLayoutItem.borderTop() + frameLayoutItem.paddingTop(),

LayoutUnit(visibleWidth()), LayoutUnit(visibleHeight()));

- // FIXME: We should not allow paint invalidation out of paint invalidation state. crbug.com/457415

+ // FIXME: We should not allow paint invalidation out of paint invalidation

+ // state. crbug.com/457415

DisablePaintInvalidationStateAsserts disabler;

frameLayoutItem.invalidatePaintRectangle(rect);

return;

@@ -1587,7 +1615,8 @@ bool FrameView::processUrlFragmentHelper(const String& name,

}

- // Implement the rule that "" and "top" both mean top of page as in other browsers.

+ // Implement the rule that "" and "top" both mean top of page as in other

+ // browsers.

if (!anchorNode && !(name.isEmpty() || equalIgnoringCase(name, "top")))

return false;

@@ -1620,7 +1649,8 @@ void FrameView::setFragmentAnchor(Node* anchorNode) {

// We need to update the layout tree before scrolling.

m_frame->document()->updateStyleAndLayoutTree();

- // If layout is needed, we will scroll in performPostLayoutTasks. Otherwise, scroll immediately.

+ // If layout is needed, we will scroll in performPostLayoutTasks. Otherwise,

+ // scroll immediately.

LayoutViewItem layoutViewItem = this->layoutViewItem();

if (!layoutViewItem.isNull() && layoutViewItem.needsLayout())

layout();

@@ -1707,9 +1737,9 @@ void FrameView::updateLayersAndCompositingAfterScrollIfNeeded(

}

- // If there fixed position elements, scrolling may cause compositing layers to change.

- // Update widget and layer positions after scrolling, but only if we're not inside of

- // layout.

+ // If there fixed position elements, scrolling may cause compositing layers to

+ // change. Update widget and layer positions after scrolling, but only if

+ // we're not inside of layout.

if (!m_nestedLayoutCount) {

updateWidgetGeometries();

LayoutViewItem layoutViewItem = this->layoutViewItem();

@@ -1813,16 +1843,18 @@ void FrameView::contentsResized() {

void FrameView::scrollbarExistenceDidChange() {

// We check to make sure the view is attached to a frame() as this method can

- // be triggered before the view is attached by LocalFrame::createView(...) setting

- // various values such as setScrollBarModes(...) for example. An ASSERT is

- // triggered when a view is layout before being attached to a frame().

+ // be triggered before the view is attached by LocalFrame::createView(...)

+ // setting various values such as setScrollBarModes(...) for example. An

+ // ASSERT is triggered when a view is layout before being attached to a

+ // frame().

if (!frame().view())

return;

bool hasOverlayScrollbars = this->hasOverlayScrollbars();

- // FIXME: this call to layout() could be called within FrameView::layout(), but before performLayout(),

- // causing double-layout. See also crbug.com/429242.

+ // FIXME: this call to layout() could be called within FrameView::layout(),

+ // but before performLayout(), causing double-layout. See also

+ // crbug.com/429242.

if (!hasOverlayScrollbars && needsLayout())

layout();

@@ -1840,7 +1872,8 @@ void FrameView::handleLoadCompleted() {

if (m_autoSizeInfo)

m_autoSizeInfo->autoSizeIfNeeded();

- // If there is a pending layout, the fragment anchor will be cleared when it finishes.

+ // If there is a pending layout, the fragment anchor will be cleared when it

+ // finishes.

if (!needsLayout())

clearFragmentAnchor();

}

@@ -1901,7 +1934,8 @@ bool FrameView::checkLayoutInvalidationIsAllowed() const {

if (m_allowsLayoutInvalidationAfterLayoutClean)

return true;

- // If we are updating all lifecycle phases beyond LayoutClean, we don't expect dirty layout after LayoutClean.

+ // If we are updating all lifecycle phases beyond LayoutClean, we don't expect

+ // dirty layout after LayoutClean.

CHECK_FOR_DIRTY_LAYOUT(lifecycle().state() < DocumentLifecycle::LayoutClean);

return true;

@@ -1912,7 +1946,8 @@ void FrameView::scheduleRelayout() {

if (!m_layoutSchedulingEnabled)

return;

- // TODO(crbug.com/590856): It's still broken when we choose not to crash when the check fails.

+ // TODO(crbug.com/590856): It's still broken when we choose not to crash when

+ // the check fails.

if (!checkLayoutInvalidationIsAllowed())

return;

if (!needsLayout())

@@ -1936,7 +1971,8 @@ void FrameView::scheduleRelayout() {

void FrameView::scheduleRelayoutOfSubtree(LayoutObject* relayoutRoot) {

DCHECK(m_frame->view() == this);

- // TODO(crbug.com/590856): It's still broken when we choose not to crash when the check fails.

+ // TODO(crbug.com/590856): It's still broken when we choose not to crash when

+ // the check fails.

if (!checkLayoutInvalidationIsAllowed())

return;

@@ -2001,7 +2037,8 @@ void FrameView::setNeedsLayout() {

LayoutViewItem layoutViewItem = this->layoutViewItem();

if (layoutViewItem.isNull())

return;

- // TODO(crbug.com/590856): It's still broken if we choose not to crash when the check fails.

+ // TODO(crbug.com/590856): It's still broken if we choose not to crash when

+ // the check fails.

if (!checkLayoutInvalidationIsAllowed())

return;

layoutViewItem.setNeedsLayout(LayoutInvalidationReason::Unknown);

@@ -2058,8 +2095,9 @@ void FrameView::scrollToFragmentAnchor() {

if (!anchorNode)

return;

- // Scrolling is disabled during updateScrollbars (see isProgrammaticallyScrollable).

- // Bail now to avoid clearing m_fragmentAnchor before we actually have a chance to scroll.

+ // Scrolling is disabled during updateScrollbars (see

+ // isProgrammaticallyScrollable). Bail now to avoid clearing m_fragmentAnchor

+ // before we actually have a chance to scroll.

if (m_inUpdateScrollbars)

return;

@@ -2095,9 +2133,9 @@ void FrameView::scrollToFragmentAnchor() {

cache->handleScrolledToAnchor(anchorNode);

}

- // The fragment anchor should only be maintained while the frame is still loading.

- // If the frame is done loading, clear the anchor now. Otherwise, restore it

- // since it may have been cleared during scrollRectToVisible.

+ // The fragment anchor should only be maintained while the frame is still

+ // loading. If the frame is done loading, clear the anchor now. Otherwise,

+ // restore it since it may have been cleared during scrollRectToVisible.

m_fragmentAnchor =

m_frame->document()->isLoadCompleted() ? nullptr : anchorNode;

}

@@ -2106,11 +2144,13 @@ bool FrameView::updateWidgets() {

// This is always called from updateWidgetsTimerFired.

// m_updateWidgetsTimer should only be scheduled if we have widgets to update.

// Thus I believe we can stop checking isEmpty here, and just ASSERT isEmpty:

- // FIXME: This assert has been temporarily removed due to https://crbug.com/430344

+ // FIXME: This assert has been temporarily removed due to

+ // https://crbug.com/430344

if (m_nestedLayoutCount > 1 || m_partUpdateSet.isEmpty())

return true;

- // Need to swap because script will run inside the below loop and invalidate the iterator.

+ // Need to swap because script will run inside the below loop and invalidate

+ // the iterator.

EmbeddedObjectSet objects;

objects.swap(m_partUpdateSet);

@@ -2168,8 +2208,8 @@ void FrameView::performPostLayoutTasks() {

// http/tests/inspector/elements/html-link-import.html and many other

// tests hit that case.

// We should ASSERT(isActive()); or at least return early if we can!

- ASSERT(

- !isInPerformLayout()); // Always before or after performLayout(), part of the highest-level layout() call.

+ ASSERT(!isInPerformLayout()); // Always before or after performLayout(), part

+ // of the highest-level layout() call.

dcheng 2016/10/06 02:43:13 Nit: own line?

Nico 2016/10/06 03:22:09 Done.

TRACE_EVENT0("blink,benchmark", "FrameView::performPostLayoutTasks");

m_postLayoutTasksTimer.stop();

@@ -2180,10 +2220,10 @@ void FrameView::performPostLayoutTasks() {

ASSERT(m_frame->document());

FontFaceSet::didLayout(*m_frame->document());

- // Cursor update scheduling is done by the local root, which is the main frame if there

- // are no RemoteFrame ancestors in the frame tree. Use of localFrameRoot() is

- // discouraged but will change when cursor update scheduling is moved from EventHandler

- // to PageEventHandler.

+ // Cursor update scheduling is done by the local root, which is the main frame

+ // if there are no RemoteFrame ancestors in the frame tree. Use of

+ // localFrameRoot() is discouraged but will change when cursor update

+ // scheduling is moved from EventHandler to PageEventHandler.

frame().localFrameRoot()->eventHandler().scheduleCursorUpdate();

updateWidgetGeometries();

@@ -2198,7 +2238,8 @@ void FrameView::performPostLayoutTasks() {

scrollingCoordinator->notifyGeometryChanged();

scrollToFragmentAnchor();

- // TODO(skobes): Figure out interactions between scroll anchor, fragment anchor, and history restoration.

+ // TODO(skobes): Figure out interactions between scroll anchor, fragment

+ // anchor, and history restoration.

if (shouldPerformScrollAnchoring())

m_scrollAnchor.restore();

@@ -2472,7 +2513,8 @@ void FrameView::updateScrollCorner() {

}

if (!cornerStyle) {

- // If we have an owning ipage/LocalFrame element, then it can set the custom scrollbar also.

+ // If we have an owning ipage/LocalFrame element, then it can set the

+ // custom scrollbar also.

LayoutPartItem layoutItem = m_frame->ownerLayoutItem();

if (!layoutItem.isNull())

cornerStyle = layoutItem.getUncachedPseudoStyle(

@@ -2492,9 +2534,10 @@ void FrameView::updateScrollCorner() {

}

Color FrameView::documentBackgroundColor() const {

- // The LayoutView's background color is set in Document::inheritHtmlAndBodyElementStyles.

- // Blend this with the base background color of the FrameView. This should match the color

- // drawn by ViewPainter::paintBoxDecorationBackground.

+ // The LayoutView's background color is set in

+ // Document::inheritHtmlAndBodyElementStyles. Blend this with the base

+ // background color of the FrameView. This should match the color drawn by

+ // ViewPainter::paintBoxDecorationBackground.

Color result = baseBackgroundColor();

LayoutItem documentLayoutObject = layoutViewItem();

if (!documentLayoutObject.isNull())

@@ -2552,10 +2595,12 @@ void FrameView::scheduleVisualUpdateForPaintInvalidationIfNeeded() {

if (localFrameRoot->view()->m_currentUpdateLifecyclePhasesTargetState <

DocumentLifecycle::PaintInvalidationClean ||

lifecycle().state() >= DocumentLifecycle::PrePaintClean) {

- // Schedule visual update to process the paint invalidation in the next cycle.

+ // Schedule visual update to process the paint invalidation in the next

+ // cycle.

localFrameRoot->scheduleVisualUpdateUnlessThrottled();

}

- // Otherwise the paint invalidation will be handled in paint invalidation phase of this cycle.

+ // Otherwise the paint invalidation will be handled in paint invalidation

+ // phase of this cycle.

}

void FrameView::notifyResizeObservers() {

@@ -2590,7 +2635,8 @@ void FrameView::notifyResizeObservers() {

DCHECK(!layoutView()->needsLayout());

}

-// TODO(leviw): We don't assert lifecycle information from documents in child PluginViews.

+// TODO(leviw): We don't assert lifecycle information from documents in child

+// PluginViews.

void FrameView::updateLifecyclePhasesInternal(

DocumentLifecycle::LifecycleState targetState) {

if (m_currentUpdateLifecyclePhasesTargetState !=

@@ -2740,9 +2786,11 @@ void FrameView::synchronizedPaint() {

m_paintController->commitNewDisplayItems(LayoutSize());

}

} else {

- // A null graphics layer can occur for painting of SVG images that are not parented into the main frame tree,

- // or when the FrameView is the main frame view of a page overlay. The page overlay is in the layer tree of

- // the host page and will be painted during synchronized painting of the host page.

+ // A null graphics layer can occur for painting of SVG images that are not

+ // parented into the main frame tree, or when the FrameView is the main

+ // frame view of a page overlay. The page overlay is in the layer tree of

+ // the host page and will be painted during synchronized painting of the

+ // host page.

if (GraphicsLayer* rootGraphicsLayer =

view.compositor()->rootGraphicsLayer()) {

synchronizedPaintRecursively(rootGraphicsLayer);

@@ -2835,11 +2883,12 @@ void FrameView::updateStyleAndLayoutIfNeededRecursiveInternal() {

// We have to crawl our entire subtree looking for any FrameViews that need

// layout and make sure they are up to date.

// Mac actually tests for intersection with the dirty region and tries not to

- // update layout for frames that are outside the dirty region. Not only does this seem

- // pointless (since those frames will have set a zero timer to layout anyway), but

- // it is also incorrect, since if two frames overlap, the first could be excluded from the dirty

- // region but then become included later by the second frame adding rects to the dirty region

- // when it lays out.

+ // update layout for frames that are outside the dirty region. Not only does

+ // this seem pointless (since those frames will have set a zero timer to

+ // layout anyway), but it is also incorrect, since if two frames overlap, the

+ // first could be excluded from the dirty region but then become included

+ // later by the second frame adding rects to the dirty region when it lays

+ // out.

m_frame->document()->updateStyleAndLayoutTree();

@@ -2852,11 +2901,11 @@ void FrameView::updateStyleAndLayoutIfNeededRecursiveInternal() {

checkDoesNotNeedLayout();

- // WebView plugins need to update regardless of whether the LayoutEmbeddedObject

- // that owns them needed layout.

- // TODO(leviw): This currently runs the entire lifecycle on plugin WebViews. We

- // should have a way to only run these other Documents to the same lifecycle stage

- // as this frame.

+ // WebView plugins need to update regardless of whether the

+ // LayoutEmbeddedObject that owns them needed layout.

+ // TODO(leviw): This currently runs the entire lifecycle on plugin WebViews.

+ // We should have a way to only run these other Documents to the same

+ // lifecycle stage as this frame.

const ChildrenWidgetSet* viewChildren = children();

for (const Member<Widget>& child : *viewChildren) {

if ((*child).isPluginContainer())

@@ -2880,8 +2929,9 @@ void FrameView::updateStyleAndLayoutIfNeededRecursiveInternal() {

checkDoesNotNeedLayout();

- // When SVG filters are invalidated using Document::scheduleSVGFilterLayerUpdateHack() they may trigger an

- // extra style recalc. See PaintLayer::filterNeedsPaintInvalidation().

+ // When SVG filters are invalidated using

+ // Document::scheduleSVGFilterLayerUpdateHack() they may trigger an extra

+ // style recalc. See PaintLayer::filterNeedsPaintInvalidation().

if (m_frame->document()->hasSVGFilterElementsRequiringLayerUpdate()) {

m_frame->document()->updateStyleAndLayoutTree();

@@ -2889,7 +2939,8 @@ void FrameView::updateStyleAndLayoutIfNeededRecursiveInternal() {

layout();

}

- // These asserts ensure that parent frames are clean, when child frames finished updating layout and style.

+ // These asserts ensure that parent frames are clean, when child frames

+ // finished updating layout and style.

checkDoesNotNeedLayout();

ASSERT(!m_frame->document()->hasSVGFilterElementsRequiringLayerUpdate());

#if ENABLE(ASSERT)

@@ -2917,8 +2968,8 @@ void FrameView::invalidateTreeIfNeededRecursiveInternal() {

DCHECK(!RuntimeEnabledFeatures::slimmingPaintV2Enabled());

CHECK(layoutView());

- // We need to stop recursing here since a child frame view might not be throttled

- // even though we are (e.g., it didn't compute its visibility yet).

+ // We need to stop recursing here since a child frame view might not be

+ // throttled even though we are (e.g., it didn't compute its visibility yet).

if (shouldThrottleRendering())

return;

TRACE_EVENT1("blink", "FrameView::invalidateTreeIfNeededRecursive", "root",

@@ -2931,11 +2982,12 @@ void FrameView::invalidateTreeIfNeededRecursiveInternal() {

if (lifecycle().state() < DocumentLifecycle::PaintInvalidationClean)

invalidateTreeIfNeeded(rootPaintInvalidationState);

- // Some frames may be not reached during the above invalidateTreeIfNeeded because

+ // Some frames may be not reached during the above invalidateTreeIfNeeded

+ // because

// - the frame is a detached frame; or

// - it didn't need paint invalidation.

- // We need to call invalidateTreeIfNeededRecursive() for such frames to finish required

- // paint invalidation and advance their life cycle state.

+ // We need to call invalidateTreeIfNeededRecursive() for such frames to finish

+ // required paint invalidation and advance their life cycle state.

for (Frame* child = m_frame->tree().firstChild(); child;

child = child->tree().nextSibling()) {

if (child->isLocalFrame()) {

@@ -2949,7 +3001,8 @@ void FrameView::invalidateTreeIfNeededRecursiveInternal() {

}

- // Process objects needing paint invalidation on the next frame. See the definition of PaintInvalidationDelayedFull for more details.

+ // Process objects needing paint invalidation on the next frame. See the

+ // definition of PaintInvalidationDelayedFull for more details.

for (auto& target : pendingDelayedPaintInvalidations)

target->getMutableForPainting().setShouldDoFullPaintInvalidation(

PaintInvalidationDelayedFull);

@@ -2984,8 +3037,8 @@ void FrameView::disableAutoSizeMode() {

void FrameView::forceLayoutForPagination(const FloatSize& pageSize,

const FloatSize& originalPageSize,

float maximumShrinkFactor) {

- // Dumping externalRepresentation(m_frame->layoutObject()).ascii() is a good trick to see

- // the state of things before and after the layout

+ // Dumping externalRepresentation(m_frame->layoutObject()).ascii() is a good

+ // trick to see the state of things before and after the layout

if (LayoutView* layoutView = this->layoutView()) {

float pageLogicalWidth = layoutView->style()->isHorizontalWritingMode()

? pageSize.width()

@@ -3004,10 +3057,11 @@ void FrameView::forceLayoutForPagination(const FloatSize& pageSize,

LayoutInvalidationReason::PrintingChanged);

layout();

- // If we don't fit in the given page width, we'll lay out again. If we don't fit in the

- // page width when shrunk, we will lay out at maximum shrink and clip extra content.

- // FIXME: We are assuming a shrink-to-fit printing implementation. A cropping

- // implementation should not do this!

+ // If we don't fit in the given page width, we'll lay out again. If we don't

+ // fit in the page width when shrunk, we will lay out at maximum shrink and

+ // clip extra content.

+ // FIXME: We are assuming a shrink-to-fit printing implementation. A

+ // cropping implementation should not do this!

bool horizontalWritingMode = layoutView->style()->isHorizontalWritingMode();

const LayoutRect& documentRect = LayoutRect(layoutView->documentRect());

LayoutUnit docLogicalWidth =

@@ -3082,8 +3136,8 @@ IntRect FrameView::convertToLayoutObject(const LayoutObject& layoutObject,

// Convert from FrameView coords into page ("absolute") coordinates.

rectInContent.moveBy(scrollPosition());

- // FIXME: we don't have a way to map an absolute rect down to a local quad, so just

- // move the rect for now.

+ // FIXME: we don't have a way to map an absolute rect down to a local quad, so

+ // just move the rect for now.

rectInContent.setLocation(roundedIntPoint(

layoutObject.absoluteToLocal(rectInContent.location(), UseTransforms)));

return rectInContent;

@@ -3379,7 +3433,8 @@ void FrameView::setTopControlsViewportAdjustment(float adjustment) {

IntPoint FrameView::maximumScrollPosition() const {

// Make the same calculation as in CC's LayerImpl::MaxScrollOffset()

- // FIXME: We probably shouldn't be storing the bounds in a float. crbug.com/422331.

+ // FIXME: We probably shouldn't be storing the bounds in a float.

+ // crbug.com/422331.

IntSize visibleSize =

visibleContentSize(ExcludeScrollbars) + topControlsSize();

IntSize contentBounds = contentsSize();

@@ -3451,8 +3506,8 @@ void FrameView::setScrollbarModes(ScrollbarMode horizontalMode,

bool verticalLock) {

bool needsUpdate = false;

- // If the page's overflow setting has disabled scrolling, do not allow anything to override that setting.

- // http://crbug.com/426447

+ // If the page's overflow setting has disabled scrolling, do not allow

+ // anything to override that setting, http://crbug.com/426447

LayoutObject* viewport = viewportLayoutObject();

if (viewport && !shouldIgnoreOverflowHidden()) {

if (viewport->style()->overflowX() == OverflowHidden)

@@ -3720,8 +3775,8 @@ void FrameView::updateScrollbarGeometry() {

IntRect FrameView::adjustScrollbarRectForResizer(const IntRect& rect,

Scrollbar& scrollbar) {

- // Get our window resizer rect and see if we overlap. Adjust to avoid the overlap

- // if necessary.

+ // Get our window resizer rect and see if we overlap. Adjust to avoid the

+ // overlap if necessary.

IntRect adjustedRect(rect);

bool overlapsResizer = false;

if (!rect.isEmpty() && !windowResizerRect().isEmpty()) {

@@ -3753,9 +3808,10 @@ bool FrameView::adjustScrollbarExistence(

ComputeScrollbarExistenceOption option) {

ASSERT(m_inUpdateScrollbars);

- // If we came in here with the view already needing a layout, then go ahead and do that

- // first. (This will be the common case, e.g., when the page changes due to window resizing for example).

- // This layout will not re-enter updateScrollbars and does not count towards our max layout pass total.

+ // If we came in here with the view already needing a layout, then go ahead

+ // and do that first. (This will be the common case, e.g., when the page

+ // changes due to window resizing for example). This layout will not re-enter

+ // updateScrollbars and does not count towards our max layout pass total.

if (!m_scrollbarsSuppressed)

scrollbarExistenceDidChange();

@@ -3849,7 +3905,8 @@ void FrameView::updateScrollbars() {

updateScrollbarGeometry();

if (scrollbarExistenceChanged) {

- // FIXME: Is frameRectsChanged really necessary here? Have any frame rects changed?

+ // FIXME: Is frameRectsChanged really necessary here? Have any frame rects

+ // changed?

frameRectsChanged();

positionScrollbarLayers();

updateScrollCorner();

@@ -3892,7 +3949,8 @@ void FrameView::scrollContents(const IntSize& scrollDelta) {

if (!scrollContentsFastPath(-scrollDelta))

scrollContentsSlowPath();

- // This call will move children with native widgets (plugins) and invalidate them as well.

+ // This call will move children with native widgets (plugins) and invalidate

+ // them as well.

frameRectsChanged();

}

@@ -4006,8 +4064,8 @@ void FrameView::adjustScrollbarsAvoidingResizerCount(int overlapDelta) {

toFrameView(parent())->adjustScrollbarsAvoidingResizerCount(overlapDelta);

} else if (!scrollbarsSuppressed()) {

// If we went from n to 0 or from 0 to n and we're the outermost view,

- // we need to invalidate the windowResizerRect(), since it will now need to paint

- // differently.

+ // we need to invalidate the windowResizerRect(), since it will now need to

+ // paint differently.

if ((oldCount > 0 && m_scrollbarsAvoidingResizer == 0) ||

(oldCount == 0 && m_scrollbarsAvoidingResizer > 0))

invalidateRect(windowResizerRect());

@@ -4100,7 +4158,8 @@ LayoutRect FrameView::scrollIntoView(const LayoutRect& rectInContent,

if (exposeRect != viewRect)

setScrollPosition(DoublePoint(exposeRect.x(), exposeRect.y()), scrollType);

- // Scrolling the FrameView cannot change the input rect's location relative to the document.

+ // Scrolling the FrameView cannot change the input rect's location relative to

+ // the document.

return rectInContent;

}

@@ -4246,7 +4305,8 @@ void FrameView::setParentVisible(bool visible) {

if (isParentVisible() == visible)

return;

- // As parent visibility changes, we may need to recomposite this frame view and potentially child frame views.

+ // As parent visibility changes, we may need to recomposite this frame view

+ // and potentially child frame views.

setNeedsCompositingUpdate(layoutViewItem(), CompositingUpdateRebuildTree);

Widget::setParentVisible(visible);

@@ -4366,7 +4426,8 @@ void FrameView::updateViewportIntersectionIfNeeded() {

parent->shouldThrottleRendering());

m_viewportIntersection = parent->contentsToRootFrame(frameRect());

- // TODO(skyostil): Expand the viewport to make it less likely to see stale content while scrolling.

+ // TODO(skyostil): Expand the viewport to make it less likely to see stale

+ // content while scrolling.

IntRect viewport = parent->m_viewportIntersection;

m_viewportIntersection.intersect(viewport);

}

@@ -4470,7 +4531,8 @@ void FrameView::notifyRenderThrottlingObservers() {

});

}

if (becameUnthrottled) {

- // ScrollingCoordinator needs to update according to the new throttling status.

+ // ScrollingCoordinator needs to update according to the new throttling

+ // status.

if (scrollingCoordinator)

scrollingCoordinator->notifyGeometryChanged();

// Start ticking animation frames again if necessary.