third_party/WebKit/Source/core/frame/FrameView.cpp - Issue 2387263004: Manually remove many instances of a comma quirk arising from the reformat.

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

Issue 2387263004: Manually remove many instances of a comma quirk arising from the reformat. (Closed)

Patch Set: merge with master; thakis nit Created 4 years, 2 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:

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>	2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>

3 * 1999 Lars Knoll <knoll@kde.org>	3 * 1999 Lars Knoll <knoll@kde.org>

4 * 1999 Antti Koivisto <koivisto@kde.org>	4 * 1999 Antti Koivisto <koivisto@kde.org>

5 * 2000 Dirk Mueller <mueller@kde.org>	5 * 2000 Dirk Mueller <mueller@kde.org>

6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.	6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.

7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)	7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)

8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)	8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)

9 * Copyright (C) 2009 Google Inc. All rights reserved.	9 * Copyright (C) 2009 Google Inc. All rights reserved.

10 *	10 *

(...skipping 150 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
161 m_mediaType(MediaTypeNames::screen),	161 m_mediaType(MediaTypeNames::screen),

162 m_safeToPropagateScrollToParent(true),	162 m_safeToPropagateScrollToParent(true),

163 m_scrollCorner(nullptr),	163 m_scrollCorner(nullptr),

164 m_stickyPositionObjectCount(0),	164 m_stickyPositionObjectCount(0),

165 m_inputEventsScaleFactorForEmulation(1),	165 m_inputEventsScaleFactorForEmulation(1),

166 m_layoutSizeFixedToFrameSize(true),	166 m_layoutSizeFixedToFrameSize(true),

167 m_didScrollTimer(this, &FrameView::didScrollTimerFired),	167 m_didScrollTimer(this, &FrameView::didScrollTimerFired),

168 m_topControlsViewportAdjustment(0),	168 m_topControlsViewportAdjustment(0),

169 m_needsUpdateWidgetGeometries(false),	169 m_needsUpdateWidgetGeometries(false),

170 m_needsUpdateViewportIntersection(true),	170 m_needsUpdateViewportIntersection(true),

171 m_needsUpdateViewportIntersectionInSubtree(true)	171 m_needsUpdateViewportIntersectionInSubtree(true),

172 #if ENABLE(ASSERT)	172 #if ENABLE(ASSERT)

173 ,	173 m_hasBeenDisposed(false),

174 m_hasBeenDisposed(false)

175 #endif	174 #endif

176 ,

177 m_horizontalScrollbarMode(ScrollbarAuto),	175 m_horizontalScrollbarMode(ScrollbarAuto),

178 m_verticalScrollbarMode(ScrollbarAuto),	176 m_verticalScrollbarMode(ScrollbarAuto),

179 m_horizontalScrollbarLock(false),	177 m_horizontalScrollbarLock(false),

180 m_verticalScrollbarLock(false),	178 m_verticalScrollbarLock(false),

181 m_scrollbarsAvoidingResizer(0),	179 m_scrollbarsAvoidingResizer(0),

182 m_scrollbarsSuppressed(false),	180 m_scrollbarsSuppressed(false),

183 m_inUpdateScrollbars(false),	181 m_inUpdateScrollbars(false),

184 m_frameTimingRequestsDirty(true),	182 m_frameTimingRequestsDirty(true),

185 m_viewportIntersectionValid(false),	183 m_viewportIntersectionValid(false),

186 m_hiddenForThrottling(false),	184 m_hiddenForThrottling(false),

(...skipping 4329 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
4516 }	4514 }

4517	4515

4518 bool FrameView::canThrottleRendering() const {	4516 bool FrameView::canThrottleRendering() const {

4519 if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled())	4517 if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled())

4520 return false;	4518 return false;

4521 return m_subtreeThrottled \|\|	4519 return m_subtreeThrottled \|\|

4522 (m_hiddenForThrottling && m_crossOriginForThrottling);	4520 (m_hiddenForThrottling && m_crossOriginForThrottling);

4523 }	4521 }

4524	4522

4525 } // namespace blink	4523 } // namespace blink

OLD	NEW