| Index: sky/engine/core/rendering/RenderView.cpp
|
| diff --git a/sky/engine/core/rendering/RenderView.cpp b/sky/engine/core/rendering/RenderView.cpp
|
| index d07125e59d252ada21d6c15b855b060228e425a9..3331fc14d7731d3b87578262ec32d2cb31096c10 100644
|
| --- a/sky/engine/core/rendering/RenderView.cpp
|
| +++ b/sky/engine/core/rendering/RenderView.cpp
|
| @@ -31,7 +31,6 @@
|
| #include "sky/engine/core/rendering/RenderGeometryMap.h"
|
| #include "sky/engine/core/rendering/RenderLayer.h"
|
| #include "sky/engine/core/rendering/RenderSelectionInfo.h"
|
| -#include "sky/engine/core/rendering/compositing/RenderLayerCompositor.h"
|
| #include "sky/engine/platform/TraceEvent.h"
|
| #include "sky/engine/platform/geometry/FloatQuad.h"
|
| #include "sky/engine/platform/geometry/TransformState.h"
|
| @@ -140,11 +139,9 @@ bool RenderView::shouldDoFullPaintInvalidationForNextLayout() const
|
| // i.e. html or body) as the background positioning area, and we should full paint invalidation
|
| // viewport resize if the background image is not composited and needs full paint invalidation on
|
| // background positioning area resize.
|
| - if (!m_compositor || !m_compositor->needsFixedRootBackgroundLayer(layer())) {
|
| - if (backgroundRenderer->style()->hasFixedBackgroundImage()
|
| - && mustInvalidateFillLayersPaintOnHeightChange(backgroundRenderer->style()->backgroundLayers()))
|
| - return true;
|
| - }
|
| + if (backgroundRenderer->style()->hasFixedBackgroundImage()
|
| + && mustInvalidateFillLayersPaintOnHeightChange(backgroundRenderer->style()->backgroundLayers()))
|
| + return true;
|
| }
|
| }
|
|
|
| @@ -316,17 +313,6 @@ void RenderView::invalidatePaintForRectangle(const LayoutRect& paintInvalidation
|
| }
|
| }
|
|
|
| -void RenderView::invalidatePaintForViewAndCompositedLayers()
|
| -{
|
| - setShouldDoFullPaintInvalidation(true);
|
| -
|
| - // The only way we know how to hit these ASSERTS below this point is via the Chromium OS login screen.
|
| - DisableCompositingQueryAsserts disabler;
|
| -
|
| - if (compositor()->inCompositingMode())
|
| - compositor()->fullyInvalidatePaint();
|
| -}
|
| -
|
| void RenderView::mapRectToPaintInvalidationBacking(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect& rect, const PaintInvalidationState* state) const
|
| {
|
| // Apply our transform if we have one (because of full page zooming).
|
| @@ -706,25 +692,6 @@ void RenderView::updateHitTestResult(HitTestResult& result, const LayoutPoint& p
|
| }
|
| }
|
|
|
| -bool RenderView::usesCompositing() const
|
| -{
|
| - return m_compositor && m_compositor->staleInCompositingMode();
|
| -}
|
| -
|
| -RenderLayerCompositor* RenderView::compositor()
|
| -{
|
| - if (!m_compositor)
|
| - m_compositor = adoptPtr(new RenderLayerCompositor(*this));
|
| -
|
| - return m_compositor.get();
|
| -}
|
| -
|
| -void RenderView::setIsInWindow(bool isInWindow)
|
| -{
|
| - if (m_compositor)
|
| - m_compositor->setIsInWindow(isInWindow);
|
| -}
|
| -
|
| void RenderView::pushLayoutState(LayoutState& layoutState)
|
| {
|
| m_layoutState = &layoutState;
|
|
|