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

Side by Side Diff: third_party/WebKit/Source/core/layout/FloatingObjects.cpp

Issue 2358473002: Renamed EFloat members to match keywords (Closed)
Patch Set: Rebase Created 4 years, 3 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
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) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 , m_originatingLine(nullptr) 51 , m_originatingLine(nullptr)
52 , m_shouldPaint(true) 52 , m_shouldPaint(true)
53 , m_isDescendant(false) 53 , m_isDescendant(false)
54 , m_isPlaced(false) 54 , m_isPlaced(false)
55 , m_isLowestNonOverhangingFloatInChild(false) 55 , m_isLowestNonOverhangingFloatInChild(false)
56 #if ENABLE(ASSERT) 56 #if ENABLE(ASSERT)
57 , m_isInPlacedTree(false) 57 , m_isInPlacedTree(false)
58 #endif 58 #endif
59 { 59 {
60 EFloat type = layoutObject->style()->floating(); 60 EFloat type = layoutObject->style()->floating();
61 DCHECK_NE(type, EFloat::NoFloat); 61 DCHECK_NE(type, EFloat::None);
62 if (type == EFloat::LeftFloat) 62 if (type == EFloat::Left)
63 m_type = FloatLeft; 63 m_type = FloatLeft;
64 else if (type == EFloat::RightFloat) 64 else if (type == EFloat::Right)
65 m_type = FloatRight; 65 m_type = FloatRight;
66 } 66 }
67 67
68 FloatingObject::FloatingObject(LayoutBox* layoutObject, Type type, const LayoutR ect& frameRect, bool shouldPaint, bool isDescendant, bool isLowestNonOverhanging FloatInChild, bool performingUnsafeClone) 68 FloatingObject::FloatingObject(LayoutBox* layoutObject, Type type, const LayoutR ect& frameRect, bool shouldPaint, bool isDescendant, bool isLowestNonOverhanging FloatInChild, bool performingUnsafeClone)
69 : m_layoutObject(layoutObject) 69 : m_layoutObject(layoutObject)
70 , m_originatingLine(nullptr) 70 , m_originatingLine(nullptr)
71 , m_frameRect(frameRect) 71 , m_frameRect(frameRect)
72 , m_type(type) 72 , m_type(type)
73 , m_isDescendant(isDescendant) 73 , m_isDescendant(isDescendant)
74 , m_isPlaced(true) 74 , m_isPlaced(true)
(...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 } 649 }
650 650
651 String ValueToString<FloatingObject*>::toString(const FloatingObject* floatingOb ject) 651 String ValueToString<FloatingObject*>::toString(const FloatingObject* floatingOb ject)
652 { 652 {
653 return String::format("%p (%gx%g %gx%g)", floatingObject, floatingObject->fr ameRect().x().toFloat(), floatingObject->frameRect().y().toFloat(), floatingObje ct->frameRect().maxX().toFloat(), floatingObject->frameRect().maxY().toFloat()); 653 return String::format("%p (%gx%g %gx%g)", floatingObject, floatingObject->fr ameRect().x().toFloat(), floatingObject->frameRect().y().toFloat(), floatingObje ct->frameRect().maxX().toFloat(), floatingObject->frameRect().maxY().toFloat());
654 } 654 }
655 #endif 655 #endif
656 656
657 657
658 } // namespace blink 658 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698