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

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

Issue 1309243006: Remove old repaint rect tracking from FrameView. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 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/frame/FrameView.h ('k') | Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/FrameView.cpp
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
index cdfa3a72851e8005b125f67f28d907238286c97d..9caf225bb77acce7292be30a32dc0e55351a5973 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -207,7 +207,6 @@ void FrameView::reset()
m_lastViewportSize = IntSize();
m_lastZoomFactor = 1.0f;
m_isTrackingPaintInvalidations = false;
- m_trackedPaintInvalidationRects.clear();
m_lastPaintTime = 0;
m_isPainting = false;
m_visuallyNonEmptyCharacterCount = 0;
@@ -1654,14 +1653,6 @@ void FrameView::contentRectangleForPaintInvalidation(const IntRect& rectInConten
{
ASSERT(!m_frame->ownerLayoutObject());
- if (m_isTrackingPaintInvalidations) {
- m_trackedPaintInvalidationRects.append(contentsToFrame(rectInContent));
- // FIXME: http://crbug.com/368518. Eventually, invalidateContentRectangleForPaint
- // is going away entirely once all layout tests are FCM. In the short
- // term, no code should be tracking non-composited FrameView paint invalidations.
- RELEASE_ASSERT_NOT_REACHED();
- }
-
IntRect paintRect = rectInContent;
if (clipsPaintInvalidations())
paintRect.intersect(visibleContentRect());
@@ -2844,23 +2835,10 @@ void FrameView::setTracksPaintInvalidations(bool trackPaintInvalidations)
void FrameView::resetTrackedPaintInvalidations()
{
- m_trackedPaintInvalidationRects.clear();
if (LayoutView* layoutView = this->layoutView())
layoutView->compositor()->resetTrackedPaintInvalidationRects();
}
-String FrameView::trackedPaintInvalidationRectsAsText() const
-{
- TextStream ts;
- if (!m_trackedPaintInvalidationRects.isEmpty()) {
- ts << "(repaint rects\n";
- for (size_t i = 0; i < m_trackedPaintInvalidationRects.size(); ++i)
- ts << " (rect " << m_trackedPaintInvalidationRects[i].x() << " " << m_trackedPaintInvalidationRects[i].y() << " " << m_trackedPaintInvalidationRects[i].width() << " " << m_trackedPaintInvalidationRects[i].height() << ")\n";
- ts << ")\n";
- }
- return ts.release();
-}
-
void FrameView::addResizerArea(LayoutBox& resizerBox)
{
if (!m_resizerAreas)
« no previous file with comments | « Source/core/frame/FrameView.h ('k') | Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698