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

Side by Side Diff: Source/core/layout/LayoutBox.cpp

Issue 1162253006: An object may become a column spanner or cease to be one even if column-span doesn't change. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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
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, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. 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 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 } 247 }
248 248
249 if (isDocumentElement() || isBody()) { 249 if (isDocumentElement() || isBody()) {
250 document().view()->recalculateScrollbarOverlayStyle(); 250 document().view()->recalculateScrollbarOverlayStyle();
251 document().view()->recalculateCustomScrollbarStyle(); 251 document().view()->recalculateCustomScrollbarStyle();
252 } 252 }
253 updateShapeOutsideInfoAfterStyleChange(*style(), oldStyle); 253 updateShapeOutsideInfoAfterStyleChange(*style(), oldStyle);
254 updateGridPositionAfterStyleChange(oldStyle); 254 updateGridPositionAfterStyleChange(oldStyle);
255 255
256 if (LayoutMultiColumnSpannerPlaceholder* placeholder = this->spannerPlacehol der()) 256 if (LayoutMultiColumnSpannerPlaceholder* placeholder = this->spannerPlacehol der())
257 placeholder->updateMarginProperties(); 257 placeholder->layoutObjectInFlowThreadStyleDidChange(oldStyle);
258 } 258 }
259 259
260 void LayoutBox::updateShapeOutsideInfoAfterStyleChange(const ComputedStyle& styl e, const ComputedStyle* oldStyle) 260 void LayoutBox::updateShapeOutsideInfoAfterStyleChange(const ComputedStyle& styl e, const ComputedStyle* oldStyle)
261 { 261 {
262 const ShapeValue* shapeOutside = style.shapeOutside(); 262 const ShapeValue* shapeOutside = style.shapeOutside();
263 const ShapeValue* oldShapeOutside = oldStyle ? oldStyle->shapeOutside() : Co mputedStyle::initialShapeOutside(); 263 const ShapeValue* oldShapeOutside = oldStyle ? oldStyle->shapeOutside() : Co mputedStyle::initialShapeOutside();
264 264
265 Length shapeMargin = style.shapeMargin(); 265 Length shapeMargin = style.shapeMargin();
266 Length oldShapeMargin = oldStyle ? oldStyle->shapeMargin() : ComputedStyle:: initialShapeMargin(); 266 Length oldShapeMargin = oldStyle ? oldStyle->shapeMargin() : ComputedStyle:: initialShapeMargin();
267 267
(...skipping 4525 matching lines...) Expand 10 before | Expand all | Expand 10 after
4793 bool LayoutBox::canRenderBorderImage() const 4793 bool LayoutBox::canRenderBorderImage() const
4794 { 4794 {
4795 if (!style()->hasBorderDecoration()) 4795 if (!style()->hasBorderDecoration())
4796 return false; 4796 return false;
4797 4797
4798 StyleImage* borderImage = style()->borderImage().image(); 4798 StyleImage* borderImage = style()->borderImage().image();
4799 return borderImage && borderImage->canRender(*this, style()->effectiveZoom() ) && borderImage->isLoaded(); 4799 return borderImage && borderImage->canRender(*this, style()->effectiveZoom() ) && borderImage->isLoaded();
4800 } 4800 }
4801 4801
4802 } // namespace blink 4802 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698