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

Side by Side Diff: third_party/WebKit/Source/web/ResizeViewportAnchor.cpp

Issue 1844013002: Fix main thread top controls scrolling to mirror CC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@propertyTreesBoundsDelta
Patch Set: Override top controls resize() in classes that override resize() Created 4 years, 8 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 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "web/ResizeViewportAnchor.h" 5 #include "web/ResizeViewportAnchor.h"
6 6
7 #include "core/frame/FrameView.h" 7 #include "core/frame/FrameView.h"
8 #include "core/frame/VisualViewport.h" 8 #include "core/frame/VisualViewport.h"
9 #include "platform/geometry/DoubleRect.h" 9 #include "platform/geometry/DoubleRect.h"
10 #include "platform/geometry/DoubleSize.h" 10 #include "platform/geometry/DoubleSize.h"
11 #include "platform/geometry/FloatSize.h" 11 #include "platform/geometry/FloatSize.h"
12 12
13 namespace blink { 13 namespace blink {
14 14
15 ResizeViewportAnchor::ResizeViewportAnchor(FrameView& rootFrameView, VisualViewp ort& visualViewport) 15 ResizeViewportAnchor::ResizeViewportAnchor(FrameView& rootFrameView, VisualViewp ort& visualViewport)
16 : ViewportAnchor(rootFrameView, visualViewport) 16 : ViewportAnchor(rootFrameView, visualViewport)
17 , m_visualViewportInDocument(rootFrameView.getScrollableArea()->visibleConte ntRectDouble().location()) 17 , m_visualViewportInDocument(rootFrameView.getScrollableArea()->scrollPositi onDouble())
18 { 18 {
19 } 19 }
20 20
21 ResizeViewportAnchor::~ResizeViewportAnchor() 21 ResizeViewportAnchor::~ResizeViewportAnchor()
22 { 22 {
23 m_rootFrameView->getScrollableArea()->setScrollPosition(m_visualViewportInDo cument, ProgrammaticScroll); 23 // TODO(bokan): Don't use RootFrameViewport::setScrollPosition since it
24 // assumes we can just set a sub-pixel precision offset on the FrameView.
25 // While we "can" do this, the offset that will be shipped to CC will be the
26 // truncated number and this class is used to handle TopControl movement
27 // which needs the two threads to match exactly pixel-for-pixel. We can
28 // replace this with RFV::setScrollPosition once Blink is sub-pixel scroll
29 // offset aware. crbug.com/414283.
30
31 ScrollableArea* rootViewport = m_rootFrameView->getScrollableArea();
32 ScrollableArea* layoutViewport =
33 m_rootFrameView->layoutViewportScrollableArea();
34
35 // Clamp the scroll offset of each viewport now so that we force any invalid
36 // offsets to become valid so we can compute the correct deltas.
37 m_visualViewport->clampToBoundaries();
38 layoutViewport->setScrollPosition(
39 layoutViewport->scrollPositionDouble(), ProgrammaticScroll);
40
41 DoubleSize delta = m_visualViewportInDocument
42 - rootViewport->scrollPositionDouble();
43
44 m_visualViewport->move(toFloatSize(delta));
45
46 // Since the main thread FrameView has integer scroll offsets, scroll it to
47 // the next pixel and then we'll scroll the visual viewport again to
48 // compensate for the sub-pixel offset.
49 delta = m_visualViewportInDocument
50 - rootViewport->scrollPositionDouble();
51
52 IntSize layoutDelta = delta.height() < 0
majidvp 2016/04/06 18:07:30 nit: Can we just round here? There does not seem t
bokan 2016/04/06 19:23:35 I don't think we can. We scroll the visual viewpor
53 ? flooredIntSize(delta)
54 : expandedIntSize(delta);
55
56 layoutViewport->setScrollPosition(
57 layoutViewport->scrollPosition() + layoutDelta,
58 ProgrammaticScroll);
59
60 delta = m_visualViewportInDocument
61 - rootViewport->scrollPositionDouble();
62 m_visualViewport->move(toFloatSize(delta));
24 } 63 }
25 64
26 } // namespace blink 65 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698