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

Side by Side Diff: Source/core/rendering/RenderLayerModelObject.cpp

Issue 275563002: Don't layout when isSelfPaintingLayer() changes (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « LayoutTests/TestExpectations ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2010, 2012 Google Inc. All rights reserved. 7 * Copyright (C) 2010, 2012 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 if (s_wasFloating && isFloating()) 154 if (s_wasFloating && isFloating())
155 setChildNeedsLayout(); 155 setChildNeedsLayout();
156 if (hadTransform) 156 if (hadTransform)
157 setNeedsLayoutAndPrefWidthsRecalc(); 157 setNeedsLayoutAndPrefWidthsRecalc();
158 } 158 }
159 159
160 if (layer()) { 160 if (layer()) {
161 // FIXME: Ideally we shouldn't need this setter but we can't easily infe r an overflow-only layer 161 // FIXME: Ideally we shouldn't need this setter but we can't easily infe r an overflow-only layer
162 // from the style. 162 // from the style.
163 layer()->setLayerType(type); 163 layer()->setLayerType(type);
164
165 layer()->styleChanged(diff, oldStyle); 164 layer()->styleChanged(diff, oldStyle);
166 if (hadLayer && layer()->isSelfPaintingLayer() != layerWasSelfPainting) 165 if (hadLayer && layer()->isSelfPaintingLayer() != layerWasSelfPainting)
167 setChildNeedsLayout(); 166 repaint();
abarth-chromium 2014/05/08 01:37:51 Do any tests fail if you just delete this line?
168 } 167 }
169 168
170 if (FrameView *frameView = view()->frameView()) { 169 if (FrameView *frameView = view()->frameView()) {
171 bool newStyleIsViewportConstained = style()->hasViewportConstrainedPosit ion(); 170 bool newStyleIsViewportConstained = style()->hasViewportConstrainedPosit ion();
172 bool oldStyleIsViewportConstrained = oldStyle && oldStyle->hasViewportCo nstrainedPosition(); 171 bool oldStyleIsViewportConstrained = oldStyle && oldStyle->hasViewportCo nstrainedPosition();
173 if (newStyleIsViewportConstained != oldStyleIsViewportConstrained) { 172 if (newStyleIsViewportConstained != oldStyleIsViewportConstrained) {
174 if (newStyleIsViewportConstained && layer()) 173 if (newStyleIsViewportConstained && layer())
175 frameView->addViewportConstrainedObject(this); 174 frameView->addViewportConstrainedObject(this);
176 else 175 else
177 frameView->removeViewportConstrainedObject(this); 176 frameView->removeViewportConstrainedObject(this);
(...skipping 29 matching lines...) Expand all
207 return m_layer ? m_layer->hasCompositedLayerMapping() : false; 206 return m_layer ? m_layer->hasCompositedLayerMapping() : false;
208 } 207 }
209 208
210 CompositedLayerMapping* RenderLayerModelObject::groupedMapping() const 209 CompositedLayerMapping* RenderLayerModelObject::groupedMapping() const
211 { 210 {
212 return m_layer ? m_layer->groupedMapping() : 0; 211 return m_layer ? m_layer->groupedMapping() : 0;
213 } 212 }
214 213
215 } // namespace WebCore 214 } // namespace WebCore
216 215
OLDNEW
« no previous file with comments | « LayoutTests/TestExpectations ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698