| Index: sky/engine/core/rendering/RenderLayerModelObject.cpp
|
| diff --git a/sky/engine/core/rendering/RenderLayerModelObject.cpp b/sky/engine/core/rendering/RenderLayerModelObject.cpp
|
| index 3a37f86321dc60275e3adc2a5e3624d22115e47f..adb3862f534f1a086da3a911e8e0b25432fcfda9 100644
|
| --- a/sky/engine/core/rendering/RenderLayerModelObject.cpp
|
| +++ b/sky/engine/core/rendering/RenderLayerModelObject.cpp
|
| @@ -71,18 +71,7 @@ ScrollableArea* RenderLayerModelObject::scrollableArea() const
|
|
|
| void RenderLayerModelObject::willBeDestroyed()
|
| {
|
| - if (isPositioned()) {
|
| - // Don't use this->view() because the document's renderView has been set to 0 during destruction.
|
| - if (LocalFrame* frame = this->frame()) {
|
| - if (FrameView* frameView = frame->view()) {
|
| - if (style()->hasViewportConstrainedPosition())
|
| - frameView->removeViewportConstrainedObject(this);
|
| - }
|
| - }
|
| - }
|
| -
|
| RenderObject::willBeDestroyed();
|
| -
|
| destroyLayer();
|
| }
|
|
|
| @@ -137,17 +126,6 @@ void RenderLayerModelObject::styleDidChange(StyleDifference diff, const RenderSt
|
| layer()->setLayerType(type);
|
| layer()->styleChanged(diff, oldStyle);
|
| }
|
| -
|
| - if (FrameView *frameView = view()->frameView()) {
|
| - bool newStyleIsViewportConstained = style()->hasViewportConstrainedPosition();
|
| - bool oldStyleIsViewportConstrained = oldStyle && oldStyle->hasViewportConstrainedPosition();
|
| - if (newStyleIsViewportConstained != oldStyleIsViewportConstrained) {
|
| - if (newStyleIsViewportConstained && layer())
|
| - frameView->addViewportConstrainedObject(this);
|
| - else
|
| - frameView->removeViewportConstrainedObject(this);
|
| - }
|
| - }
|
| }
|
|
|
| void RenderLayerModelObject::addLayerHitTestRects(LayerHitTestRects& rects, const RenderLayer* currentLayer, const LayoutPoint& layerOffset, const LayoutRect& containerRect) const
|
|
|