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

Unified Diff: sky/engine/core/dom/Element.cpp

Issue 677223002: Remove some more frame-level scrolling machinery. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | sky/engine/core/dom/TreeScope.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/dom/Element.cpp
diff --git a/sky/engine/core/dom/Element.cpp b/sky/engine/core/dom/Element.cpp
index e2b45d437138f616b91e361fff749a9b4cbb5aaf..62197c5a0f5db6c71d23edc6ef3f818bbddf39b5 100644
--- a/sky/engine/core/dom/Element.cpp
+++ b/sky/engine/core/dom/Element.cpp
@@ -461,14 +461,6 @@ int Element::scrollLeft()
if (document().documentElement() != this) {
if (RenderBox* rend = renderBox())
return adjustDoubleForAbsoluteZoom(rend->scrollLeft(), *rend);
- return 0;
- }
-
- if (RuntimeEnabledFeatures::scrollTopLeftInteropEnabled()) {
- if (FrameView* view = document().view()) {
- if (RenderView* renderView = document().renderView())
- return adjustDoubleForAbsoluteZoom(view->scrollX(), *renderView);
- }
}
return 0;
@@ -481,14 +473,6 @@ int Element::scrollTop()
if (document().documentElement() != this) {
if (RenderBox* rend = renderBox())
return adjustLayoutUnitForAbsoluteZoom(rend->scrollTop(), *rend);
- return 0;
- }
-
- if (RuntimeEnabledFeatures::scrollTopLeftInteropEnabled()) {
- if (FrameView* view = document().view()) {
- if (RenderView* renderView = document().renderView())
- return adjustDoubleForAbsoluteZoom(view->scrollY(), *renderView);
- }
}
return 0;
@@ -501,18 +485,6 @@ void Element::setScrollLeft(int newLeft)
if (document().documentElement() != this) {
if (RenderBox* rend = renderBox())
rend->setScrollLeft(LayoutUnit::fromFloatRound(newLeft * rend->style()->effectiveZoom()));
- return;
- }
-
- if (RuntimeEnabledFeatures::scrollTopLeftInteropEnabled()) {
- LocalFrame* frame = document().frame();
- if (!frame)
- return;
- FrameView* view = frame->view();
- if (!view)
- return;
-
- view->setScrollPosition(IntPoint(roundf(newLeft * frame->pageZoomFactor()), view->scrollY()));
}
}
@@ -544,18 +516,6 @@ void Element::setScrollTop(int newTop)
if (document().documentElement() != this) {
if (RenderBox* rend = renderBox())
rend->setScrollTop(LayoutUnit::fromFloatRound(newTop * rend->style()->effectiveZoom()));
- return;
- }
-
- if (RuntimeEnabledFeatures::scrollTopLeftInteropEnabled()) {
- LocalFrame* frame = document().frame();
- if (!frame)
- return;
- FrameView* view = frame->view();
- if (!view)
- return;
-
- view->setScrollPosition(IntPoint(view->scrollX(), roundf(newTop * frame->pageZoomFactor())));
}
}
« no previous file with comments | « no previous file | sky/engine/core/dom/TreeScope.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698