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

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

Issue 663923002: Rename hasTransform() to hasTransformRelatedProperty, since the meaning is the latter. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderBox.h ('k') | Source/core/rendering/RenderGeometryMap.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 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 283
284 if (boxHasOverflowClip != hasOverflowClip()) { 284 if (boxHasOverflowClip != hasOverflowClip()) {
285 // FIXME: This shouldn't be required if we tracked the visual overflow 285 // FIXME: This shouldn't be required if we tracked the visual overflow
286 // generated by positioned children or self painting layers. crbug.com/3 45403 286 // generated by positioned children or self painting layers. crbug.com/3 45403
287 for (RenderObject* child = slowFirstChild(); child; child = child->nextS ibling()) 287 for (RenderObject* child = slowFirstChild(); child; child = child->nextS ibling())
288 child->setMayNeedPaintInvalidation(true); 288 child->setMayNeedPaintInvalidation(true);
289 } 289 }
290 290
291 setHasOverflowClip(boxHasOverflowClip); 291 setHasOverflowClip(boxHasOverflowClip);
292 292
293 setHasTransform(styleToUse->hasTransformRelatedProperty()); 293 setHasTransformRelatedProperty(styleToUse->hasTransformRelatedProperty());
294 setHasReflection(styleToUse->boxReflect()); 294 setHasReflection(styleToUse->boxReflect());
295 } 295 }
296 296
297 void RenderBox::layout() 297 void RenderBox::layout()
298 { 298 {
299 ASSERT(needsLayout()); 299 ASSERT(needsLayout());
300 300
301 RenderObject* child = slowFirstChild(); 301 RenderObject* child = slowFirstChild();
302 if (!child) { 302 if (!child) {
303 clearNeedsLayout(); 303 clearNeedsLayout();
(...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after
1150 return false; 1150 return false;
1151 if (!childBox->width() || !childBox->height()) 1151 if (!childBox->width() || !childBox->height())
1152 return false; 1152 return false;
1153 if (RenderLayer* childLayer = childBox->layer()) { 1153 if (RenderLayer* childLayer = childBox->layer()) {
1154 // FIXME: perhaps this could be less conservative? 1154 // FIXME: perhaps this could be less conservative?
1155 if (childLayer->compositingState() != NotComposited) 1155 if (childLayer->compositingState() != NotComposited)
1156 return false; 1156 return false;
1157 // FIXME: Deal with z-index. 1157 // FIXME: Deal with z-index.
1158 if (!childStyle->hasAutoZIndex()) 1158 if (!childStyle->hasAutoZIndex())
1159 return false; 1159 return false;
1160 if (childLayer->hasTransform() || childLayer->isTransparent() || childLa yer->hasFilter()) 1160 if (childLayer->hasTransformRelatedProperty() || childLayer->isTranspare nt() || childLayer->hasFilter())
1161 return false; 1161 return false;
1162 if (childBox->hasOverflowClip() && childStyle->hasBorderRadius()) 1162 if (childBox->hasOverflowClip() && childStyle->hasBorderRadius())
1163 return false; 1163 return false;
1164 } 1164 }
1165 return true; 1165 return true;
1166 } 1166 }
1167 1167
1168 bool RenderBox::foregroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect, u nsigned maxDepthToTest) const 1168 bool RenderBox::foregroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect, u nsigned maxDepthToTest) const
1169 { 1169 {
1170 if (!maxDepthToTest) 1170 if (!maxDepthToTest)
(...skipping 3354 matching lines...) Expand 10 before | Expand all | Expand 10 after
4525 ASSERT(style()->hasBackground() || style()->hasBoxDecorations()); 4525 ASSERT(style()->hasBackground() || style()->hasBoxDecorations());
4526 4526
4527 if (m_rareData && m_rareData->m_previousBorderBoxSize.width() != -1) 4527 if (m_rareData && m_rareData->m_previousBorderBoxSize.width() != -1)
4528 return m_rareData->m_previousBorderBoxSize; 4528 return m_rareData->m_previousBorderBoxSize;
4529 4529
4530 // We didn't save the old border box size because it was the same as the siz e of oldBounds. 4530 // We didn't save the old border box size because it was the same as the siz e of oldBounds.
4531 return previousBoundsSize; 4531 return previousBoundsSize;
4532 } 4532 }
4533 4533
4534 } // namespace blink 4534 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBox.h ('k') | Source/core/rendering/RenderGeometryMap.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698