| Index: Source/core/rendering/RenderObject.h
|
| diff --git a/Source/core/rendering/RenderObject.h b/Source/core/rendering/RenderObject.h
|
| index 69e7c0704091e80514e419f08a09ea367ded9d29..fa74aa8c6d5fd24d368502d59336bf408d92fa81 100644
|
| --- a/Source/core/rendering/RenderObject.h
|
| +++ b/Source/core/rendering/RenderObject.h
|
| @@ -33,6 +33,7 @@
|
| #include "core/platform/graphics/FloatQuad.h"
|
| #include "core/platform/graphics/LayoutRect.h"
|
| #include "core/platform/graphics/transforms/TransformationMatrix.h"
|
| +#include "core/rendering/CompositingState.h"
|
| #include "core/rendering/LayoutIndicator.h"
|
| #include "core/rendering/PaintPhase.h"
|
| #include "core/rendering/RenderObjectChildList.h"
|
| @@ -698,7 +699,7 @@ public:
|
| virtual void addAnnotatedRegions(Vector<AnnotatedRegionValue>&);
|
| void collectAnnotatedRegions(Vector<AnnotatedRegionValue>&);
|
|
|
| - bool isComposited() const;
|
| + CompositingState compositingState() const;
|
|
|
| // FIXME: This should be moved to RenderBox once the scrolling code
|
| // has been completely separated from RenderLayer and made to assume
|
|
|