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

Side by Side Diff: third_party/WebKit/Source/core/frame/FrameView.h

Issue 2640163004: Replace ENABLE(ASSERT) with DCHECK_IS_ON(). (Closed)
Patch Set: 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) 1997 Martin Jones (mjones@kde.org) 2 Copyright (C) 1997 Martin Jones (mjones@kde.org)
3 (C) 1998 Waldo Bastian (bastian@kde.org) 3 (C) 1998 Waldo Bastian (bastian@kde.org)
4 (C) 1998, 1999 Torben Weis (weis@kde.org) 4 (C) 1998, 1999 Torben Weis (weis@kde.org)
5 (C) 1999 Lars Knoll (knoll@kde.org) 5 (C) 1999 Lars Knoll (knoll@kde.org)
6 (C) 1999 Antti Koivisto (koivisto@kde.org) 6 (C) 1999 Antti Koivisto (koivisto@kde.org)
7 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights 7 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights
8 reserved. 8 reserved.
9 9
10 This library is free software; you can redistribute it and/or 10 This library is free software; you can redistribute it and/or
(...skipping 1073 matching lines...) Expand 10 before | Expand all | Expand 10 after
1084 IntSize m_layoutSize; 1084 IntSize m_layoutSize;
1085 IntSize m_initialViewportSize; 1085 IntSize m_initialViewportSize;
1086 bool m_layoutSizeFixedToFrameSize; 1086 bool m_layoutSizeFixedToFrameSize;
1087 1087
1088 Timer<FrameView> m_didScrollTimer; 1088 Timer<FrameView> m_didScrollTimer;
1089 1089
1090 Vector<IntRect> m_tickmarks; 1090 Vector<IntRect> m_tickmarks;
1091 1091
1092 bool m_needsUpdateWidgetGeometries; 1092 bool m_needsUpdateWidgetGeometries;
1093 1093
1094 #if ENABLE(ASSERT) 1094 #if DCHECK_IS_ON()
1095 // Verified when finalizing. 1095 // Verified when finalizing.
1096 bool m_hasBeenDisposed; 1096 bool m_hasBeenDisposed = false;
1097 #endif 1097 #endif
1098 1098
1099 ScrollbarMode m_horizontalScrollbarMode; 1099 ScrollbarMode m_horizontalScrollbarMode;
1100 ScrollbarMode m_verticalScrollbarMode; 1100 ScrollbarMode m_verticalScrollbarMode;
1101 1101
1102 bool m_horizontalScrollbarLock; 1102 bool m_horizontalScrollbarLock;
1103 bool m_verticalScrollbarLock; 1103 bool m_verticalScrollbarLock;
1104 1104
1105 ChildrenWidgetSet m_children; 1105 ChildrenWidgetSet m_children;
1106 1106
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
1223 widget.isFrameView()); 1223 widget.isFrameView());
1224 DEFINE_TYPE_CASTS(FrameView, 1224 DEFINE_TYPE_CASTS(FrameView,
1225 ScrollableArea, 1225 ScrollableArea,
1226 scrollableArea, 1226 scrollableArea,
1227 scrollableArea->isFrameView(), 1227 scrollableArea->isFrameView(),
1228 scrollableArea.isFrameView()); 1228 scrollableArea.isFrameView());
1229 1229
1230 } // namespace blink 1230 } // namespace blink
1231 1231
1232 #endif // FrameView_h 1232 #endif // FrameView_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698