| Index: sky/engine/core/frame/FrameView.cpp
|
| diff --git a/sky/engine/core/frame/FrameView.cpp b/sky/engine/core/frame/FrameView.cpp
|
| index 5ff554bfe60b666ba53dc2b55056a62d6cad1fae..5db4c925a9a6e45e4ab2c04b24fa9e7788f1aa25 100644
|
| --- a/sky/engine/core/frame/FrameView.cpp
|
| +++ b/sky/engine/core/frame/FrameView.cpp
|
| @@ -75,7 +75,6 @@ FrameView::FrameView(LocalFrame* frame)
|
| , m_mediaType("screen")
|
| , m_overflowStatusDirty(true)
|
| , m_viewportRenderer(0)
|
| - , m_isTrackingPaintInvalidations(false)
|
| , m_hasSoftwareFilters(false)
|
| , m_visibleContentScaleFactor(1)
|
| , m_inputEventsScaleFactorForEmulation(1)
|
| @@ -123,8 +122,6 @@ void FrameView::reset()
|
| m_firstLayout = true;
|
| m_firstLayoutCallbackPending = false;
|
| m_lastViewportSize = IntSize();
|
| - m_isTrackingPaintInvalidations = false;
|
| - m_trackedPaintInvalidationRects.clear();
|
| m_lastPaintTime = 0;
|
| m_isPainting = false;
|
| }
|
| @@ -479,14 +476,6 @@ void FrameView::contentRectangleForPaintInvalidation(const IntRect& r)
|
| {
|
| ASSERT(paintInvalidationIsAllowed());
|
|
|
| - if (m_isTrackingPaintInvalidations) {
|
| - m_trackedPaintInvalidationRects.append(r);
|
| - // 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 = r;
|
| if (clipsPaintInvalidations() && !paintsEntireContents())
|
| paintRect.intersect(visibleContentRect());
|
| @@ -913,36 +902,6 @@ IntPoint FrameView::convertToRenderer(const RenderObject& renderer, const IntPoi
|
| return roundedIntPoint(renderer.absoluteToLocal(viewPoint, UseTransforms));
|
| }
|
|
|
| -void FrameView::setTracksPaintInvalidations(bool trackPaintInvalidations)
|
| -{
|
| - // FIXME(sky): Does this code work anymore now that we don't have the compositor?
|
| - if (trackPaintInvalidations == m_isTrackingPaintInvalidations)
|
| - return;
|
| -
|
| - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"),
|
| - "FrameView::setTracksPaintInvalidations", TRACE_EVENT_SCOPE_PROCESS, "enabled", trackPaintInvalidations);
|
| -
|
| - resetTrackedPaintInvalidations();
|
| - m_isTrackingPaintInvalidations = trackPaintInvalidations;
|
| -}
|
| -
|
| -void FrameView::resetTrackedPaintInvalidations()
|
| -{
|
| - m_trackedPaintInvalidationRects.clear();
|
| -}
|
| -
|
| -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::addScrollableArea(ScrollableArea* scrollableArea)
|
| {
|
| ASSERT(scrollableArea);
|
|
|