third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp - Issue 1741073002: Rename enums/functions that collide in chromium style in core/layout/.

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

Issue 1741073002: Rename enums/functions that collide in chromium style in core/layout/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-6

Patch Set: get-names-7: Created 4 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 | « third_party/WebKit/Source/core/layout/LayoutBox.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutGeometryMap.h » ('j') | third_party/WebKit/Source/core/layout/line/InlineBox.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 Apple Inc. All rights reserved.	6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.

7 * Copyright (C) 2010 Google Inc. All rights reserved.	7 * Copyright (C) 2010 Google Inc. 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 60 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
71 LayoutBoxModelObject* FloatStateForStyleChange::s_boxModelObject = nullptr;	71 LayoutBoxModelObject* FloatStateForStyleChange::s_boxModelObject = nullptr;

72	72

73 // The HashMap for storing continuation pointers.	73 // The HashMap for storing continuation pointers.

74 // The continuation chain is a singly linked list. As such, the HashMap's value	74 // The continuation chain is a singly linked list. As such, the HashMap's value

75 // is the next pointer associated with the key.	75 // is the next pointer associated with the key.

76 typedef HashMap<const LayoutBoxModelObject, LayoutBoxModelObject> Continuation Map;	76 typedef HashMap<const LayoutBoxModelObject, LayoutBoxModelObject> Continuation Map;

77 static ContinuationMap* continuationMap = nullptr;	77 static ContinuationMap* continuationMap = nullptr;

78	78

79 void LayoutBoxModelObject::setSelectionState(SelectionState state)	79 void LayoutBoxModelObject::setSelectionState(SelectionState state)

80 {	80 {

81 if (state == SelectionInside && selectionState() != SelectionNone)	81 if (state == SelectionInside && getSelectionState() != SelectionNone)

82 return;	82 return;

83	83

84 if ((state == SelectionStart && selectionState() == SelectionEnd)	84 if ((state == SelectionStart && getSelectionState() == SelectionEnd)

85 \|\| (state == SelectionEnd && selectionState() == SelectionStart))	85 \|\| (state == SelectionEnd && getSelectionState() == SelectionStart))

86 LayoutObject::setSelectionState(SelectionBoth);	86 LayoutObject::setSelectionState(SelectionBoth);

87 else	87 else

88 LayoutObject::setSelectionState(state);	88 LayoutObject::setSelectionState(state);

89	89

90 // FIXME: We should consider whether it is OK propagating to ancestor Layout Inlines.	90 // FIXME: We should consider whether it is OK propagating to ancestor Layout Inlines.

91 // This is a workaround for http://webkit.org/b/32123	91 // This is a workaround for http://webkit.org/b/32123

92 // The containing block can be null in case of an orphaned tree.	92 // The containing block can be null in case of an orphaned tree.

93 LayoutBlock* containingBlock = this->containingBlock();	93 LayoutBlock* containingBlock = this->containingBlock();

94 if (containingBlock && !containingBlock->isLayoutView())	94 if (containingBlock && !containingBlock->isLayoutView())

95 containingBlock->setSelectionState(state);	95 containingBlock->setSelectionState(state);

(...skipping 983 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1079 if (rootElementStyle->hasBackground())	1079 if (rootElementStyle->hasBackground())

1080 return false;	1080 return false;

1081	1081

1082 if (node() != document().firstBodyElement())	1082 if (node() != document().firstBodyElement())

1083 return false;	1083 return false;

1084	1084

1085 return true;	1085 return true;

1086 }	1086 }

1087	1087

1088 } // namespace blink	1088 } // namespace blink

OLD	NEW