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

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

Issue 2614883007: Change computed style enums to be prefixed with 'k'. (Closed)
Patch Set: Rebase on ToT. Created 3 years, 11 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. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 7 * Copyright (C) Research In Motion Limited 2010. 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 m_shouldPaint(true), 54 m_shouldPaint(true),
55 m_isDescendant(false), 55 m_isDescendant(false),
56 m_isPlaced(false), 56 m_isPlaced(false),
57 m_isLowestNonOverhangingFloatInChild(false) 57 m_isLowestNonOverhangingFloatInChild(false)
58 #if ENABLE(ASSERT) 58 #if ENABLE(ASSERT)
59 , 59 ,
60 m_isInPlacedTree(false) 60 m_isInPlacedTree(false)
61 #endif 61 #endif
62 { 62 {
63 EFloat type = layoutObject->style()->floating(); 63 EFloat type = layoutObject->style()->floating();
64 DCHECK_NE(type, EFloat::None); 64 DCHECK_NE(type, EFloat::kNone);
65 if (type == EFloat::Left) 65 if (type == EFloat::kLeft)
66 m_type = FloatLeft; 66 m_type = FloatLeft;
67 else if (type == EFloat::Right) 67 else if (type == EFloat::kRight)
68 m_type = FloatRight; 68 m_type = FloatRight;
69 } 69 }
70 70
71 FloatingObject::FloatingObject(LayoutBox* layoutObject, 71 FloatingObject::FloatingObject(LayoutBox* layoutObject,
72 Type type, 72 Type type,
73 const LayoutRect& frameRect, 73 const LayoutRect& frameRect,
74 bool shouldPaint, 74 bool shouldPaint,
75 bool isDescendant, 75 bool isDescendant,
76 bool isLowestNonOverhangingFloatInChild) 76 bool isLowestNonOverhangingFloatInChild)
77 : m_layoutObject(layoutObject), 77 : m_layoutObject(layoutObject),
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
748 const FloatingObject* floatingObject) { 748 const FloatingObject* floatingObject) {
749 return String::format("%p (%gx%g %gx%g)", floatingObject, 749 return String::format("%p (%gx%g %gx%g)", floatingObject,
750 floatingObject->frameRect().x().toFloat(), 750 floatingObject->frameRect().x().toFloat(),
751 floatingObject->frameRect().y().toFloat(), 751 floatingObject->frameRect().y().toFloat(),
752 floatingObject->frameRect().maxX().toFloat(), 752 floatingObject->frameRect().maxX().toFloat(),
753 floatingObject->frameRect().maxY().toFloat()); 753 floatingObject->frameRect().maxY().toFloat());
754 } 754 }
755 #endif 755 #endif
756 756
757 } // namespace blink 757 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/track/vtt/VTTCue.cpp ('k') | third_party/WebKit/Source/core/layout/HitTestResult.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698