Index: Source/core/frame/FrameView.cpp |
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp |
index 82651f985500ae70882547b9d4dad3a933c3beaf..5a8f5fcadf66abc23ca634b5f24bfac47d7f3f30 100644 |
--- a/Source/core/frame/FrameView.cpp |
+++ b/Source/core/frame/FrameView.cpp |
@@ -128,6 +128,7 @@ FrameView::FrameView(LocalFrame* frame) |
, m_didScrollTimer(this, &FrameView::didScrollTimerFired) |
, m_topControlsViewportAdjustment(0) |
, m_needsUpdateWidgetPositions(false) |
+ , m_needsUpdateViewportVisibility(true) |
#if ENABLE(ASSERT) |
, m_hasBeenDisposed(false) |
#endif |
@@ -140,7 +141,8 @@ FrameView::FrameView(LocalFrame* frame) |
, m_inUpdateScrollbars(false) |
, m_clipsRepaints(true) |
, m_frameTimingRequestsDirty(true) |
- |
+ , m_viewportVisibility(ViewportVisibility::Visible) |
+ , m_securityOriginStatusForThrottling(SecurityOriginStatus::IsSameOrigin) |
{ |
ASSERT(m_frame); |
init(); |
@@ -1090,6 +1092,9 @@ void FrameView::layout() |
// See http://crbug.com/306706 |
void FrameView::invalidateTreeIfNeeded(PaintInvalidationState& paintInvalidationState) |
{ |
+ if (shouldThrottleRenderingPipeline()) |
+ return; |
+ |
lifecycle().advanceTo(DocumentLifecycle::InPaintInvalidation); |
ASSERT(layoutView()); |
@@ -1303,6 +1308,8 @@ bool FrameView::shouldSetCursor() const |
void FrameView::scrollContentsIfNeededRecursive() |
{ |
+ if (shouldThrottleStyleLayoutAndCompositingUpdates()) |
+ return; |
scrollContentsIfNeeded(); |
for (Frame* child = m_frame->tree().firstChild(); child; child = child->tree().nextSibling()) { |
@@ -1313,6 +1320,17 @@ void FrameView::scrollContentsIfNeededRecursive() |
} |
} |
+void FrameView::setLifecycleThrottlingModeForSubtree(DocumentLifecycle::ThrottlingMode throttlingMode) |
+{ |
+ ASSERT(m_frame->isLocalRoot()); |
+ for (Frame* frame = m_frame.get(); frame; frame = frame->tree().traverseNext(m_frame.get())) { |
+ if (!frame->isLocalFrame()) |
+ continue; |
+ if (FrameView* view = toLocalFrame(frame)->view()) |
+ view->lifecycle().setThrottlingMode(throttlingMode); |
+ } |
+} |
+ |
bool FrameView::invalidateViewportConstrainedObjects() |
{ |
for (const auto& viewportConstrainedObject : *m_viewportConstrainedObjects) { |
@@ -2427,18 +2445,18 @@ void FrameView::updateWidgetPositionsIfNeeded() |
updateWidgetPositions(); |
} |
-void FrameView::updateAllLifecyclePhases() |
+void FrameView::updateAllLifecyclePhases(DocumentLifecycle::ThrottlingMode throttlingMode) |
{ |
- frame().localFrameRoot()->view()->updateLifecyclePhasesInternal(AllPhases); |
+ frame().localFrameRoot()->view()->updateLifecyclePhasesInternal(AllPhases, throttlingMode); |
} |
// TODO(chrishtr): add a scrolling update lifecycle phase. |
-void FrameView::updateLifecycleToCompositingCleanPlusScrolling() |
+void FrameView::updateLifecycleToCompositingCleanPlusScrolling(DocumentLifecycle::ThrottlingMode throttlingMode) |
{ |
- frame().localFrameRoot()->view()->updateLifecyclePhasesInternal(OnlyUpToCompositingCleanPlusScrolling); |
+ frame().localFrameRoot()->view()->updateLifecyclePhasesInternal(OnlyUpToCompositingCleanPlusScrolling, throttlingMode); |
} |
-void FrameView::updateLifecyclePhasesInternal(LifeCycleUpdateOption phases) |
+void FrameView::updateLifecyclePhasesInternal(LifeCycleUpdateOption phases, DocumentLifecycle::ThrottlingMode throttlingMode) |
{ |
// This must be called from the root frame, since it recurses down, not up. |
// Otherwise the lifecycles of the frames might be out of sync. |
@@ -2447,6 +2465,7 @@ void FrameView::updateLifecyclePhasesInternal(LifeCycleUpdateOption phases) |
// Updating layout can run script, which can tear down the FrameView. |
RefPtrWillBeRawPtr<FrameView> protector(this); |
+ setLifecycleThrottlingModeForSubtree(throttlingMode); |
updateStyleAndLayoutIfNeededRecursive(); |
if (LayoutView* view = layoutView()) { |
@@ -2543,6 +2562,9 @@ void FrameView::updateFrameTimingRequestsIfNeeded() |
void FrameView::updateStyleAndLayoutIfNeededRecursive() |
{ |
+ if (shouldThrottleStyleLayoutAndCompositingUpdates()) |
+ return; |
+ |
// 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 |
@@ -2594,6 +2616,11 @@ void FrameView::updateStyleAndLayoutIfNeededRecursive() |
void FrameView::invalidateTreeIfNeededRecursive() |
{ |
ASSERT(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). |
+ if (shouldThrottleRenderingPipeline()) |
+ return; |
TRACE_EVENT1("blink", "FrameView::invalidateTreeIfNeededRecursive", "root", layoutView()->debugName().ascii()); |
Vector<LayoutObject*> pendingDelayedPaintInvalidations; |
@@ -2920,6 +2947,7 @@ void FrameView::setParent(Widget* parentView) |
toFrameView(parent())->adjustScrollbarsAvoidingResizerCount(m_scrollbarsAvoidingResizer); |
updateScrollableAreaSet(); |
+ m_needsUpdateViewportVisibility = true; |
} |
void FrameView::removeChild(Widget* child) |
@@ -2977,6 +3005,7 @@ void FrameView::frameRectsChanged() |
if (layoutSizeFixedToFrameSize()) |
setLayoutSizeInternal(frameRect().size()); |
+ m_needsUpdateViewportVisibility = true; |
for (const auto& child : m_children) |
child->frameRectsChanged(); |
} |
@@ -3767,11 +3796,15 @@ void FrameView::paint(GraphicsContext* context, const IntRect& rect) |
void FrameView::paint(GraphicsContext* context, const GlobalPaintFlags globalPaintFlags, const IntRect& rect) |
{ |
+ if (shouldThrottleRenderingPipeline()) |
chrishtr
2015/09/04 17:32:04
Add a TODO to get rid of this in favor of painting
Sami
2015/09/07 17:27:16
Done.
|
+ return; |
FramePainter(*this).paint(context, globalPaintFlags, rect); |
} |
void FrameView::paintContents(GraphicsContext* context, const GlobalPaintFlags globalPaintFlags, const IntRect& damageRect) |
{ |
+ if (shouldThrottleRenderingPipeline()) |
+ return; |
FramePainter(*this).paintContents(context, globalPaintFlags, damageRect); |
} |
@@ -3959,6 +3992,9 @@ void FrameView::collectFrameTimingRequests(GraphicsLayerFrameTimingRequests& gra |
LocalFrame* localFrame = toLocalFrame(frame); |
LayoutRect viewRect = localFrame->contentLayoutObject()->viewRect(); |
const LayoutBoxModelObject* paintInvalidationContainer = localFrame->contentLayoutObject()->containerForPaintInvalidation(); |
+ // If the frame is being throttled, its compositing state may not be up to date. |
+ if (!paintInvalidationContainer->enclosingLayer()->isAllowedToQueryCompositingState()) |
+ return; |
const GraphicsLayer* graphicsLayer = paintInvalidationContainer->enclosingLayer()->graphicsLayerBacking(); |
if (!graphicsLayer) |
@@ -3969,4 +4005,100 @@ void FrameView::collectFrameTimingRequests(GraphicsLayerFrameTimingRequests& gra |
graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, WebRect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosingIntRect(viewRect))); |
} |
+void FrameView::updateViewportVisibilityIfNeeded() |
+{ |
+ // TODO(skyostil): Replace this with an intersection observer. |
+ ASSERT(shouldThrottleRenderingPipeline() || lifecycle().state() >= DocumentLifecycle::PaintInvalidationClean); |
+ if (!m_needsUpdateViewportVisibility) |
+ return; |
+ |
+ // Our frame's bounds in our parent's content coordinates. |
+ m_clippedBounds = frameRect(); |
+ m_viewportVisibility = ViewportVisibility::Visible; |
+ m_needsUpdateViewportVisibility = false; |
+ |
+ FrameView* parent = parentFrameView(); |
+ if (!parent) |
+ return; |
+ ASSERT(!parent->m_needsUpdateViewportVisibility); |
+ |
+ // If our parent is hidden, then we are too. |
+ if (parent->m_viewportVisibility == ViewportVisibility::Hidden) { |
+ m_viewportVisibility = ViewportVisibility::Hidden; |
+ return; |
+ } |
+ |
+ // Transform our bounds into the root frame's content coordinate space. |
+ m_clippedBounds = parent->contentsToRootFrame(m_clippedBounds); |
+ |
+ // TODO(skyostil): Expand the viewport to make it less likely to see stale content while scrolling. |
+ IntRect viewport = parent->m_clippedBounds; |
+ m_clippedBounds.intersect(viewport); |
+ |
+ // If our bounds got clipped away, we are invisible. |
+ if (m_clippedBounds.isEmpty()) |
+ m_viewportVisibility = ViewportVisibility::Hidden; |
+} |
+ |
+void FrameView::updateThrottling() |
+{ |
+ ASSERT(m_frame->isLocalRoot()); |
+ updateThrottlingRecursive(SecurityOriginStatus::IsSameOrigin); |
+} |
+ |
+void FrameView::updateThrottlingRecursive(SecurityOriginStatus securityOriginStatus) |
+{ |
+ ASSERT(!isInPerformLayout()); |
+ ASSERT(shouldThrottleRenderingPipeline() || lifecycle().state() >= DocumentLifecycle::PaintInvalidationClean); |
+ bool wasThrottled = shouldThrottleRenderingPipeline(); |
+ |
+ updateViewportVisibilityIfNeeded(); |
+ |
+ // We only throttle the rendering pipeline in cross-origin frames. This is |
+ // to avoid a situation where an ancestor frame directly depends on the |
+ // pipeline timing of a descendant and breaks as a result of throttling. |
+ // The rationale is that cross-origin frames must already communicate with |
+ // asynchronous messages, they should be able to tolerate some delay in |
+ // receiving replies from a throttled peer. |
+ // |
+ // Check if we can access our parent's security origin. As an optimization |
+ // only do this if we are invisible. |
+ if (securityOriginStatus == SecurityOriginStatus::IsSameOrigin |
+ && parentFrameView() && m_viewportVisibility == ViewportVisibility::Hidden) { |
+ const SecurityOrigin* origin = frame().securityContext()->securityOrigin(); |
+ const SecurityOrigin* parentOrigin = parentFrameView()->frame().securityContext()->securityOrigin(); |
+ if (!origin->canAccess(parentOrigin)) |
+ securityOriginStatus = SecurityOriginStatus::IsCrossOrigin; |
+ } |
+ // FIXME: Always throttle for testing. |
+ securityOriginStatus = SecurityOriginStatus::IsCrossOrigin; |
+ m_securityOriginStatusForThrottling = securityOriginStatus; |
+ |
+ bool becameUnthrottled = wasThrottled && !shouldThrottleRenderingPipeline(); |
+ if (becameUnthrottled) |
+ page()->animator().scheduleVisualUpdate(m_frame.get()); |
+ |
+ for (Frame* child = m_frame->tree().firstChild(); child; child = child->tree().nextSibling()) { |
+ if (!child->isLocalFrame()) |
+ continue; |
+ if (FrameView* view = toLocalFrame(child)->view()) |
+ view->updateThrottlingRecursive(securityOriginStatus); |
+ } |
+} |
+ |
+bool FrameView::shouldThrottleStyleLayoutAndCompositingUpdates() const |
+{ |
+ return lifecycle().throttlingMode() == DocumentLifecycle::ThrottlingMode::Allow |
+ && shouldThrottleRenderingPipeline(); |
+} |
+ |
+bool FrameView::shouldThrottleRenderingPipeline() const |
+{ |
+ // FIXME: Ignore for layout testing |
+ //if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled()) |
+ //return false; |
+ return m_viewportVisibility == ViewportVisibility::Hidden |
+ && m_securityOriginStatusForThrottling == SecurityOriginStatus::IsCrossOrigin; |
+} |
+ |
} // namespace blink |