From 52e4bc9c93533cf2a7c4ef11e6df5f8debf13018 Mon Sep 17 00:00:00 2001 From: Ojan Vafai Date: Thu, 23 Oct 2014 20:20:25 -0700 Subject: [PATCH] Get rid of ScrollView. We only allow overflow scrolling. The frame isn't special. This is a first step in making that happen. There's a lot of code to remove after this patch, but this gets rid of ScrollView and a bunch of frame-level scrolling code. Had to add in a FrameWidget class so that Scrollbar.cpp had a way of getting to FrameView::removeChild without pulling a core class into platform. This might go away when we rip out the Widget tree if we made it so that FrameView didn't keep a list of Scrollbar instances. Modified scrollbar.html to use overflow scrolling instead of frame level scrolling. Once we get rid of the split between Document and documentElement, we'll be able to make the root element in the page scrollable as well (i.e. any child of the Document). R=abarth@chromium.org Review URL: https://codereview.chromium.org/646273006 --- .../tests/lowlevel/scrollbar-expected.txt | 8 ++-- .../src/flutter/tests/lowlevel/scrollbar.html | 44 ++++++++++--------- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/engine/src/flutter/tests/lowlevel/scrollbar-expected.txt b/engine/src/flutter/tests/lowlevel/scrollbar-expected.txt index 2d082379c4f..28369d92890 100644 --- a/engine/src/flutter/tests/lowlevel/scrollbar-expected.txt +++ b/engine/src/flutter/tests/lowlevel/scrollbar-expected.txt @@ -1,7 +1,9 @@ -layer at (0,0) size 800x1500 +layer at (0,0) size 800x600 RenderView {#document} at (0,0) size 800x600 -layer at (0,0) size 800x1500 - RenderBlock {html} at (0,0) size 800x1500 [bgcolor=#FFC0CB] +layer at (0,0) size 800x400 + RenderBlock {sky} at (0,0) size 800x400 +layer at (0,0) size 800x400 scrollHeight 1500 + RenderBlock {scroller} at (0,0) size 800x400 RenderBlock {div} at (0,0) size 800x100 RenderText {#text} at (0,0) size 10x19 text run at (0,0) width 10: "a" diff --git a/engine/src/flutter/tests/lowlevel/scrollbar.html b/engine/src/flutter/tests/lowlevel/scrollbar.html index 3e230d41e78..b4eee6cd03b 100644 --- a/engine/src/flutter/tests/lowlevel/scrollbar.html +++ b/engine/src/flutter/tests/lowlevel/scrollbar.html @@ -1,21 +1,23 @@ - - - -
a
-
b
-
c
-
d
-
e
-
f
-
g
-
h
-
i
-
j
-
k
-
l
-
m
-
n
-
o
- + + + + +
a
+
b
+
c
+
d
+
e
+
f
+
g
+
h
+
i
+
j
+
k
+
l
+
m
+
n
+
o
+ +