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

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

Issue 946553003: [CSS Grid Layout] Avoid reset override logical width/height for non relative elements (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch for landing Created 5 years, 9 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
« no previous file with comments | « Source/core/layout/LayoutBox.h ('k') | Source/core/layout/LayoutGrid.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 4490 matching lines...) Expand 10 before | Expand all | Expand 10 after
4501 } 4501 }
4502 4502
4503 LayoutPoint LayoutBox::topLeftLocation() const 4503 LayoutPoint LayoutBox::topLeftLocation() const
4504 { 4504 {
4505 LayoutBlock* containerBlock = containingBlock(); 4505 LayoutBlock* containerBlock = containingBlock();
4506 if (!containerBlock || containerBlock == this) 4506 if (!containerBlock || containerBlock == this)
4507 return location(); 4507 return location();
4508 return containerBlock->flipForWritingModeForChild(this, location()); 4508 return containerBlock->flipForWritingModeForChild(this, location());
4509 } 4509 }
4510 4510
4511 bool LayoutBox::hasRelativeLogicalWidth() const
4512 {
4513 return style()->logicalWidth().isPercent()
4514 || style()->logicalMinWidth().isPercent()
4515 || style()->logicalMaxWidth().isPercent();
4516 }
4517
4511 bool LayoutBox::hasRelativeLogicalHeight() const 4518 bool LayoutBox::hasRelativeLogicalHeight() const
4512 { 4519 {
4513 return style()->logicalHeight().isPercent() 4520 return style()->logicalHeight().isPercent()
4514 || style()->logicalMinHeight().isPercent() 4521 || style()->logicalMinHeight().isPercent()
4515 || style()->logicalMaxHeight().isPercent(); 4522 || style()->logicalMaxHeight().isPercent();
4516 } 4523 }
4517 4524
4518 static void markBoxForRelayoutAfterSplit(LayoutBox* box) 4525 static void markBoxForRelayoutAfterSplit(LayoutBox* box)
4519 { 4526 {
4520 // FIXME: The table code should handle that automatically. If not, 4527 // FIXME: The table code should handle that automatically. If not,
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
4641 } 4648 }
4642 4649
4643 void LayoutBox::invalidateDisplayItemClients(DisplayItemList* displayItemList) c onst 4650 void LayoutBox::invalidateDisplayItemClients(DisplayItemList* displayItemList) c onst
4644 { 4651 {
4645 LayoutBoxModelObject::invalidateDisplayItemClients(displayItemList); 4652 LayoutBoxModelObject::invalidateDisplayItemClients(displayItemList);
4646 if (LayerScrollableArea* area = scrollableArea()) 4653 if (LayerScrollableArea* area = scrollableArea())
4647 displayItemList->invalidate(area->displayItemClient()); 4654 displayItemList->invalidate(area->displayItemClient());
4648 } 4655 }
4649 4656
4650 } // namespace blink 4657 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutBox.h ('k') | Source/core/layout/LayoutGrid.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698