<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[179678] branches/safari-600.1.4.15-branch/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/179678">179678</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-02-04 23:49:22 -0800 (Wed, 04 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/178661">r178661</a>. rdar://problem/19718944</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreWebCoreexpin">branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorepageFrameViewcpp">branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorepageFrameViewh">branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreplatformScrollViewcpp">branches/safari-600.1.4.15-branch/Source/WebCore/platform/ScrollView.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreplatformScrollViewh">branches/safari-600.1.4.15-branch/Source/WebCore/platform/ScrollView.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (179677 => 179678)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-02-05 07:04:39 UTC (rev 179677)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-02-05 07:49:22 UTC (rev 179678)
</span><span class="lines">@@ -1,5 +1,51 @@
</span><span class="cx"> 2015-02-04 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r178661
+
+ 2015-01-19 Brent Fulgham <bfulgham@apple.com>
+
+ Layers need to be already updated before we call adjustViewSize
+ https://bugs.webkit.org/show_bug.cgi?id=135514
+
+ Reviewed by Simon Fraser.
+
+ Tested by 'fast/dynamic/layer-no-longer-paginated.html'
+
+ Defer painting operations until we have finished layout. This
+ has a couple of benefits:
+ (1) We do not attempt to modify render layers during layout.
+ (2) In WK1 we do not attempt to paint during layout.
+
+ Add a new virtual predicate to ScrollView indicating when we are in
+ layout so that calls to setContentsSize do not attempt
+ to adjust scrollbars.
+
+ Modify FrameView to set its ScrollView state to block paint
+ operations during layout. Also add a post-layout handler to
+ complete the scrollbar updates after layout is finished.
+
+ * WebCore.exp.in: Move linker symbol to ScrollView (from FrameView).
+ * page/FrameView.cpp:
+ (WebCore::FrameView::layout):
+ (WebCore::FrameView::shouldDeferScrollUpdateAfterContentSizeChange): Added.
+ (WebCore::FrameView::scrollPositionChangedViaPlatformWidget): Removed (Renamed).
+ (WebCore::FrameView::scrollPositionChangedViaPlatformWidgetImpl): Added (Renamed)
+ (WebCore::FrameView::paintContents): Do not paint if we are inside view size adjustment.
+ * page/FrameView.h:
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::scrollPositionChangedViaPlatformWidget): Added. Checks whether we need to defer
+ painting, and calls virtual scrollPositionChangedViaPlatformWidgetImpl if we do not.
+ (WebCore::FrameView::scrollPositionChangedViaPlatformWidgetImpl): Added.
+ (WebCore::ScrollView::handleDeferredScrollUpdateAfterContentSizeChange): Added.
+ (WebCore::ScrollView::scrollTo): If we should defer painting, cache the
+ the scroll delta and apply it after the layout is complete.
+ (WebCore::ScrollView::completeUpdatesAfterScrollTo): Split off part of 'scrollTo' into its own method
+ so we can reuse it in handleDeferredScrollUpdateAfterContentSizeChange.
+ * platform/ScrollView.h:
+ (WebCore::ScrollView::shouldDeferScrollUpdateAfterContentSizeChange): Added.
+
+2015-02-04 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r178363
</span><span class="cx">
</span><span class="cx"> 2015-01-13 Andreas Kling <akling@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.exp.in (179677 => 179678)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.exp.in 2015-02-05 07:04:39 UTC (rev 179677)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.exp.in 2015-02-05 07:49:22 UTC (rev 179678)
</span><span class="lines">@@ -93,6 +93,7 @@
</span><span class="cx"> __ZN7WebCore10ScrollView23setPaintsEntireContentsEb
</span><span class="cx"> __ZN7WebCore10ScrollView23setScrollbarsSuppressedEbb
</span><span class="cx"> __ZN7WebCore10ScrollView24windowResizerRectChangedEv
</span><ins>+__ZN7WebCore10ScrollView38scrollPositionChangedViaPlatformWidgetERKNS_8IntPointES3_
</ins><span class="cx"> __ZN7WebCore10ScrollView4hideEv
</span><span class="cx"> __ZN7WebCore10ScrollView4showEv
</span><span class="cx"> __ZN7WebCore10ScrollView5paintEPNS_15GraphicsContextERKNS_7IntRectE
</span><span class="lines">@@ -1430,7 +1431,6 @@
</span><span class="cx"> __ZN7WebCore9FrameView34setViewportSizeForCSSViewportUnitsENS_7IntSizeE
</span><span class="cx"> __ZN7WebCore9FrameView37setScrollingPerformanceLoggingEnabledEb
</span><span class="cx"> __ZN7WebCore9FrameView37updateLayoutAndStyleIfNeededRecursiveEv
</span><del>-__ZN7WebCore9FrameView38scrollPositionChangedViaPlatformWidgetERKNS_8IntPointES3_
</del><span class="cx"> __ZN7WebCore9FrameView39flushCompositingStateIncludingSubframesEv
</span><span class="cx"> __ZN7WebCore9FrameView52disableLayerFlushThrottlingTemporarilyForInteractionEv
</span><span class="cx"> __ZN7WebCore9FrameView6createERNS_5FrameE
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameView.cpp (179677 => 179678)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameView.cpp 2015-02-05 07:04:39 UTC (rev 179677)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameView.cpp 2015-02-05 07:49:22 UTC (rev 179678)
</span><span class="lines">@@ -1125,7 +1125,7 @@
</span><span class="cx">
</span><span class="cx"> if (!allowSubtree && m_layoutRoot) {
</span><span class="cx"> m_layoutRoot->markContainingBlocksForLayout(false);
</span><del>- m_layoutRoot = 0;
</del><ins>+ m_layoutRoot = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT(frame().view() == this);
</span><span class="lines">@@ -1323,7 +1323,9 @@
</span><span class="cx"> layer->updateLayerPositionsAfterLayout(renderView()->layer(), updateLayerPositionFlags(layer, subtree, m_needsFullRepaint));
</span><span class="cx">
</span><span class="cx"> updateCompositingLayersAfterLayout();
</span><del>-
</del><ins>+
+ m_layoutPhase = InPostLayerPositionsUpdatedAfterLayout;
+
</ins><span class="cx"> m_layoutCount++;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA) || PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(EFL)
</span><span class="lines">@@ -1343,6 +1345,8 @@
</span><span class="cx">
</span><span class="cx"> updateCanBlitOnScrollRecursively();
</span><span class="cx">
</span><ins>+ handleDeferredScrollUpdateAfterContentSizeChange();
+
</ins><span class="cx"> if (document.hasListenerType(Document::OVERFLOWCHANGED_LISTENER))
</span><span class="cx"> updateOverflowStatus(layoutWidth() < contentsWidth(), layoutHeight() < contentsHeight());
</span><span class="cx">
</span><span class="lines">@@ -1372,6 +1376,11 @@
</span><span class="cx"> --m_nestedLayoutCount;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool FrameView::shouldDeferScrollUpdateAfterContentSizeChange()
+{
+ return (m_layoutPhase < InPostLayout) && (m_layoutPhase != OutsideLayout);
+}
+
</ins><span class="cx"> RenderBox* FrameView::embeddedContentBox() const
</span><span class="cx"> {
</span><span class="cx"> RenderView* renderView = this->renderView();
</span><span class="lines">@@ -2048,7 +2057,7 @@
</span><span class="cx"> renderer->setNeedsLayout();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameView::scrollPositionChangedViaPlatformWidget(const IntPoint& oldPosition, const IntPoint& newPosition)
</del><ins>+void FrameView::scrollPositionChangedViaPlatformWidgetImpl(const IntPoint& oldPosition, const IntPoint& newPosition)
</ins><span class="cx"> {
</span><span class="cx"> updateLayerPositionsAfterScrolling();
</span><span class="cx"> updateCompositingLayersAfterScrolling();
</span><span class="lines">@@ -2132,6 +2141,8 @@
</span><span class="cx">
</span><span class="cx"> void FrameView::updateCompositingLayersAfterScrolling()
</span><span class="cx"> {
</span><ins>+ ASSERT(m_layoutPhase >= InPostLayout || m_layoutPhase == OutsideLayout);
+
</ins><span class="cx"> if (!shouldUpdateCompositingLayersAfterScrolling())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -3675,6 +3686,11 @@
</span><span class="cx">
</span><span class="cx"> void FrameView::paintContents(GraphicsContext* context, const IntRect& dirtyRect)
</span><span class="cx"> {
</span><ins>+ if (m_layoutPhase == InViewSizeAdjust)
+ return;
+
+ ASSERT(m_layoutPhase == InPostLayerPositionsUpdatedAfterLayout || m_layoutPhase == OutsideLayout);
+
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> bool fillWithRed;
</span><span class="cx"> if (frame().document()->printing())
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameView.h (179677 => 179678)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameView.h 2015-02-05 07:04:39 UTC (rev 179677)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameView.h 2015-02-05 07:49:22 UTC (rev 179678)
</span><span class="lines">@@ -235,7 +235,6 @@
</span><span class="cx"> virtual void setFixedVisibleContentRect(const IntRect&) override;
</span><span class="cx"> #endif
</span><span class="cx"> virtual void setScrollPosition(const IntPoint&) override;
</span><del>- void scrollPositionChangedViaPlatformWidget(const IntPoint& oldPosition, const IntPoint& newPosition);
</del><span class="cx"> virtual void updateLayerPositionsAfterScrolling() override;
</span><span class="cx"> virtual void updateCompositingLayersAfterScrolling() override;
</span><span class="cx"> virtual bool requestScrollPositionUpdate(const IntPoint&) override;
</span><span class="lines">@@ -521,6 +520,7 @@
</span><span class="cx"> InLayout,
</span><span class="cx"> InViewSizeAdjust,
</span><span class="cx"> InPostLayout,
</span><ins>+ InPostLayerPositionsUpdatedAfterLayout,
</ins><span class="cx"> };
</span><span class="cx"> LayoutPhase layoutPhase() const { return m_layoutPhase; }
</span><span class="cx">
</span><span class="lines">@@ -537,6 +537,10 @@
</span><span class="cx">
</span><span class="cx"> bool shouldUpdateCompositingLayersAfterScrolling() const;
</span><span class="cx">
</span><ins>+ virtual bool shouldDeferScrollUpdateAfterContentSizeChange() override;
+
+ virtual void scrollPositionChangedViaPlatformWidgetImpl(const IntPoint& oldPosition, const IntPoint& newPosition) override;
+
</ins><span class="cx"> void applyOverflowToViewport(RenderElement*, ScrollbarMode& hMode, ScrollbarMode& vMode);
</span><span class="cx"> void applyPaginationToViewport();
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreplatformScrollViewcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/ScrollView.cpp (179677 => 179678)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/ScrollView.cpp 2015-02-05 07:04:39 UTC (rev 179677)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/ScrollView.cpp 2015-02-05 07:49:22 UTC (rev 179678)
</span><span class="lines">@@ -457,10 +457,41 @@
</span><span class="cx"> scrollTo(newOffset);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ScrollView::scrollPositionChangedViaPlatformWidget(const IntPoint& oldPosition, const IntPoint& newPosition)
+{
+ // We should not attempt to actually modify (paint) platform widgets if the layout phase
+ // is not complete. Instead, defer the scroll event until the layout finishes.
+ if (shouldDeferScrollUpdateAfterContentSizeChange()) {
+ // We only care about the most recent scroll position change request
+ m_deferredScrollPositions = std::make_unique<std::pair<IntPoint, IntPoint>>(std::make_pair(oldPosition, newPosition));
+ return;
+ }
+
+ scrollPositionChangedViaPlatformWidgetImpl(oldPosition, newPosition);
+}
+
+void ScrollView::handleDeferredScrollUpdateAfterContentSizeChange()
+{
+ ASSERT(!shouldDeferScrollUpdateAfterContentSizeChange());
+
+ if (!m_deferredScrollDelta && !m_deferredScrollPositions)
+ return;
+
+ ASSERT(static_cast<bool>(m_deferredScrollDelta) != static_cast<bool>(m_deferredScrollPositions));
+
+ if (m_deferredScrollDelta)
+ completeUpdatesAfterScrollTo(*m_deferredScrollDelta);
+ else if (m_deferredScrollPositions)
+ scrollPositionChangedViaPlatformWidgetImpl(m_deferredScrollPositions->first, m_deferredScrollPositions->second);
+
+ m_deferredScrollDelta = nullptr;
+ m_deferredScrollPositions = nullptr;
+}
+
</ins><span class="cx"> void ScrollView::scrollTo(const IntSize& newOffset)
</span><span class="cx"> {
</span><span class="cx"> IntSize scrollDelta = newOffset - m_scrollOffset;
</span><del>- if (scrollDelta == IntSize())
</del><ins>+ if (scrollDelta.isZero())
</ins><span class="cx"> return;
</span><span class="cx"> m_scrollOffset = newOffset;
</span><span class="cx">
</span><span class="lines">@@ -473,6 +504,19 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><ins>+ // We should not attempt to actually modify layer contents if the layout phase
+ // is not complete. Instead, defer the scroll event until the layout finishes.
+ if (shouldDeferScrollUpdateAfterContentSizeChange()) {
+ ASSERT(!m_deferredScrollDelta);
+ m_deferredScrollDelta = std::make_unique<IntSize>(scrollDelta);
+ return;
+ }
+
+ completeUpdatesAfterScrollTo(scrollDelta);
+}
+
+void ScrollView::completeUpdatesAfterScrollTo(const IntSize& scrollDelta)
+{
</ins><span class="cx"> updateLayerPositionsAfterScrolling();
</span><span class="cx"> scrollContents(scrollDelta);
</span><span class="cx"> updateCompositingLayersAfterScrolling();
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreplatformScrollViewh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/ScrollView.h (179677 => 179678)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/ScrollView.h 2015-02-05 07:04:39 UTC (rev 179677)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/ScrollView.h 2015-02-05 07:49:22 UTC (rev 179678)
</span><span class="lines">@@ -373,6 +373,8 @@
</span><span class="cx">
</span><span class="cx"> virtual bool isScrollView() const override { return true; }
</span><span class="cx">
</span><ins>+ void scrollPositionChangedViaPlatformWidget(const IntPoint& oldPosition, const IntPoint& newPosition);
+
</ins><span class="cx"> protected:
</span><span class="cx"> ScrollView();
</span><span class="cx">
</span><span class="lines">@@ -408,10 +410,18 @@
</span><span class="cx"> // Called to update the scrollbars to accurately reflect the state of the view.
</span><span class="cx"> void updateScrollbars(const IntSize& desiredOffset);
</span><span class="cx">
</span><ins>+ virtual void handleDeferredScrollUpdateAfterContentSizeChange();
+
+ virtual bool shouldDeferScrollUpdateAfterContentSizeChange() { return false; }
+
+ virtual void scrollPositionChangedViaPlatformWidgetImpl(const IntPoint&, const IntPoint&) { }
+
</ins><span class="cx"> private:
</span><span class="cx"> virtual IntRect visibleContentRectInternal(VisibleContentRectIncludesScrollbars, VisibleContentRectBehavior) const override;
</span><span class="cx"> IntRect unobscuredContentRectInternal(VisibleContentRectIncludesScrollbars = ExcludeScrollbars) const;
</span><span class="cx">
</span><ins>+ void completeUpdatesAfterScrollTo(const IntSize& scrollDelta);
+
</ins><span class="cx"> RefPtr<Scrollbar> m_horizontalScrollbar;
</span><span class="cx"> RefPtr<Scrollbar> m_verticalScrollbar;
</span><span class="cx"> ScrollbarMode m_horizontalScrollbarMode;
</span><span class="lines">@@ -441,6 +451,10 @@
</span><span class="cx"> IntSize m_fixedLayoutSize;
</span><span class="cx"> IntSize m_contentsSize;
</span><span class="cx">
</span><ins>+ std::unique_ptr<IntSize> m_deferredScrollDelta; // Needed for WebKit scrolling
+ std::unique_ptr<std::pair<IntPoint, IntPoint>> m_deferredScrollPositions; // Needed for platform widget scrolling
+
+
</ins><span class="cx"> int m_scrollbarsAvoidingResizer;
</span><span class="cx"> bool m_scrollbarsSuppressed;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>