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

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

Issue 686633002: First pass at removing position:fixed. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 months 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
« no previous file with comments | « sky/engine/core/rendering/RenderLayerClipper.cpp ('k') | sky/engine/core/rendering/RenderObject.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « sky/engine/core/rendering/RenderLayerClipper.cpp ('k') | sky/engine/core/rendering/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698