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

Side by Side Diff: sky/engine/core/rendering/RenderBox.cpp

Issue 688223002: Get rid of isWritingModeRoot. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: merge to ToT Created 6 years, 1 month 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
« no previous file with comments | « sky/engine/core/rendering/RenderBox.h ('k') | sky/engine/core/rendering/RenderFlexibleBox.cpp » ('j') | 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, 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 3444 matching lines...) Expand 10 before | Expand all | Expand 10 after
3455 } 3455 }
3456 3456
3457 static bool isReplacedElement(Node* node) 3457 static bool isReplacedElement(Node* node)
3458 { 3458 {
3459 // Checkboxes and radioboxes are not isReplaced() nor do they have their own renderer in which to override avoidFloats(). 3459 // Checkboxes and radioboxes are not isReplaced() nor do they have their own renderer in which to override avoidFloats().
3460 return node && node->isElementNode() && toElement(node)->isFormControlElemen t(); 3460 return node && node->isElementNode() && toElement(node)->isFormControlElemen t();
3461 } 3461 }
3462 3462
3463 bool RenderBox::avoidsFloats() const 3463 bool RenderBox::avoidsFloats() const
3464 { 3464 {
3465 return isReplaced() || isReplacedElement(node()) || hasOverflowClip() || isW ritingModeRoot() || isFlexItemIncludingDeprecated(); 3465 return isReplaced() || isReplacedElement(node()) || hasOverflowClip() || isF lexItemIncludingDeprecated();
3466 } 3466 }
3467 3467
3468 InvalidationReason RenderBox::getPaintInvalidationReason(const RenderLayerModelO bject& paintInvalidationContainer, 3468 InvalidationReason RenderBox::getPaintInvalidationReason(const RenderLayerModelO bject& paintInvalidationContainer,
3469 const LayoutRect& oldBounds, const LayoutPoint& oldLocation, const LayoutRec t& newBounds, const LayoutPoint& newLocation) 3469 const LayoutRect& oldBounds, const LayoutPoint& oldLocation, const LayoutRec t& newBounds, const LayoutPoint& newLocation)
3470 { 3470 {
3471 InvalidationReason invalidationReason = RenderBoxModelObject::getPaintInvali dationReason(paintInvalidationContainer, oldBounds, oldLocation, newBounds, newL ocation); 3471 InvalidationReason invalidationReason = RenderBoxModelObject::getPaintInvali dationReason(paintInvalidationContainer, oldBounds, oldLocation, newBounds, newL ocation);
3472 if (invalidationReason != InvalidationNone && invalidationReason != Invalida tionIncremental) 3472 if (invalidationReason != InvalidationNone && invalidationReason != Invalida tionIncremental)
3473 return invalidationReason; 3473 return invalidationReason;
3474 3474
3475 if (!style()->hasBackground() && !style()->hasBoxDecorations()) 3475 if (!style()->hasBackground() && !style()->hasBoxDecorations())
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
3977 3977
3978 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) 3978 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style)
3979 { 3979 {
3980 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor); 3980 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor);
3981 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); 3981 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage();
3982 ASSERT(hasBackground == style.hasBackground()); 3982 ASSERT(hasBackground == style.hasBackground());
3983 hasBorder = style.hasBorder(); 3983 hasBorder = style.hasBorder();
3984 } 3984 }
3985 3985
3986 } // namespace blink 3986 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderBox.h ('k') | sky/engine/core/rendering/RenderFlexibleBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698