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

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

Issue 2213553002: Delete FrameView::rectToCopyOnScroll. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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/FrameView.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
index 4784dd7466c71d63bfc859a221047804fdb73f04..cc8c55364684078cd0f94e074d8f9dd5ef979754 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -1462,7 +1462,7 @@ bool FrameView::scrollContentsFastPath(const IntSize& scrollDelta)
return true;
}
-void FrameView::scrollContentsSlowPath(const IntRect& updateRect)
+void FrameView::scrollContentsSlowPath()
{
TRACE_EVENT0("blink", "FrameView::scrollContentsSlowPath");
// We need full invalidation during slow scrolling. For slimming paint, full invalidation
@@ -1493,8 +1493,6 @@ void FrameView::scrollContentsSlowPath(const IntRect& updateRect)
return;
}
}
-
- getHostWindow()->invalidateRect(updateRect);
}
void FrameView::restoreScrollbar()
@@ -2186,15 +2184,6 @@ void FrameView::updateCounters()
}
}
-IntRect FrameView::windowClipRect(IncludeScrollbarsInRect scrollbarInclusion) const
-{
- ASSERT(m_frame->view() == this);
-
- LayoutRect clipRect(LayoutPoint(), LayoutSize(visibleContentSize(scrollbarInclusion)));
- layoutViewItem().mapToVisualRectInAncestorSpace(&layoutView()->containerForPaintInvalidation(), clipRect);
- return enclosingIntRect(clipRect);
-}
-
bool FrameView::shouldUseIntegerScrollOffset() const
{
if (m_frame->settings() && !m_frame->settings()->preferCompositingToLCDTextEnabled())
@@ -3660,19 +3649,6 @@ void FrameView::adjustScrollPositionFromUpdateScrollbars()
}
}
-IntRect FrameView::rectToCopyOnScroll() const
-{
- IntRect scrollViewRect = convertToRootFrame(IntRect((shouldPlaceVerticalScrollbarOnLeft() && verticalScrollbar()) ? verticalScrollbar()->width() : 0, 0, visibleWidth(), visibleHeight()));
- if (hasOverlayScrollbars()) {
- int verticalScrollbarWidth = (verticalScrollbar() && !hasLayerForVerticalScrollbar()) ? verticalScrollbar()->width() : 0;
- int horizontalScrollbarHeight = (horizontalScrollbar() && !hasLayerForHorizontalScrollbar()) ? horizontalScrollbar()->height() : 0;
-
- scrollViewRect.setWidth(scrollViewRect.width() - verticalScrollbarWidth);
- scrollViewRect.setHeight(scrollViewRect.height() - horizontalScrollbarHeight);
- }
- return scrollViewRect;
-}
-
void FrameView::scrollContentsIfNeeded()
{
if (m_pendingScrollDelta.isZero())
@@ -3691,12 +3667,8 @@ void FrameView::scrollContents(const IntSize& scrollDelta)
TRACE_EVENT0("blink", "FrameView::scrollContents");
- IntRect clipRect = windowClipRect();
- IntRect updateRect = clipRect;
- updateRect.intersect(rectToCopyOnScroll());
-
if (!scrollContentsFastPath(-scrollDelta))
- scrollContentsSlowPath(updateRect);
+ scrollContentsSlowPath();
// This call will move children with native widgets (plugins) and invalidate them as well.
frameRectsChanged();
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameView.h ('k') | third_party/WebKit/Source/web/tests/TouchActionTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698