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

Unified Diff: Source/core/paint/FramePainter.cpp

Issue 1093383003: Remove mainthread overhang painting code (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 8 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
« no previous file with comments | « Source/core/paint/FramePainter.h ('k') | Source/platform/scroll/ScrollableArea.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/paint/FramePainter.cpp
diff --git a/Source/core/paint/FramePainter.cpp b/Source/core/paint/FramePainter.cpp
index 228000edd3f6fdfb3b9812f54f6b2791083e23ee..2201f215ab87410c2ee86f29d272b0ade3a197ae 100644
--- a/Source/core/paint/FramePainter.cpp
+++ b/Source/core/paint/FramePainter.cpp
@@ -46,8 +46,6 @@ void FramePainter::paint(GraphicsContext* context, const IntRect& rect)
paintContents(context, documentDirtyRect);
}
- calculateAndPaintOverhangAreas(context, rect);
-
// Now paint the scrollbars.
if (!m_frameView.scrollbarsSuppressed() && (m_frameView.horizontalScrollbar() || m_frameView.verticalScrollbar())) {
IntRect scrollViewDirtyRect = rect;
@@ -206,33 +204,4 @@ void FramePainter::paintScrollbar(GraphicsContext* context, Scrollbar* bar, cons
bar->paint(context, rect);
}
-void FramePainter::paintOverhangAreas(GraphicsContext* context, const IntRect& horizontalOverhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect)
-{
- if (m_frameView.frame().document()->printing())
- return;
-
- if (m_frameView.frame().isMainFrame()) {
- if (m_frameView.frame().page()->chrome().client().paintCustomOverhangArea(context, horizontalOverhangArea, verticalOverhangArea, dirtyRect))
- return;
- }
-
- paintOverhangAreasInternal(context, horizontalOverhangArea, verticalOverhangArea, dirtyRect);
-}
-
-void FramePainter::paintOverhangAreasInternal(GraphicsContext* context, const IntRect& horizontalOverhangRect, const IntRect& verticalOverhangRect, const IntRect& dirtyRect)
-{
- ScrollbarTheme::theme()->paintOverhangBackground(context, horizontalOverhangRect, verticalOverhangRect, dirtyRect);
- ScrollbarTheme::theme()->paintOverhangShadows(context, m_frameView.scrollOffset(), horizontalOverhangRect, verticalOverhangRect, dirtyRect);
-}
-
-void FramePainter::calculateAndPaintOverhangAreas(GraphicsContext* context, const IntRect& dirtyRect)
-{
- IntRect horizontalOverhangRect;
- IntRect verticalOverhangRect;
- m_frameView.calculateOverhangAreasForPainting(horizontalOverhangRect, verticalOverhangRect);
-
- if (dirtyRect.intersects(horizontalOverhangRect) || dirtyRect.intersects(verticalOverhangRect))
- paintOverhangAreas(context, horizontalOverhangRect, verticalOverhangRect, dirtyRect);
-}
-
} // namespace blink
« no previous file with comments | « Source/core/paint/FramePainter.h ('k') | Source/platform/scroll/ScrollableArea.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698