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

Side by Side Diff: Source/core/dom/Element.cpp

Issue 1158673006: Replace various ScrollableArea scroll methods with setScrollPosition (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Build fix Created 5 years, 6 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 | « no previous file | Source/core/frame/FrameView.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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) 2001 Peter Kelly (pmk@post.com) 4 * (C) 2001 Peter Kelly (pmk@post.com)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * (C) 2007 David Smith (catfish.man@gmail.com) 6 * (C) 2007 David Smith (catfish.man@gmail.com)
7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved. 7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
8 * (C) 2007 Eric Seidel (eric@webkit.org) 8 * (C) 2007 Eric Seidel (eric@webkit.org)
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 856 matching lines...) Expand 10 before | Expand all | Expand 10 after
867 ScrollableArea::scrollBehaviorFromString(scrollToOptions.behavior(), scrollB ehavior); 867 ScrollableArea::scrollBehaviorFromString(scrollToOptions.behavior(), scrollB ehavior);
868 LocalFrame* frame = document().frame(); 868 LocalFrame* frame = document().frame();
869 if (!frame) 869 if (!frame)
870 return; 870 return;
871 FrameView* view = frame->view(); 871 FrameView* view = frame->view();
872 if (!view) 872 if (!view)
873 return; 873 return;
874 874
875 double newScaledLeft = left * frame->pageZoomFactor() + view->scrollPosition Double().x(); 875 double newScaledLeft = left * frame->pageZoomFactor() + view->scrollPosition Double().x();
876 double newScaledTop = top * frame->pageZoomFactor() + view->scrollPositionDo uble().y(); 876 double newScaledTop = top * frame->pageZoomFactor() + view->scrollPositionDo uble().y();
877 view->setScrollPosition(DoublePoint(newScaledLeft, newScaledTop), scrollBeha vior); 877 view->setScrollPosition(DoublePoint(newScaledLeft, newScaledTop), Programmat icScroll, scrollBehavior);
878 } 878 }
879 879
880 void Element::scrollFrameTo(const ScrollToOptions& scrollToOptions) 880 void Element::scrollFrameTo(const ScrollToOptions& scrollToOptions)
881 { 881 {
882 ScrollBehavior scrollBehavior = ScrollBehaviorAuto; 882 ScrollBehavior scrollBehavior = ScrollBehaviorAuto;
883 ScrollableArea::scrollBehaviorFromString(scrollToOptions.behavior(), scrollB ehavior); 883 ScrollableArea::scrollBehaviorFromString(scrollToOptions.behavior(), scrollB ehavior);
884 LocalFrame* frame = document().frame(); 884 LocalFrame* frame = document().frame();
885 if (!frame) 885 if (!frame)
886 return; 886 return;
887 FrameView* view = frame->view(); 887 FrameView* view = frame->view();
888 if (!view) 888 if (!view)
889 return; 889 return;
890 890
891 double scaledLeft = view->scrollPositionDouble().x(); 891 double scaledLeft = view->scrollPositionDouble().x();
892 double scaledTop = view->scrollPositionDouble().y(); 892 double scaledTop = view->scrollPositionDouble().y();
893 if (scrollToOptions.hasLeft()) 893 if (scrollToOptions.hasLeft())
894 scaledLeft = ScrollableArea::normalizeNonFiniteScroll(scrollToOptions.le ft()) * frame->pageZoomFactor(); 894 scaledLeft = ScrollableArea::normalizeNonFiniteScroll(scrollToOptions.le ft()) * frame->pageZoomFactor();
895 if (scrollToOptions.hasTop()) 895 if (scrollToOptions.hasTop())
896 scaledTop = ScrollableArea::normalizeNonFiniteScroll(scrollToOptions.top ()) * frame->pageZoomFactor(); 896 scaledTop = ScrollableArea::normalizeNonFiniteScroll(scrollToOptions.top ()) * frame->pageZoomFactor();
897 view->setScrollPosition(DoublePoint(scaledLeft, scaledTop), scrollBehavior); 897 view->setScrollPosition(DoublePoint(scaledLeft, scaledTop), ProgrammaticScro ll, scrollBehavior);
898 } 898 }
899 899
900 void Element::incrementProxyCount() 900 void Element::incrementProxyCount()
901 { 901 {
902 if (ensureElementRareData().incrementProxyCount() == 1) 902 if (ensureElementRareData().incrementProxyCount() == 1)
903 setNeedsStyleRecalc(LocalStyleChange, StyleChangeReasonForTracing::creat e(StyleChangeReason::CompositorProxy)); 903 setNeedsStyleRecalc(LocalStyleChange, StyleChangeReasonForTracing::creat e(StyleChangeReason::CompositorProxy));
904 } 904 }
905 905
906 void Element::decrementProxyCount() 906 void Element::decrementProxyCount()
907 { 907 {
(...skipping 2480 matching lines...) Expand 10 before | Expand all | Expand 10 after
3388 { 3388 {
3389 #if ENABLE(OILPAN) 3389 #if ENABLE(OILPAN)
3390 if (hasRareData()) 3390 if (hasRareData())
3391 visitor->trace(elementRareData()); 3391 visitor->trace(elementRareData());
3392 visitor->trace(m_elementData); 3392 visitor->trace(m_elementData);
3393 #endif 3393 #endif
3394 ContainerNode::trace(visitor); 3394 ContainerNode::trace(visitor);
3395 } 3395 }
3396 3396
3397 } // namespace blink 3397 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/frame/FrameView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698