ChangeLog

2013-08-22  Gurpreet Kaur  <gur.trio@gmail.com>

        <https://webkit.org/b/106133> document.body.scrollTop & document.documentElement.scrollTop differ cross-browser

        Reviewed by NOBODY (OOPS!).

        Webkit always uses document.body.scrollTop whether quirks or

        standard mode. Similiar behaviour is for document.body.scrollLeft.

        As per the specification webkit should return document.body.scrollTop

        for quirks mode and document.documentElement.scrollTop for standard mode.

        Same for document.body.scrollLeft and document.documentElement.scrollLef

        Tests: fast/dom/Element/scrollLeft-Quirks.html

               fast/dom/Element/scrollLeft.html

               fast/dom/Element/scrollTop-Quirks.html

               fast/dom/Element/scrollTop.html

        * dom/Element.cpp:

        (WebCore::Element::scrollLeft):

        (WebCore::Element::scrollTop): 

        If the element does not have any associated CSS layout box or the element

        is the root element and the Document is in quirks mode return zero.

        Else If the element is the root element return the value of scrollY

        for scrollTop and scrollX for scrollLeft

        * html/HTMLBodyElement.cpp:

        (WebCore::HTMLBodyElement::scrollLeft):

        (WebCore::HTMLBodyElement::scrollTop):

        If the element is the HTML body element, the Document is in quirks mode,

        return the value of scrollY for scrollTop and scrollX for scrollLeft.

2013-08-21  Commit Queue  <commit-queue@webkit.org>

        Unreviewed, rolling out r154416.

154437

Source/WebCore/dom/Element.cpp

@@int Element::clientHeight()

int Element::scrollLeft()

{

    bool inQuirksMode = document()->inQuirksMode();

    if (document()->documentElement() == this && inQuirksMode)   

        return 0;

766770 document()->updateLayoutIgnorePendingStylesheets();

    if (document()->documentElement() == this) {

        if (RenderView* renderView = document()->renderView()) {

            if (FrameView* view = renderView->frameView())

                return adjustForAbsoluteZoom(view->scrollX(), renderView);

        }

    }

    if (RenderBox* rend = renderBox())

        return adjustForAbsoluteZoom(rend->scrollLeft(), rend);

    return 0;

@@int Element::scrollLeft()

int Element::scrollTop()

{

    bool inQuirksMode = document()->inQuirksMode();

    if (document()->documentElement() == this && inQuirksMode)   

        return 0;

774789 document()->updateLayoutIgnorePendingStylesheets();

    if (document()->documentElement() == this) {    

        if (RenderView* renderView = document()->renderView()) {

            if (FrameView* view = renderView->frameView())

                return adjustForAbsoluteZoom(view->scrollY(), renderView);

        }  

    }

    if (RenderBox* rend = renderBox())

        return adjustForAbsoluteZoom(rend->scrollTop(), rend);

    return 0;

154276

Source/WebCore/html/HTMLBodyElement.cpp

@@static int adjustForZoom(int value, Docu

int HTMLBodyElement::scrollLeft()

{

    // Update the document's layout.

265 Document* document = this->document();

266 document->updateLayoutIgnorePendingStylesheets();

265 Document* document = this->document();

267266 FrameView* view = document->view();

268 return view ? adjustForZoom(view->scrollX(), document) : 0;

    if (document->inQuirksMode()) {

        document->updateLayoutIgnorePendingStylesheets();

        return view ? adjustForZoom(view->scrollX(), document) : 0;

    }

    return 0;

}

void HTMLBodyElement::setScrollLeft(int scrollLeft)

@@void HTMLBodyElement::setScrollLeft(int

int HTMLBodyElement::scrollTop()

{

    // Update the document's layout.

287 Document* document = this->document();

288 document->updateLayoutIgnorePendingStylesheets();

290 Document* document = this->document();

289291 FrameView* view = document->view();

290 return view ? adjustForZoom(view->scrollY(), document) : 0;

    if (document->inQuirksMode()) {

        document->updateLayoutIgnorePendingStylesheets();

        return view ? adjustForZoom(view->scrollY(), document) : 0;

    }

    return 0;

}

void HTMLBodyElement::setScrollTop(int scrollTop)

154276

LayoutTests/ChangeLog

2013-08-22  Gurpreet Kaur  <gur.trio@gmail.com>

        <https://webkit.org/b/106133> document.body.scrollTop & document.documentElement.scrollTop differ cross-browser

        Reviewed by NOBODY (OOPS!).

        * fast/dom/Element/scrollLeft-Quirks-expected.txt: Added.

        * fast/dom/Element/scrollLeft-Quirks.html: Added.

        * fast/dom/Element/scrollLeft-expected.txt: Added.

        * fast/dom/Element/scrollLeft.html: Added.

        * fast/dom/Element/scrollTop-Quirks-expected.txt: Added.

        * fast/dom/Element/scrollTop-Quirks.html: Added.

        * fast/dom/Element/scrollTop-expected.txt: Added.

        * fast/dom/Element/scrollTop.html: Added.

        Added new tests for verifying our behavior for document.body.scrollTop/scrollLeft and

        document.documentElement.scrollTop/scrollLeft for both Quirks as well as Standard mode.

        * fast/css/zoom-body-scroll-expected.txt:

        * fast/css/zoom-body-scroll.html:

        * fast/events/mouse-cursor.html:

        * http/tests/navigation/anchor-frames-expected.txt:

        * http/tests/navigation/anchor-frames-gbk-expected.txt:

        * http/tests/navigation/resources/frame-with-anchor-gbk.html:

        * http/tests/navigation/resources/frame-with-anchor-same-origin.html:

        * http/tests/navigation/resources/frame-with-anchor.html:

        * platform/mac-wk2/tiled-drawing/resources/scroll-and-load-page.html:

        * platform/mac-wk2/tiled-drawing/tiled-drawing-scroll-position-page-cache-restoration.html: 

        Rebaselining existing tests as per the new behavior. The test cases are changed to use

        quirks mode because it uses document.body.scrollTop/scrollLeft and as per the new code 

        document.body.scrollTop/scrollLeft will return correct value if document is in quirk mode

        Also test cases have been modified so that it tests what it used to.

2013-08-21  Ryosuke Niwa  <rniwa@webkit.org>

        Update Mac test expectations.

154437

LayoutTests/fast/css/zoom-body-scroll-expected.txt

11Test for rdar://problem/6643103 Unscaled values from body.scrollHeight.

22

3 scrollHeight: ~~1000~~

4 scrollWidth: ~~1000~~

3scrollHeight: 9999

4scrollWidth: 9999

Scrolling right to 50

scrollLeft: 50

Zooming in

scrollHeight: 1000

scrollWidth: 1000

scrollTop: 0

scrollHeight: 9999

scrollWidth: 9999

scrollTop: 100

scrollLeft: 50

Scrolling down to 100

154276

LayoutTests/fast/css/zoom-body-scroll.html

1 <!DOCTYPE HTML>

21<html>

3 <body>

4 <div style="width: ~~1000~~px; height: ~~1000~~px; position: absolute; top: 0; left: 0;"></div>

2<body onload="pageScroll()">

3 <div style="width: 9999px; height: 9999px; position: absolute; top: 0; left: 0;"></div>

    <div style="width: 100px; height: 100px; position: absolute; top: 100px; left: 0; background: green"></div>

    <p>

        Test for <i><a href="rdar://problem/6643103">rdar://problem/6643103</a>

            var console = document.getElementById("console");

            console.appendChild(document.createTextNode(message + "\n"));

        }

        function pageScroll() {

            window.scrollTo(50,100);

            setTimeout(bodyScroll(),3000);

        }

1720

        if (window.testRunner) {

            testRunner.dumpAsText();

            var body = document.body;

            log("scrollHeight: " + body.scrollHeight);

            log("scrollWidth: " + body.scrollWidth);

        function bodyScroll() {

            if (window.testRunner) {

                testRunner.dumpAsText();

                var body = document.body;

                log("scrollHeight: " + body.scrollHeight);

                log("scrollWidth: " + body.scrollWidth);

2327

            log("\nScrolling right to 50");

            body.scrollLeft = 50;

            log("scrollLeft: " + body.scrollLeft);

                log("\nScrolling right to 50");

                body.scrollLeft = 50;

                log("scrollLeft: " + body.scrollLeft);

2731

            log("\nZooming in");

            eventSender.zoomPageIn();

            log("scrollHeight: " + body.scrollHeight);

            log("scrollWidth: " + body.scrollWidth);

            log("scrollTop: " + body.scrollTop);

            log("scrollLeft: " + body.scrollLeft);

                log("\nZooming in");

                eventSender.zoomPageIn();

                log("scrollHeight: " + body.scrollHeight);

                log("scrollWidth: " + body.scrollWidth);

                log("scrollTop: " + body.scrollTop);

                log("scrollLeft: " + body.scrollLeft);

3438

            log("\nScrolling down to 100");

            body.scrollTop = 100;

            log("scrollTop: " + body.scrollTop);

                log("\nScrolling down to 100");

                body.scrollTop = 100;

                log("scrollTop: " + body.scrollTop);

3842

            log("\nZooming back out");

            eventSender.zoomPageOut();

            log("scrollTop: " + body.scrollTop);

            log("scrollLeft: " + body.scrollLeft);

                log("\nZooming back out");

                eventSender.zoomPageOut();

                log("scrollTop: " + body.scrollTop);

                log("scrollLeft: " + body.scrollLeft);

			}

        }

    </script>

</body>

154276

LayoutTests/fast/dom/Element/scrollLeft-Quirks-expected.txt

Tests that for quirks mode document.body.scrollLeft returns the scroll left value

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

PASS 500 is window.pageXOffset

PASS 500 is document.body.scrollLeft

PASS 0 is document.documentElement.scrollLeft

PASS successfullyParsed is true

TEST COMPLETE

0

LayoutTests/fast/dom/Element/scrollLeft-Quirks.html

<html>

    <head>

        <style>

            div {

                height: 9999px;

                width:9999px;

            }

        </style>

        <script src="../../js/resources/js-test-pre.js"></script>

        <script>

            function runTest() {

                description('Tests that for quirks mode document.body.scrollLeft returns the scroll left value');

				setTimeout(function() {

                    window.scrollTo(500,0);

                    shouldBe("500","window.pageXOffset");

                    shouldBe("500","document.body.scrollLeft");

                    shouldBe("0","document.documentElement.scrollLeft");

                    finishJSTest();

                }, 0);

            }

            var jsTestIsAsync = true;

        </script>

    </head>

    <body onload="runTest()">

        <div></div>

        <script src="../../js/resources/js-test-post.js"></script>

    </body>

</html>

0

LayoutTests/fast/dom/Element/scrollLeft-expected.txt

Tests that for standard mode document.documentElement.scrollLeft returns the scroll left value

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

PASS 500 is window.pageXOffset

PASS 0 is document.body.scrollLeft

PASS 500 is document.documentElement.scrollLeft

PASS successfullyParsed is true

TEST COMPLETE

0

LayoutTests/fast/dom/Element/scrollLeft.html

<!DOCTYPE html>

<html>

    <head>

        <style>

            div {

                height: 9999px;

                width:9999px;

            }

        </style>

        <script src="../../js/resources/js-test-pre.js"></script>

        <script>

            function runTest() {

                description('Tests that for standard mode document.documentElement.scrollLeft returns the scroll left value');	  

                setTimeout(function() {

                    window.scrollTo(500,0);

                    shouldBe("500","window.pageXOffset");

                    shouldBe("0","document.body.scrollLeft");

                    shouldBe("500","document.documentElement.scrollLeft");

                    finishJSTest();          

                }, 0);

            }

            var jsTestIsAsync = true;

        </script>  

    </head>

    <body onload="runTest()">

        <div></div>

        <script src="../../js/resources/js-test-post.js"></script>

    </body>

</html>

0

LayoutTests/fast/dom/Element/scrollTop-Quirks-expected.txt

Tests that for quirks mode document.body.scrollTop returns the scroll top value

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

PASS 500 is window.pageYOffset

PASS 500 is document.body.scrollTop

PASS 0 is document.documentElement.scrollTop

PASS successfullyParsed is true

TEST COMPLETE

0

LayoutTests/fast/dom/Element/scrollTop-Quirks.html

<html>

    <head>

        <style>

            div {

                height: 9999px;

                width:9999px;

            }

        </style>

        <script src="../../js/resources/js-test-pre.js"></script>

        <script>

            function runTest() {

                description('Tests that for quirks mode document.body.scrollTop returns the scroll top value');

                setTimeout(function() {

                    window.scrollTo(0,500);

                    shouldBe("500","window.pageYOffset");              

					shouldBe("500","document.body.scrollTop");

                    shouldBe("0","document.documentElement.scrollTop");

                    finishJSTest();

                }, 0);

            }

            var jsTestIsAsync = true;

        </script>

    </head>

    <body onload="runTest()">

        <div></div>

        <script src="../../js/resources/js-test-post.js"></script>

    </body>

</html>

0

LayoutTests/fast/dom/Element/scrollTop-expected.txt

Tests that for standard mode document.documentElement.scrollTop returns the scroll top value

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

PASS 500 is window.pageYOffset

PASS 0 is document.body.scrollTop

PASS 500 is document.documentElement.scrollTop

PASS successfullyParsed is true

TEST COMPLETE

0

LayoutTests/fast/dom/Element/scrollTop.html

<!DOCTYPE html>

<html>

    <head>

        <style>

            div {

                height: 9999px;

                width:9999px;

            }

        </style>

        <script src="../../js/resources/js-test-pre.js"></script>

        <script>

            function runTest() {

                description('Tests that for standard mode document.documentElement.scrollTop returns the scroll top value');

                setTimeout(function() {

                    window.scrollTo(0,500);

                    shouldBe("500","window.pageYOffset");

                    shouldBe("0","document.body.scrollTop");

                    shouldBe("500","document.documentElement.scrollTop");

                    finishJSTest();

                }, 0);

            }

            var jsTestIsAsync = true;

        </script>

    </head>

    <body onload="runTest()">

        <div></div>

        <script src="../../js/resources/js-test-post.js"></script>

    </body>

</html>

0

LayoutTests/fast/events/mouse-cursor.html

1 <!DOCTYPE html>

<html>

<head>

<script src="../js/resources/js-test-pre.js"></script>

154276

LayoutTests/http/tests/navigation/anchor-frames-expected.txt

@@Tests that loading a frame with a URL th

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

11 PASS document.body.offsetHeight > ~~document.documentElement.client~~Height is true

11PASS document.body.offsetHeight > window.innerHeight is true

PASS document.body.scrollTop > 0 is true

PASS document.body.scrollTop + document.documentElement.clientHeight > 2000 is true

PASS successfullyParsed is true

154276

LayoutTests/http/tests/navigation/anchor-frames-gbk-expected.txt

@@Tests that loading a frame with a URL th

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

11 PASS document.body.offsetHeight > ~~document.documentElement.client~~Height is true

11PASS document.body.offsetHeight > window.innerHeight is true

PASS document.body.scrollTop > 0 is true

PASS document.body.scrollTop + document.documentElement.clientHeight > 2000 is true

PASS successfullyParsed is true

154276

LayoutTests/http/tests/navigation/resources/frame-with-anchor-gbk.html

1 <!DOCTYPE html>

<html>

<head>

  <meta http-equiv="Content-Type" content="text/html; charset=gbk"/>

  <script src="../../../js-test-resources/js-test-pre.js"></script>

  <script>

    function runTest() {

8 description('Tests that loading a frame with a URL that contains a fragment pointed at a named anchor actually scrolls to that anchor.');

7 description('Tests that loading a frame with a URL that contains a fragment pointed at a named anchor actually scrolls to that anchor.');

      // Check scroll position in a timeout to make sure that the anchor has

      // been scrolled to.

      setTimeout(function() {

          // Make sure that the body is taller than the viewport (i.e. scrolling is

          // required).

15 shouldBeTrue('document.body.offsetHeight > ~~document.documentElement.client~~Height');

14 shouldBeTrue('document.body.offsetHeight > window.innerHeight');

          
          // We should be scrolled at least a little bit

          shouldBeTrue('document.body.scrollTop > 0');

154276

LayoutTests/http/tests/navigation/resources/frame-with-anchor-same-origin.html

1 <!DOCTYPE html>

<html>

<head>

  <script src="../../../js-test-resources/js-test-pre.js"></script>

    var jsTestIsAsync = true;

  </script>  

</head>

19 <body>

18<body onload="runTest()">

<!-- large same-origin grandchild frame -->

<iframe height="8000" width="8000" src="http://127.0.0.1:8000/navigation/resources/grandchild-with-anchor.html#anchor1" name="grandchild" onload="runTest()">

</iframe>

154276

LayoutTests/http/tests/navigation/resources/frame-with-anchor.html

1 <!DOCTYPE html>

<html>

<head>

  <script src="../../../js-test-resources/js-test-pre.js"></script>

  <script>

    function runTest() {

7 description('Tests that loading a frame with a URL that contains a fragment pointed at a named anchor actually scrolls to that anchor.');

8

      //description('Tests that loading a frame with a URL that contains a fragment pointed at a named anchor actually scrolls to that anchor.');

	  alert(document.body.offsetHeight);

	  alert(document.documentElement.clientHeight);

      // Check scroll position in a timeout to make sure that the anchor has

      // been scrolled to.

      setTimeout(function() {

          // Make sure that the body is taller than the viewport (i.e. scrolling is

          // required).

14 shouldBeTrue('document.body.offsetHeight > ~~document.documentElement.client~~Height');

15 shouldBeTrue('document.body.offsetHeight > window.innerHeight');

          
          // We should be scrolled at least a little bit

          shouldBeTrue('document.body.scrollTop > 0');

154276

LayoutTests/platform/mac-wk2/tiled-drawing/tiled-drawing-scroll-position-page-cache-restoration.html

1 <!DOCTYPE html>

<html>

<head>

    <script>

154276

LayoutTests/platform/mac-wk2/tiled-drawing/resources/scroll-and-load-page.html

1 <!DOCTYPE html>

<html>

<head>

    <style>

154276