| Index: Source/core/frame/FrameView.cpp
|
| diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
|
| index 0050490fac93682abca0ce862b18eb53473cb280..2c96665c5447cd37064b38c161cc75fd94fb2a92 100644
|
| --- a/Source/core/frame/FrameView.cpp
|
| +++ b/Source/core/frame/FrameView.cpp
|
| @@ -975,14 +975,14 @@ void FrameView::layout(bool allowSubtree)
|
| // See http://crbug.com/306706
|
| void FrameView::invalidateTreeIfNeeded()
|
| {
|
| - RenderObject* rootForPaintInvalidation = renderView();
|
| + RenderView& rootForPaintInvalidation = *renderView();
|
| ASSERT(!rootForPaintInvalidation->needsLayout());
|
|
|
| - TRACE_EVENT1("blink", "FrameView::invalidateTree", "root", rootForPaintInvalidation->debugName().ascii());
|
| + TRACE_EVENT1("blink", "FrameView::invalidateTree", "root", rootForPaintInvalidation.debugName().ascii());
|
|
|
| - PaintInvalidationState rootPaintInvalidationState(*rootForPaintInvalidation);
|
| + PaintInvalidationState rootPaintInvalidationState(rootForPaintInvalidation);
|
|
|
| - rootForPaintInvalidation->invalidateTreeIfNeeded(rootPaintInvalidationState);
|
| + rootForPaintInvalidation.invalidateTreeIfNeeded(rootPaintInvalidationState);
|
|
|
| // Invalidate the paint of the frameviews scrollbars if needed
|
| if (hasVerticalBarDamage())
|
| @@ -1612,7 +1612,7 @@ HostWindow* FrameView::hostWindow() const
|
| void FrameView::contentRectangleForPaintInvalidation(const IntRect& r)
|
| {
|
| ASSERT(paintInvalidationIsAllowed());
|
| - ASSERT(!m_frame->owner());
|
| + ASSERT(!m_frame->ownerRenderer());
|
|
|
| if (m_isTrackingPaintInvalidations) {
|
| IntRect paintInvalidationRect = r;
|
|
|