| Index: third_party/WebKit/Source/core/layout/FloatingObjects.h
|
| diff --git a/third_party/WebKit/Source/core/layout/FloatingObjects.h b/third_party/WebKit/Source/core/layout/FloatingObjects.h
|
| index b2127addf500804af1420905883b92356645fe00..8510ca1ae25bdaa37b1c40f3b5d20c4584547157 100644
|
| --- a/third_party/WebKit/Source/core/layout/FloatingObjects.h
|
| +++ b/third_party/WebKit/Source/core/layout/FloatingObjects.h
|
| @@ -2,7 +2,8 @@
|
| * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
|
| * (C) 1999 Antti Koivisto (koivisto@kde.org)
|
| * (C) 2007 David Smith (catfish.man@gmail.com)
|
| - * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
|
| + * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
|
| + * All rights reserved.
|
| * Copyright (C) Research In Motion Limited 2010. All rights reserved.
|
| *
|
| * This library is free software; you can redistribute it and/or
|
| @@ -47,7 +48,8 @@ class FloatingObject {
|
| friend struct ValueToString;
|
| #endif
|
|
|
| - // Note that Type uses bits so you can use FloatLeftRight as a mask to query for both left and right.
|
| + // Note that Type uses bits so you can use FloatLeftRight as a mask to query
|
| + // for both left and right.
|
| enum Type { FloatLeft = 1, FloatRight = 2, FloatLeftRight = 3 };
|
|
|
| static std::unique_ptr<FloatingObject> create(LayoutBox*);
|
| @@ -123,7 +125,8 @@ class FloatingObject {
|
| m_isLowestNonOverhangingFloatInChild = isLowestNonOverhangingFloatInChild;
|
| }
|
|
|
| - // FIXME: Callers of these methods are dangerous and should be whitelisted explicitly or removed.
|
| + // FIXME: Callers of these methods are dangerous and should be whitelisted
|
| + // explicitly or removed.
|
| RootInlineBox* originatingLine() const { return m_originatingLine; }
|
| void setOriginatingLine(RootInlineBox* line) { m_originatingLine = line; }
|
|
|
|
|