Chromium Code Reviews| Index: Source/core/frame/FrameView.cpp |
| diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp |
| index 4531ee4e637ff563196e553b7d56f66621303165..33a02b9964f80a8347189cdaec56d338d77ff802 100644 |
| --- a/Source/core/frame/FrameView.cpp |
| +++ b/Source/core/frame/FrameView.cpp |
| @@ -1161,7 +1161,7 @@ bool FrameView::useSlowRepaints(bool considerOverlap) const |
| // The chromium compositor does not support scrolling a non-composited frame within a composited page through |
| // the fast scrolling path, so force slow scrolling in that case. |
| - if (m_frame->owner() && !hasCompositedContent() && m_frame->page() && m_frame->page()->mainFrame()->isLocalFrame() && m_frame->page()->deprecatedLocalMainFrame()->view()->hasCompositedContent()) |
| + if (m_frame->owner() && !hasCompositedContent() && m_frame->page() && m_frame->localFrameRoot()->view()->hasCompositedContent()) |
|
eseidel
2014/07/11 16:33:03
Folks more active in the compositor or repaint sys
|
| return true; |
| if (m_isOverlapped && considerOverlap) |
| @@ -2815,7 +2815,7 @@ void FrameView::updateLayoutAndStyleForPainting() |
| view->compositor()->updateIfNeededRecursive(); |
| - if (view->compositor()->inCompositingMode() && m_frame->isMainFrame()) |
| + if (view->compositor()->inCompositingMode() && m_frame->isLocalRoot()) |
| m_frame->page()->scrollingCoordinator()->updateAfterCompositingChangeIfNeeded(); |
| updateCompositedSelectionBoundsIfNeeded(); |