Index: Source/core/rendering/RenderLayer.h |
diff --git a/Source/core/rendering/RenderLayer.h b/Source/core/rendering/RenderLayer.h |
index 199b4a78bbcaf05a39dcb8e3083b9726ffc1d541..dcd2f22dfb933374b9ba330de6015c9d9b0f3a00 100644 |
--- a/Source/core/rendering/RenderLayer.h |
+++ b/Source/core/rendering/RenderLayer.h |
@@ -171,7 +171,6 @@ public: |
void updateLayerPositionsAfterOverflowScroll(); |
void updateLayerPositionsAfterDocumentScroll(); |
- bool isPaginated() const { return m_isPaginated; } |
RenderLayer* enclosingPaginationLayer() const { return m_enclosingPaginationLayer; } |
void updateTransform(); |
@@ -246,7 +245,7 @@ public: |
bool canUseConvertToLayerCoords() const |
{ |
// These RenderObjects have an impact on their layers without the renderers knowing about it. |
- return !renderer()->hasColumns() && !renderer()->hasTransform() && !renderer()->isSVGRoot(); |
+ return !renderer()->hasTransform() && !renderer()->isSVGRoot(); |
} |
void convertToPixelSnappedLayerCoords(const RenderLayer* ancestorLayer, IntPoint& location) const; |
@@ -493,8 +492,6 @@ private: |
void paintLayerByApplyingTransform(GraphicsContext*, const LayerPaintingInfo&, PaintLayerFlags, const LayoutPoint& translationOffset = LayoutPoint()); |
void paintLayerContents(GraphicsContext*, const LayerPaintingInfo&, PaintLayerFlags); |
void paintChildren(unsigned childrenToVisit, GraphicsContext*, const LayerPaintingInfo&, PaintLayerFlags); |
- void paintPaginatedChildLayer(RenderLayer* childLayer, GraphicsContext*, const LayerPaintingInfo&, PaintLayerFlags); |
- void paintChildLayerIntoColumns(RenderLayer* childLayer, GraphicsContext*, const LayerPaintingInfo&, PaintLayerFlags, const Vector<RenderLayer*>& columnLayers, size_t columnIndex); |
void collectFragments(LayerFragments&, const RenderLayer* rootLayer, RenderRegion*, const LayoutRect& dirtyRect, |
ClipRectsType, OverlayScrollbarSizeRelevancy inOverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize, |
@@ -523,13 +520,6 @@ private: |
const LayoutRect& hitTestRect, const HitTestLocation&, |
const HitTestingTransformState* transformState, double* zOffsetForDescendants, double* zOffset, |
const HitTestingTransformState* unflattenedTransformState, bool depthSortDescendants); |
- RenderLayer* hitTestPaginatedChildLayer(RenderLayer* childLayer, RenderLayer* rootLayer, const HitTestRequest& request, HitTestResult& result, |
- const LayoutRect& hitTestRect, const HitTestLocation&, |
- const HitTestingTransformState* transformState, double* zOffset); |
- RenderLayer* hitTestChildLayerColumns(RenderLayer* childLayer, RenderLayer* rootLayer, const HitTestRequest& request, HitTestResult& result, |
- const LayoutRect& hitTestRect, const HitTestLocation&, |
- const HitTestingTransformState* transformState, double* zOffset, |
- const Vector<RenderLayer*>& columnLayers, size_t columnIndex); |
PassRefPtr<HitTestingTransformState> createLocalTransformState(RenderLayer* rootLayer, RenderLayer* containerLayer, |
const LayoutRect& hitTestRect, const HitTestLocation&, |
@@ -633,8 +623,6 @@ protected: |
unsigned m_hasVisibleNonLayerContent : 1; |
- unsigned m_isPaginated : 1; // If we think this layer is split by a multi-column ancestor, then this bit will be set. |
- |
unsigned m_3DTransformedDescendantStatusDirty : 1; |
// Set on a stacking context layer that has 3D descendants anywhere |
// in a preserves3D hierarchy. Hint to do 3D-aware hit testing. |