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

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

Issue 758373002: Remove most of the old compositing code. (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/RenderBoxModelObject.cpp
diff --git a/sky/engine/core/rendering/RenderBoxModelObject.cpp b/sky/engine/core/rendering/RenderBoxModelObject.cpp
index 18c6a43271866451610feb22abae0d4f088d3b26..8df04777b5b8a68293e24bbd05b1bebbec120c22 100644
--- a/sky/engine/core/rendering/RenderBoxModelObject.cpp
+++ b/sky/engine/core/rendering/RenderBoxModelObject.cpp
@@ -34,7 +34,6 @@
#include "sky/engine/core/rendering/RenderLayer.h"
#include "sky/engine/core/rendering/RenderObjectInlines.h"
#include "sky/engine/core/rendering/RenderView.h"
-#include "sky/engine/core/rendering/compositing/CompositedLayerMapping.h"
#include "sky/engine/core/rendering/compositing/RenderLayerCompositor.h"
#include "sky/engine/core/rendering/style/ShadowList.h"
#include "sky/engine/platform/LengthFunctions.h"
@@ -768,21 +767,6 @@ IntPoint RenderBoxModelObject::BackgroundImageGeometry::relativePhase() const
return phase;
}
-bool RenderBoxModelObject::fixedBackgroundPaintsInLocalCoordinates() const
-{
- if (!isDocumentElement())
- return false;
-
- if (view()->frameView() && view()->frameView()->paintBehavior() & PaintBehaviorFlattenCompositingLayers)
- return false;
-
- RenderLayer* rootLayer = view()->layer();
- if (!rootLayer || rootLayer->compositingState() == NotComposited)
- return false;
-
- return rootLayer->compositedLayerMapping()->backgroundLayerPaintsFixedRootBackground();
-}
-
static inline int getSpace(int areaSize, int tileSize)
{
int numberOfTiles = areaSize / tileSize;
@@ -847,8 +831,6 @@ void RenderBoxModelObject::calculateBackgroundImageGeometry(const RenderLayerMod
geometry.setHasNonLocalGeometry();
IntRect viewportRect = pixelSnappedIntRect(viewRect());
- if (fixedBackgroundPaintsInLocalCoordinates())
- viewportRect.setLocation(IntPoint());
if (paintContainer) {
IntPoint absoluteContainerOffset = roundedIntPoint(paintContainer->localToAbsolute(FloatPoint()));

Powered by Google App Engine
This is Rietveld 408576698