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

Unified Diff: Source/core/dom/Element.cpp

Issue 782793002: Update Element API for CSSOM smooth scrolling to match the spec (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 6 years 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/dom/Element.cpp
diff --git a/Source/core/dom/Element.cpp b/Source/core/dom/Element.cpp
index 3118dcba727bc0a98833d52955044aee37c9d040..38ebd84b865102ff686e41bf611d945ef2988eca 100644
--- a/Source/core/dom/Element.cpp
+++ b/Source/core/dom/Element.cpp
@@ -85,6 +85,7 @@
#include "core/frame/LocalDOMWindow.h"
#include "core/frame/LocalFrame.h"
#include "core/frame/PinchViewport.h"
+#include "core/frame/ScrollToOptions.h"
#include "core/frame/Settings.h"
#include "core/frame/UseCounter.h"
#include "core/frame/csp/ContentSecurityPolicy.h"
@@ -689,31 +690,10 @@ void Element::setScrollLeft(double newLeft)
if (!view)
return;
- view->setScrollPosition(DoublePoint(newLeft * frame->pageZoomFactor(), view->scrollY()));
+ view->setScrollPosition(DoublePoint(newLeft * frame->pageZoomFactor(), view->scrollY()), ScrollBehaviorAuto);
}
}
-void Element::setScrollLeft(const Dictionary& scrollOptionsHorizontal, ExceptionState& exceptionState)
-{
- String scrollBehaviorString;
- ScrollBehavior scrollBehavior = ScrollBehaviorAuto;
- if (DictionaryHelper::get(scrollOptionsHorizontal, "behavior", scrollBehaviorString)) {
- if (!ScrollableArea::scrollBehaviorFromString(scrollBehaviorString, scrollBehavior)) {
- exceptionState.throwTypeError("The ScrollBehavior provided is invalid.");
- return;
- }
- }
-
- double position;
- if (!DictionaryHelper::get(scrollOptionsHorizontal, "x", position)) {
- exceptionState.throwTypeError("ScrollOptionsHorizontal must include an 'x' member.");
- return;
- }
-
- // FIXME: Use scrollBehavior to decide whether to scroll smoothly or instantly.
- setScrollLeft(position);
-}
-
void Element::setScrollTop(double newTop)
{
document().updateLayoutIgnorePendingStylesheets();
@@ -739,31 +719,10 @@ void Element::setScrollTop(double newTop)
if (!view)
return;
- view->setScrollPosition(DoublePoint(view->scrollX(), newTop * frame->pageZoomFactor()));
+ view->setScrollPosition(DoublePoint(view->scrollX(), newTop * frame->pageZoomFactor()), ScrollBehaviorAuto);
}
}
-void Element::setScrollTop(const Dictionary& scrollOptionsVertical, ExceptionState& exceptionState)
-{
- String scrollBehaviorString;
- ScrollBehavior scrollBehavior = ScrollBehaviorAuto;
- if (DictionaryHelper::get(scrollOptionsVertical, "behavior", scrollBehaviorString)) {
- if (!ScrollableArea::scrollBehaviorFromString(scrollBehaviorString, scrollBehavior)) {
- exceptionState.throwTypeError("The ScrollBehavior provided is invalid.");
- return;
- }
- }
-
- double position;
- if (!DictionaryHelper::get(scrollOptionsVertical, "y", position)) {
- exceptionState.throwTypeError("ScrollOptionsVertical must include a 'y' member.");
- return;
- }
-
- // FIXME: Use scrollBehavior to decide whether to scroll smoothly or instantly.
- setScrollTop(position);
-}
-
int Element::scrollWidth()
{
document().updateLayoutIgnorePendingStylesheets();
@@ -780,6 +739,110 @@ int Element::scrollHeight()
return 0;
}
+void Element::scrollBy(double x, double y)
+{
+ ScrollToOptions scrollToOptions;
+ scrollToOptions.setLeft(x);
+ scrollToOptions.setTop(y);
+ scrollBy(scrollToOptions);
+}
+
+void Element::scrollBy(const ScrollToOptions& scrollToOptions)
+{
+ document().updateLayoutIgnorePendingStylesheets();
Ian Vollick 2014/12/08 16:35:23 Eventually, we'll want to process scrolls after co
ajuma 2014/12/08 18:34:13 No, there's nothing smooth-scroll specific that re
+
+ double left = scrollToOptions.hasLeft() ? scrollToOptions.left() : 0.0;
+ double top = scrollToOptions.hasTop() ? scrollToOptions.top() : 0.0;
+ if (std::isnan(left) || std::isnan(top))
+ return;
+
+ ScrollBehavior scrollBehavior = ScrollBehaviorAuto;
+ ScrollableArea::scrollBehaviorFromString(scrollToOptions.behavior(), scrollBehavior);
+
+ if (document().documentElement() != this) {
+ RenderBox* rend = renderBox();
+ if (rend) {
+ double currentScaledLeft = rend->scrollLeft();
+ double currentScaledTop = rend->scrollTop();
+ double newScaledLeft = left * rend->style()->effectiveZoom() + currentScaledLeft;
+ double newScaledTop = top * rend->style()->effectiveZoom() + currentScaledTop;
+ // FIXME: Use scrollBehavior to decide whether to scroll smoothly or instantly.
+ rend->scrollToOffset(DoubleSize(newScaledLeft, newScaledTop));
+ }
+ return;
+ }
+
+ if (RuntimeEnabledFeatures::scrollTopLeftInteropEnabled()) {
+ if (document().inQuirksMode())
+ return;
+
+ LocalFrame* frame = document().frame();
+ if (!frame)
+ return;
+ FrameView* view = frame->view();
+ if (!view)
+ return;
+
+ double newScaledLeft = left * frame->pageZoomFactor() + view->scrollX();
+ double newScaledTop = top * frame->pageZoomFactor() + view->scrollY();
+ view->setScrollPosition(DoublePoint(newScaledLeft, newScaledTop), scrollBehavior);
+ }
+}
+
+void Element::scrollTo(double x, double y)
+{
+ ScrollToOptions scrollToOptions;
+ scrollToOptions.setLeft(x);
+ scrollToOptions.setTop(y);
+ scrollTo(scrollToOptions);
+}
+
+void Element::scrollTo(const ScrollToOptions& scrollToOptions)
+{
+ document().updateLayoutIgnorePendingStylesheets();
+ if ((scrollToOptions.hasLeft() && std::isnan(scrollToOptions.left()))
+ || (scrollToOptions.hasTop() && std::isnan(scrollToOptions.top())))
+ return;
+
+ ScrollBehavior scrollBehavior = ScrollBehaviorAuto;
+ ScrollableArea::scrollBehaviorFromString(scrollToOptions.behavior(), scrollBehavior);
+
+ if (document().documentElement() != this) {
+ RenderBox* rend = renderBox();
+ if (rend) {
+ double scaledLeft = rend->scrollLeft();
+ double scaledTop = rend->scrollTop();
+ if (scrollToOptions.hasLeft())
+ scaledLeft = scrollToOptions.left() * rend->style()->effectiveZoom();
+ if (scrollToOptions.hasTop())
+ scaledTop = scrollToOptions.top() * rend->style()->effectiveZoom();
+ // FIXME: Use scrollBehavior to decide whether to scroll smoothly or instantly.
+ rend->scrollToOffset(DoubleSize(scaledLeft, scaledTop));
+ }
+ return;
+ }
+
+ if (RuntimeEnabledFeatures::scrollTopLeftInteropEnabled()) {
+ if (document().inQuirksMode())
+ return;
+
+ LocalFrame* frame = document().frame();
+ if (!frame)
+ return;
+ FrameView* view = frame->view();
+ if (!view)
+ return;
+
+ double scaledLeft = view->scrollX();
+ double scaledTop = view->scrollY();
+ if (scrollToOptions.hasLeft())
+ scaledLeft = scrollToOptions.left() * frame->pageZoomFactor();
+ if (scrollToOptions.hasTop())
+ scaledTop = scrollToOptions.top() * frame->pageZoomFactor();
+ view->setScrollPosition(DoublePoint(scaledLeft, scaledTop), scrollBehavior);
+ }
+}
+
IntRect Element::boundsInRootViewSpace()
{
document().updateLayoutIgnorePendingStylesheets();

Powered by Google App Engine
This is Rietveld 408576698