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

Unified Diff: sky/engine/core/rendering/RenderLayerScrollableArea.cpp

Issue 758843004: Delete most of rendering/compositing. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
Index: sky/engine/core/rendering/RenderLayerScrollableArea.cpp
diff --git a/sky/engine/core/rendering/RenderLayerScrollableArea.cpp b/sky/engine/core/rendering/RenderLayerScrollableArea.cpp
index d3e76eb764012e35290953678f328697ed6e2ee5..8e3c1382e6bb32bd8ef015c1d14d9807ed52142e 100644
--- a/sky/engine/core/rendering/RenderLayerScrollableArea.cpp
+++ b/sky/engine/core/rendering/RenderLayerScrollableArea.cpp
@@ -57,7 +57,6 @@
#include "sky/engine/core/rendering/HitTestResult.h"
#include "sky/engine/core/rendering/RenderGeometryMap.h"
#include "sky/engine/core/rendering/RenderView.h"
-#include "sky/engine/core/rendering/compositing/RenderLayerCompositor.h"
#include "sky/engine/platform/PlatformGestureEvent.h"
#include "sky/engine/platform/PlatformMouseEvent.h"
#include "sky/engine/platform/graphics/GraphicsContextStateSaver.h"
@@ -244,7 +243,6 @@ void RenderLayerScrollableArea::setScrollOffset(const IntPoint& newScrollOffset)
// If we're in the middle of layout, we'll just update layers once layout has finished.
layer()->clipper().clearClipRectsIncludingDescendants();
box().setPreviousPaintInvalidationRect(box().boundsRectForPaintInvalidation(paintInvalidationContainer));
- updateCompositingLayersAfterScroll();
}
// The caret rect needs to be invalidated after scrolling
@@ -814,31 +812,6 @@ void RenderLayerScrollableArea::updateScrollableAreaSet(bool hasOverflow)
frameView->removeScrollableArea(this);
}
-void RenderLayerScrollableArea::updateCompositingLayersAfterScroll()
-{
- RenderLayerCompositor* compositor = box().view()->compositor();
- if (compositor->inCompositingMode()) {
- layer()->setNeedsCompositingInputsUpdate();
- }
-}
-
-static bool layerNeedsCompositedScrolling(const RenderLayer* layer)
-{
- return layer->scrollsOverflow()
- && layer->compositor()->preferCompositingToLCDTextEnabled()
- && !layer->hasDescendantWithClipPath()
- && !layer->hasAncestorWithClipPath();
-}
-
-void RenderLayerScrollableArea::updateNeedsCompositedScrolling()
-{
- const bool needsCompositedScrolling = layerNeedsCompositedScrolling(layer());
- if (static_cast<bool>(m_needsCompositedScrolling) != needsCompositedScrolling) {
- m_needsCompositedScrolling = needsCompositedScrolling;
- layer()->didUpdateNeedsCompositedScrolling();
- }
-}
-
void RenderLayerScrollableArea::setTopmostScrollChild(RenderLayer* scrollChild)
{
// We only want to track the topmost scroll child for scrollable areas with

Powered by Google App Engine
This is Rietveld 408576698