| Index: sky/engine/core/frame/FrameView.cpp
|
| diff --git a/sky/engine/core/frame/FrameView.cpp b/sky/engine/core/frame/FrameView.cpp
|
| index 49f5ab0f4dba30bb9930159d328a2389b0c4abf3..73ee56486a5dca672698f37d15c038fe9960b4ba 100644
|
| --- a/sky/engine/core/frame/FrameView.cpp
|
| +++ b/sky/engine/core/frame/FrameView.cpp
|
| @@ -126,7 +126,6 @@ void FrameView::reset()
|
| m_isTrackingPaintInvalidations = false;
|
| m_trackedPaintInvalidationRects.clear();
|
| m_lastPaintTime = 0;
|
| - m_paintBehavior = PaintBehaviorNormal;
|
| m_isPainting = false;
|
| }
|
|
|
| @@ -812,11 +811,7 @@ void FrameView::paintContents(GraphicsContext* p, const IntRect& rect)
|
| s_inPaintContents = true;
|
|
|
| FontCachePurgePreventer fontCachePurgePreventer;
|
| -
|
| - PaintBehavior oldPaintBehavior = m_paintBehavior; // FIXME(sky): is this needed?
|
| -
|
| - if (m_paintBehavior == PaintBehaviorNormal)
|
| - document->markers().invalidateRenderedRectsForMarkersInRect(rect);
|
| + document->markers().invalidateRenderedRectsForMarkersInRect(rect);
|
|
|
| ASSERT(!m_isPainting);
|
| m_isPainting = true;
|
| @@ -830,14 +825,12 @@ void FrameView::paintContents(GraphicsContext* p, const IntRect& rect)
|
| RenderObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(*rootLayer->renderer());
|
| #endif
|
|
|
| - rootLayer->paint(p, rect, m_paintBehavior, renderer);
|
| + rootLayer->paint(p, rect, renderer);
|
|
|
| if (rootLayer->containsDirtyOverlayScrollbars())
|
| - rootLayer->paintOverlayScrollbars(p, rect, m_paintBehavior, renderer);
|
| + rootLayer->paintOverlayScrollbars(p, rect, renderer);
|
|
|
| m_isPainting = false;
|
| -
|
| - m_paintBehavior = oldPaintBehavior;
|
| m_lastPaintTime = currentTime();
|
|
|
| if (isTopLevelPainter) {
|
| @@ -848,16 +841,6 @@ void FrameView::paintContents(GraphicsContext* p, const IntRect& rect)
|
| }
|
| }
|
|
|
| -void FrameView::setPaintBehavior(PaintBehavior behavior)
|
| -{
|
| - m_paintBehavior = behavior;
|
| -}
|
| -
|
| -PaintBehavior FrameView::paintBehavior() const
|
| -{
|
| - return m_paintBehavior;
|
| -}
|
| -
|
| bool FrameView::isPainting() const
|
| {
|
| return m_isPainting;
|
|
|