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

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

Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-platform: rebase-yayyyyyyyy Created 4 years, 9 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) 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 883 matching lines...) Expand 10 before | Expand all | Expand 10 after
894 void Element::scrollFrameBy(const ScrollToOptions& scrollToOptions) 894 void Element::scrollFrameBy(const ScrollToOptions& scrollToOptions)
895 { 895 {
896 double left = scrollToOptions.hasLeft() ? ScrollableArea::normalizeNonFinite Scroll(scrollToOptions.left()) : 0.0; 896 double left = scrollToOptions.hasLeft() ? ScrollableArea::normalizeNonFinite Scroll(scrollToOptions.left()) : 0.0;
897 double top = scrollToOptions.hasTop() ? ScrollableArea::normalizeNonFiniteSc roll(scrollToOptions.top()) : 0.0; 897 double top = scrollToOptions.hasTop() ? ScrollableArea::normalizeNonFiniteSc roll(scrollToOptions.top()) : 0.0;
898 898
899 ScrollBehavior scrollBehavior = ScrollBehaviorAuto; 899 ScrollBehavior scrollBehavior = ScrollBehaviorAuto;
900 ScrollableArea::scrollBehaviorFromString(scrollToOptions.behavior(), scrollB ehavior); 900 ScrollableArea::scrollBehaviorFromString(scrollToOptions.behavior(), scrollB ehavior);
901 LocalFrame* frame = document().frame(); 901 LocalFrame* frame = document().frame();
902 if (!frame) 902 if (!frame)
903 return; 903 return;
904 ScrollableArea* viewport = frame->view() ? frame->view()->scrollableArea() : 0; 904 ScrollableArea* viewport = frame->view() ? frame->view()->getScrollableArea( ) : 0;
905 if (!viewport) 905 if (!viewport)
906 return; 906 return;
907 907
908 double newScaledLeft = left * frame->pageZoomFactor() + viewport->scrollPosi tionDouble().x(); 908 double newScaledLeft = left * frame->pageZoomFactor() + viewport->scrollPosi tionDouble().x();
909 double newScaledTop = top * frame->pageZoomFactor() + viewport->scrollPositi onDouble().y(); 909 double newScaledTop = top * frame->pageZoomFactor() + viewport->scrollPositi onDouble().y();
910 viewport->setScrollPosition(DoublePoint(newScaledLeft, newScaledTop), Progra mmaticScroll, scrollBehavior); 910 viewport->setScrollPosition(DoublePoint(newScaledLeft, newScaledTop), Progra mmaticScroll, scrollBehavior);
911 } 911 }
912 912
913 void Element::scrollFrameTo(const ScrollToOptions& scrollToOptions) 913 void Element::scrollFrameTo(const ScrollToOptions& scrollToOptions)
914 { 914 {
915 ScrollBehavior scrollBehavior = ScrollBehaviorAuto; 915 ScrollBehavior scrollBehavior = ScrollBehaviorAuto;
916 ScrollableArea::scrollBehaviorFromString(scrollToOptions.behavior(), scrollB ehavior); 916 ScrollableArea::scrollBehaviorFromString(scrollToOptions.behavior(), scrollB ehavior);
917 LocalFrame* frame = document().frame(); 917 LocalFrame* frame = document().frame();
918 if (!frame) 918 if (!frame)
919 return; 919 return;
920 ScrollableArea* viewport = frame->view() ? frame->view()->scrollableArea() : 0; 920 ScrollableArea* viewport = frame->view() ? frame->view()->getScrollableArea( ) : 0;
921 if (!viewport) 921 if (!viewport)
922 return; 922 return;
923 923
924 double scaledLeft = viewport->scrollPositionDouble().x(); 924 double scaledLeft = viewport->scrollPositionDouble().x();
925 double scaledTop = viewport->scrollPositionDouble().y(); 925 double scaledTop = viewport->scrollPositionDouble().y();
926 if (scrollToOptions.hasLeft()) 926 if (scrollToOptions.hasLeft())
927 scaledLeft = ScrollableArea::normalizeNonFiniteScroll(scrollToOptions.le ft()) * frame->pageZoomFactor(); 927 scaledLeft = ScrollableArea::normalizeNonFiniteScroll(scrollToOptions.le ft()) * frame->pageZoomFactor();
928 if (scrollToOptions.hasTop()) 928 if (scrollToOptions.hasTop())
929 scaledTop = ScrollableArea::normalizeNonFiniteScroll(scrollToOptions.top ()) * frame->pageZoomFactor(); 929 scaledTop = ScrollableArea::normalizeNonFiniteScroll(scrollToOptions.top ()) * frame->pageZoomFactor();
930 viewport->setScrollPosition(DoublePoint(scaledLeft, scaledTop), Programmatic Scroll, scrollBehavior); 930 viewport->setScrollPosition(DoublePoint(scaledLeft, scaledTop), Programmatic Scroll, scrollBehavior);
(...skipping 2739 matching lines...) Expand 10 before | Expand all | Expand 10 after
3670 { 3670 {
3671 #if ENABLE(OILPAN) 3671 #if ENABLE(OILPAN)
3672 if (hasRareData()) 3672 if (hasRareData())
3673 visitor->trace(elementRareData()); 3673 visitor->trace(elementRareData());
3674 visitor->trace(m_elementData); 3674 visitor->trace(m_elementData);
3675 #endif 3675 #endif
3676 ContainerNode::trace(visitor); 3676 ContainerNode::trace(visitor);
3677 } 3677 }
3678 3678
3679 } // namespace blink 3679 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698