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

Unified Diff: sky/engine/core/rendering/RenderObject.h

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/RenderObject.h
diff --git a/sky/engine/core/rendering/RenderObject.h b/sky/engine/core/rendering/RenderObject.h
index d5a9eec7e095cc6d3fee480eb2e00495a1584b83..0082cf4d2ba1df782aa9526929ee044f0ffeca56 100644
--- a/sky/engine/core/rendering/RenderObject.h
+++ b/sky/engine/core/rendering/RenderObject.h
@@ -39,7 +39,6 @@
#include "sky/engine/core/rendering/ScrollAlignment.h"
#include "sky/engine/core/rendering/SubtreeLayoutScope.h"
#include "sky/engine/core/rendering/compositing/CompositingState.h"
-#include "sky/engine/core/rendering/compositing/CompositingTriggers.h"
#include "sky/engine/core/rendering/style/RenderStyle.h"
#include "sky/engine/core/rendering/style/StyleInheritedData.h"
#include "sky/engine/platform/geometry/FloatQuad.h"
@@ -1177,10 +1176,11 @@ inline bool RenderObject::boxDecorationBackgroundIsKnownToBeObscured()
return m_bitfields.boxDecorationBackgroundState() == HasBoxDecorationBackgroundKnownToBeObscured;
}
-inline void makeMatrixRenderable(TransformationMatrix& matrix, bool has3DRendering)
+inline void makeMatrixRenderable(TransformationMatrix& matrix)
{
- if (!has3DRendering)
- matrix.makeAffine();
+ // FIXME(sky): The old accelerated compositing code didn't do this.
ojan 2014/11/26 19:38:51 Ditto here. I'm doing the non-3D path since that's
abarth-chromium 2014/11/26 19:48:36 That's right. We'll need 4x4 matrix support in Sk
+ // Do we need this?
+ matrix.makeAffine();
}
#define DEFINE_RENDER_OBJECT_TYPE_CASTS(thisType, predicate) \

Powered by Google App Engine
This is Rietveld 408576698