Title: [133205] trunk
Revision
133205
Author
bda...@apple.com
Date
2012-11-01 11:57:39 -0700 (Thu, 01 Nov 2012)

Log Message

.: https://bugs.webkit.org/show_bug.cgi?id=100917
There should be a way to dump the scrolling tree from the layout tests

Reviewed by Simon Fraser.

* Source/autotools/symbols.filter:

Source/WebCore: https://bugs.webkit.org/show_bug.cgi?id=100917
There should be a way to dump the scrolling tree from the layout tests

Reviewed by Simon Fraser.

New Internals call to dump the scrolling state tree as text. Calls through to the 
ScrollingCoordinator.
* testing/Internals.cpp:
(WebCore::Internals::scrollingStateTreeAsText):
(WebCore):
* testing/Internals.h:
* testing/Internals.idl:
* WebCore.exp.in:
* page/Page.cpp:
(WebCore::Page::scrollingStateTreeAsText):
(WebCore):
* page/Page.h:
(Page):

ScrollingCoordinator tells the rootStateNode to dump the tree as text.
* page/scrolling/mac/ScrollingCoordinatorMac.h:
(ScrollingCoordinatorMac):
* page/scrolling/mac/ScrollingCoordinatorMac.mm:
(WebCore::ScrollingCoordinatorMac::scrollingStateTreeAsText):
(WebCore):
* page/scrolling/ScrollingCoordinator.cpp:
(WebCore::ScrollingCoordinator::scrollingStateTreeAsText):
(WebCore):
* page/scrolling/ScrollingCoordinator.h:
(ScrollingCoordinator):

dumpNode() dumps generic stuff for each node, and dumpProperties will dump the 
properties that are specific to different types of nodes.
* page/scrolling/ScrollingStateNode.cpp:
(WebCore::ScrollingStateNode::writeIndent):
(WebCore):
(WebCore::ScrollingStateNode::dumpNode):
(WebCore::ScrollingStateNode::scrollingStateTreeAsText):
* page/scrolling/ScrollingStateNode.h:
(WebCore):
(ScrollingStateNode):
* page/scrolling/ScrollingStateScrollingNode.cpp:
(WebCore::ScrollingStateScrollingNode::dumpProperties):
(WebCore):
* page/scrolling/ScrollingStateScrollingNode.h:
(ScrollingStateScrollingNode):

Source/WebKit2: https://bugs.webkit.org/show_bug.cgi?id=100917
There should be a way to dump the scrolling tree from the layout tests
        
Reviewed by Simon Fraser.

* win/WebKit2.def:
* win/WebKit2CFLite.def:

LayoutTests: https://bugs.webkit.org/show_bug.cgi?id=100917
There should be a way to dump the scrolling tree from the layout tests

Reviewed by Simon Fraser.

* platform/mac/tiled-drawing/scrolling-tree-after-scroll-expected.txt: Added.
* platform/mac/tiled-drawing/scrolling-tree-after-scroll.html: Added.
* platform/mac/tiled-drawing/scrolling-tree-slow-scrolling-expected.txt: Added.
* platform/mac/tiled-drawing/scrolling-tree-slow-scrolling.html: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/ChangeLog (133204 => 133205)


--- trunk/ChangeLog	2012-11-01 18:56:11 UTC (rev 133204)
+++ trunk/ChangeLog	2012-11-01 18:57:39 UTC (rev 133205)
@@ -1,3 +1,12 @@
+2012-11-01  Beth Dakin  <bda...@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=100917
+        There should be a way to dump the scrolling tree from the layout tests
+
+        Reviewed by Simon Fraser.
+
+        * Source/autotools/symbols.filter:
+
 2012-10-31  Thiago Marcos P. Santos  <thiago.san...@intel.com>
 
         Added viewport at-rule to the CSS parser and tokenizer

Modified: trunk/LayoutTests/ChangeLog (133204 => 133205)


--- trunk/LayoutTests/ChangeLog	2012-11-01 18:56:11 UTC (rev 133204)
+++ trunk/LayoutTests/ChangeLog	2012-11-01 18:57:39 UTC (rev 133205)
@@ -1,3 +1,15 @@
+2012-11-01  Beth Dakin  <bda...@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=100917
+        There should be a way to dump the scrolling tree from the layout tests
+
+        Reviewed by Simon Fraser.
+
+        * platform/mac/tiled-drawing/scrolling-tree-after-scroll-expected.txt: Added.
+        * platform/mac/tiled-drawing/scrolling-tree-after-scroll.html: Added.
+        * platform/mac/tiled-drawing/scrolling-tree-slow-scrolling-expected.txt: Added.
+        * platform/mac/tiled-drawing/scrolling-tree-slow-scrolling.html: Added.
+
 2012-11-01  Dana Jansens  <dan...@chromium.org>
 
         Rebaseline after compositor migration to gfx types.

Added: trunk/LayoutTests/platform/mac/tiled-drawing/scrolling-tree-after-scroll-expected.txt (0 => 133205)


--- trunk/LayoutTests/platform/mac/tiled-drawing/scrolling-tree-after-scroll-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/mac/tiled-drawing/scrolling-tree-after-scroll-expected.txt	2012-11-01 18:57:39 UTC (rev 133205)
@@ -0,0 +1,6 @@
+(Scrolling node
+  (viewport rect 0 0 785 600)
+  (contents size 785 5021)
+  (requested scroll position 0 3000)
+)
+

Added: trunk/LayoutTests/platform/mac/tiled-drawing/scrolling-tree-after-scroll.html (0 => 133205)


--- trunk/LayoutTests/platform/mac/tiled-drawing/scrolling-tree-after-scroll.html	                        (rev 0)
+++ trunk/LayoutTests/platform/mac/tiled-drawing/scrolling-tree-after-scroll.html	2012-11-01 18:57:39 UTC (rev 133205)
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+    <style>
+        body {
+            height: 5000px;
+        }
+    </style>
+    <script>
+        if (window.testRunner)
+            testRunner.dumpAsText();
+
+        function doTest()
+        {
+            window.scrollTo(0, 3000);
+            if (window.internals) {
+                document.getElementById('layers').innerText = internals.scrollingStateTreeAsText(document);
+            }
+        }
+        window.addEventListener('load', doTest, false);
+    </script>
+</head>
+<body>
+<pre id="layers">Scrolling tree goes here</p>
+</body>
+</html>

Added: trunk/LayoutTests/platform/mac/tiled-drawing/scrolling-tree-slow-scrolling-expected.txt (0 => 133205)


--- trunk/LayoutTests/platform/mac/tiled-drawing/scrolling-tree-slow-scrolling-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/mac/tiled-drawing/scrolling-tree-slow-scrolling-expected.txt	2012-11-01 18:57:39 UTC (rev 133205)
@@ -0,0 +1,6 @@
+(Scrolling node
+  (viewport rect 0 0 800 600)
+  (contents size 800 600)
+  (Scrolling on main thread because: Has viewport constrained objects without supporting fixed layers, )
+)
+

Added: trunk/LayoutTests/platform/mac/tiled-drawing/scrolling-tree-slow-scrolling.html (0 => 133205)


--- trunk/LayoutTests/platform/mac/tiled-drawing/scrolling-tree-slow-scrolling.html	                        (rev 0)
+++ trunk/LayoutTests/platform/mac/tiled-drawing/scrolling-tree-slow-scrolling.html	2012-11-01 18:57:39 UTC (rev 133205)
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+    <style>
+        .box {
+            height: 100px;
+            width: 100px;
+            position: fixed; /* At this time, position:fixed forces slow mode. */
+        }
+    </style>
+    <script>
+        if (window.testRunner)
+            testRunner.dumpAsText();
+
+        function doTest()
+        {
+            if (window.internals) {
+                document.getElementById('layers').innerText = internals.scrollingStateTreeAsText(document);
+            }
+        }
+        window.addEventListener('load', doTest, false);
+    </script>
+</head>
+<body>
+<div class="box">
+</div>
+<pre id="layers">Scrolling tree goes here</p>
+</body>
+</html>

Modified: trunk/Source/WebCore/ChangeLog (133204 => 133205)


--- trunk/Source/WebCore/ChangeLog	2012-11-01 18:56:11 UTC (rev 133204)
+++ trunk/Source/WebCore/ChangeLog	2012-11-01 18:57:39 UTC (rev 133205)
@@ -1,3 +1,52 @@
+2012-11-01  Beth Dakin  <bda...@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=100917
+        There should be a way to dump the scrolling tree from the layout tests
+
+        Reviewed by Simon Fraser.
+
+        New Internals call to dump the scrolling state tree as text. Calls through to the 
+        ScrollingCoordinator.
+        * testing/Internals.cpp:
+        (WebCore::Internals::scrollingStateTreeAsText):
+        (WebCore):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+        * WebCore.exp.in:
+        * page/Page.cpp:
+        (WebCore::Page::scrollingStateTreeAsText):
+        (WebCore):
+        * page/Page.h:
+        (Page):
+
+        ScrollingCoordinator tells the rootStateNode to dump the tree as text.
+        * page/scrolling/mac/ScrollingCoordinatorMac.h:
+        (ScrollingCoordinatorMac):
+        * page/scrolling/mac/ScrollingCoordinatorMac.mm:
+        (WebCore::ScrollingCoordinatorMac::scrollingStateTreeAsText):
+        (WebCore):
+        * page/scrolling/ScrollingCoordinator.cpp:
+        (WebCore::ScrollingCoordinator::scrollingStateTreeAsText):
+        (WebCore):
+        * page/scrolling/ScrollingCoordinator.h:
+        (ScrollingCoordinator):
+
+        dumpNode() dumps generic stuff for each node, and dumpProperties will dump the 
+        properties that are specific to different types of nodes.
+        * page/scrolling/ScrollingStateNode.cpp:
+        (WebCore::ScrollingStateNode::writeIndent):
+        (WebCore):
+        (WebCore::ScrollingStateNode::dumpNode):
+        (WebCore::ScrollingStateNode::scrollingStateTreeAsText):
+        * page/scrolling/ScrollingStateNode.h:
+        (WebCore):
+        (ScrollingStateNode):
+        * page/scrolling/ScrollingStateScrollingNode.cpp:
+        (WebCore::ScrollingStateScrollingNode::dumpProperties):
+        (WebCore):
+        * page/scrolling/ScrollingStateScrollingNode.h:
+        (ScrollingStateScrollingNode):
+
 2012-11-01  Kenneth Russell  <k...@google.com>
 
         Add RGB to supported destination formats of ImageBuffer::copyToPlatformTexture

Modified: trunk/Source/WebCore/WebCore.exp.in (133204 => 133205)


--- trunk/Source/WebCore/WebCore.exp.in	2012-11-01 18:56:11 UTC (rev 133204)
+++ trunk/Source/WebCore/WebCore.exp.in	2012-11-01 18:57:39 UTC (rev 133205)
@@ -729,6 +729,7 @@
 __ZN7WebCore4Page22allVisitedStateChangedEPNS_9PageGroupE
 __ZN7WebCore4Page23clearUndoRedoOperationsEv
 __ZN7WebCore4Page24resumeScriptedAnimationsEv
+__ZN7WebCore4Page24scrollingStateTreeAsTextEv
 __ZN7WebCore4Page25suspendScriptedAnimationsEv
 __ZN7WebCore4Page31setCustomHTMLTokenizerChunkSizeEi
 __ZN7WebCore4Page31setCustomHTMLTokenizerTimeDelayEd

Modified: trunk/Source/WebCore/page/Page.cpp (133204 => 133205)


--- trunk/Source/WebCore/page/Page.cpp	2012-11-01 18:56:11 UTC (rev 133204)
+++ trunk/Source/WebCore/page/Page.cpp	2012-11-01 18:57:39 UTC (rev 133205)
@@ -244,6 +244,17 @@
     return m_scrollingCoordinator.get();
 }
 
+String Page::scrollingStateTreeAsText()
+{
+    if (Document* document = m_mainFrame->document())
+        document->updateLayout();
+
+    if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
+        return scrollingCoordinator->scrollingStateTreeAsText();
+
+    return String();
+}
+
 struct ViewModeInfo {
     const char* name;
     Page::ViewMode type;

Modified: trunk/Source/WebCore/page/Page.h (133204 => 133205)


--- trunk/Source/WebCore/page/Page.h	2012-11-01 18:56:11 UTC (rev 133204)
+++ trunk/Source/WebCore/page/Page.h	2012-11-01 18:57:39 UTC (rev 133205)
@@ -195,6 +195,8 @@
 
         ScrollingCoordinator* scrollingCoordinator();
 
+        String scrollingStateTreeAsText();
+
         Settings* settings() const { return m_settings.get(); }
         ProgressTracker* progress() const { return m_progress.get(); }
         BackForwardController* backForward() const { return m_backForwardController.get(); }

Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (133204 => 133205)


--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp	2012-11-01 18:56:11 UTC (rev 133204)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp	2012-11-01 18:57:39 UTC (rev 133205)
@@ -323,4 +323,9 @@
     return uniqueScrollLayerID++;
 }
 
+String ScrollingCoordinator::scrollingStateTreeAsText() const
+{
+    return String();
+}
+
 } // namespace WebCore

Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h (133204 => 133205)


--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h	2012-11-01 18:56:11 UTC (rev 133204)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h	2012-11-01 18:57:39 UTC (rev 133205)
@@ -117,6 +117,7 @@
     virtual ScrollingNodeID attachToStateTree(ScrollingNodeType, ScrollingNodeID newNodeID, ScrollingNodeID /*parentID*/) { return newNodeID; }
     virtual void detachFromStateTree(ScrollingNodeID) { }
     virtual void clearStateTree() { }
+    virtual String scrollingStateTreeAsText() const;
 
     // Generated a unique id for scroll layers.
     ScrollingNodeID uniqueScrollLayerID();

Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp (133204 => 133205)


--- trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp	2012-11-01 18:56:11 UTC (rev 133204)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp	2012-11-01 18:57:39 UTC (rev 133205)
@@ -27,7 +27,10 @@
 #include "ScrollingStateNode.h"
 
 #include "ScrollingStateTree.h"
+#include "TextStream.h"
 
+#include <wtf/text/WTFString.h>
+
 #if ENABLE(THREADED_SCROLLING)
 
 namespace WebCore {
@@ -104,6 +107,40 @@
         m_children->at(i)->removeChild(node);
 }
 
+void ScrollingStateNode::writeIndent(TextStream& ts, int indent)
+{
+    for (int i = 0; i != indent; ++i)
+        ts << "  ";
+}
+
+void ScrollingStateNode::dump(TextStream& ts, int indent) const
+{
+    writeIndent(ts, indent);
+    dumpProperties(ts, indent);
+
+    if (m_children) {
+        writeIndent(ts, indent + 1);
+        size_t size = children()->size();
+        ts << "(children " << size << "\n";
+        
+        for (size_t i = 0; i < size; i++)
+            m_children->at(i)->dump(ts, indent + 2);
+        writeIndent(ts, indent + 1);
+        ts << ")\n";
+    }
+
+    writeIndent(ts, indent);
+    ts << ")\n";
+}
+
+String ScrollingStateNode::scrollingStateTreeAsText() const
+{
+    TextStream ts;
+
+    dump(ts, 0);
+    return ts.release();
+}
+
 } // namespace WebCore
 
 #endif // ENABLE(THREADED_SCROLLING)

Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h (133204 => 133205)


--- trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h	2012-11-01 18:56:11 UTC (rev 133204)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h	2012-11-01 18:57:39 UTC (rev 133205)
@@ -42,6 +42,7 @@
 
 class GraphicsLayer;
 class ScrollingStateTree;
+class TextStream;
 
 class ScrollingStateNode {
 public:
@@ -79,12 +80,19 @@
     void appendChild(PassOwnPtr<ScrollingStateNode>);
     void removeChild(ScrollingStateNode*);
 
+    String scrollingStateTreeAsText() const;
+
 protected:
     ScrollingStateNode(const ScrollingStateNode&);
+    static void writeIndent(TextStream&, int indent);
 
     ScrollingStateTree* m_scrollingStateTree;
 
 private:
+    void dump(TextStream&, int indent) const;
+
+    virtual void dumpProperties(TextStream&, int indent) const = 0;
+
     ScrollingNodeID m_nodeID;
 
     ScrollingStateNode* m_parent;

Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp (133204 => 133205)


--- trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp	2012-11-01 18:56:11 UTC (rev 133204)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp	2012-11-01 18:57:39 UTC (rev 133205)
@@ -27,6 +27,7 @@
 #include "ScrollingStateScrollingNode.h"
 
 #include "ScrollingStateTree.h"
+#include "TextStream.h"
 #include <wtf/OwnPtr.h>
 
 #if ENABLE(THREADED_SCROLLING)
@@ -205,6 +206,48 @@
     m_scrollingStateTree->setHasChangedProperties(true);
 }
 
+void ScrollingStateScrollingNode::dumpProperties(TextStream& ts, int indent) const
+{
+    ts << "(" << "Scrolling node" << "\n";
+
+    if (!m_viewportRect.isEmpty()) {
+        writeIndent(ts, indent + 1);
+        ts << "(viewport rect " << m_viewportRect.x() << " " << m_viewportRect.y() << " " << m_viewportRect.width() << " " << m_viewportRect.height() << ")\n";
+    }
+
+    if (!m_contentsSize.isEmpty()) {
+        writeIndent(ts, indent + 1);
+        ts << "(contents size " << m_contentsSize.width() << " " << m_contentsSize.height() << ")\n";
+    }
+
+    if (m_shouldUpdateScrollLayerPositionOnMainThread) {
+        writeIndent(ts, indent + 1);
+        ts << "(Scrolling on main thread because: ";
+        if (m_shouldUpdateScrollLayerPositionOnMainThread & ScrollingCoordinator::ForcedOnMainThread)
+            ts << "Forced on main thread, ";
+        if (m_shouldUpdateScrollLayerPositionOnMainThread & ScrollingCoordinator::HasSlowRepaintObjects)
+            ts << "Has slow repaint objects, ";
+        if (m_shouldUpdateScrollLayerPositionOnMainThread & ScrollingCoordinator::HasViewportConstrainedObjectsWithoutSupportingFixedLayers)
+            ts << "Has viewport constrained objects without supporting fixed layers, ";
+        if (m_shouldUpdateScrollLayerPositionOnMainThread & ScrollingCoordinator::HasNonLayerFixedObjects)
+            ts << "Has non-layer fixed objects, ";
+        if (m_shouldUpdateScrollLayerPositionOnMainThread & ScrollingCoordinator::IsImageDocument)
+            ts << "Is image document";
+        ts << ")\n";
+    }
+
+    if (m_requestedScrollPosition != IntPoint()) {
+        writeIndent(ts, indent + 1);
+        ts << "(requested scroll position " << m_requestedScrollPosition.x() << " " << m_requestedScrollPosition.y() << ")\n";
+    }
+
+    if (m_scrollOrigin != IntPoint()) {
+        writeIndent(ts, indent + 1);
+        ts << "(scroll origin " << m_scrollOrigin.x() << " " << m_scrollOrigin.y() << ")\n";
+    }
+
+}
+
 } // namespace WebCore
 
 #endif // ENABLE(THREADED_SCROLLING)

Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h (133204 => 133205)


--- trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h	2012-11-01 18:56:11 UTC (rev 133204)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h	2012-11-01 18:57:39 UTC (rev 133205)
@@ -107,6 +107,8 @@
 
     bool requestedScrollPositionRepresentsProgrammaticScroll() const { return m_requestedScrollPositionRepresentsProgrammaticScroll; }
 
+    virtual void dumpProperties(TextStream&, int indent) const OVERRIDE;
+
 private:
     ScrollingStateScrollingNode(ScrollingStateTree*, ScrollingNodeID);
 

Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h (133204 => 133205)


--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h	2012-11-01 18:56:11 UTC (rev 133204)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h	2012-11-01 18:57:39 UTC (rev 133205)
@@ -72,6 +72,8 @@
     // This function wipes out the current tree.
     virtual void clearStateTree();
 
+    virtual String scrollingStateTreeAsText() const OVERRIDE;
+
 private:
     virtual void recomputeWheelEventHandlerCountForFrameView(FrameView*);
     virtual void setShouldUpdateScrollLayerPositionOnMainThread(MainThreadScrollingReasons);

Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm (133204 => 133205)


--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm	2012-11-01 18:56:11 UTC (rev 133204)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm	2012-11-01 18:57:39 UTC (rev 133205)
@@ -394,6 +394,11 @@
     ScrollingThread::dispatch(bind(&ScrollingTree::commitNewTreeState, m_scrollingTree.get(), treeState.release()));
 }
 
+String ScrollingCoordinatorMac::scrollingStateTreeAsText() const
+{
+    return m_scrollingStateTree->rootStateNode()->scrollingStateTreeAsText();
+}
+
 } // namespace WebCore
 
 #endif // ENABLE(THREADED_SCROLLING)

Modified: trunk/Source/WebCore/testing/Internals.cpp (133204 => 133205)


--- trunk/Source/WebCore/testing/Internals.cpp	2012-11-01 18:56:11 UTC (rev 133204)
+++ trunk/Source/WebCore/testing/Internals.cpp	2012-11-01 18:57:39 UTC (rev 133205)
@@ -1273,6 +1273,20 @@
     return document->frame()->trackedRepaintRectsAsText();
 }
 
+String Internals::scrollingStateTreeAsText(Document* document, ExceptionCode& ec) const
+{
+    if (!document || !document->frame()) {
+        ec = INVALID_ACCESS_ERR;
+        return String();
+    }
+
+    Page* page = document->page();
+    if (!page)
+        return String();
+
+    return page->scrollingStateTreeAsText();
+}
+
 void Internals::garbageCollectDocumentResources(Document* document, ExceptionCode& ec) const
 {
     if (!document) {

Modified: trunk/Source/WebCore/testing/Internals.h (133204 => 133205)


--- trunk/Source/WebCore/testing/Internals.h	2012-11-01 18:56:11 UTC (rev 133204)
+++ trunk/Source/WebCore/testing/Internals.h	2012-11-01 18:57:39 UTC (rev 133205)
@@ -196,6 +196,7 @@
     String layerTreeAsText(Document*, unsigned flags, ExceptionCode&) const;
     String layerTreeAsText(Document*, ExceptionCode&) const;
     String repaintRectsAsText(Document*, ExceptionCode&) const;
+    String scrollingStateTreeAsText(Document*, ExceptionCode&) const;
 
     void garbageCollectDocumentResources(Document*, ExceptionCode&) const;
 

Modified: trunk/Source/WebCore/testing/Internals.idl (133204 => 133205)


--- trunk/Source/WebCore/testing/Internals.idl	2012-11-01 18:56:11 UTC (rev 133204)
+++ trunk/Source/WebCore/testing/Internals.idl	2012-11-01 18:57:39 UTC (rev 133205)
@@ -156,6 +156,8 @@
     const unsigned short LAYER_TREE_INCLUDES_TILE_CACHES = 2;
     DOMString layerTreeAsText(in Document document, in [Optional] unsigned short flags) raises (DOMException);
 
+    DOMString scrollingStateTreeAsText(in Document document) raises (DOMException);
+
     DOMString repaintRectsAsText(in Document document) raises (DOMException);
 
     void garbageCollectDocumentResources(in Document document) raises (DOMException);

Modified: trunk/Source/WebKit2/ChangeLog (133204 => 133205)


--- trunk/Source/WebKit2/ChangeLog	2012-11-01 18:56:11 UTC (rev 133204)
+++ trunk/Source/WebKit2/ChangeLog	2012-11-01 18:57:39 UTC (rev 133205)
@@ -1,3 +1,13 @@
+2012-11-01  Beth Dakin  <bda...@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=100917
+        There should be a way to dump the scrolling tree from the layout tests
+        
+        Reviewed by Simon Fraser.
+
+        * win/WebKit2.def:
+        * win/WebKit2CFLite.def:
+
 2012-11-01  Huang Dongsung  <luxte...@company100.net>
 
         Coordinated Graphics: Clean up headers of Coordinated Graphics.

Modified: trunk/Source/WebKit2/win/WebKit2.def (133204 => 133205)


--- trunk/Source/WebKit2/win/WebKit2.def	2012-11-01 18:56:11 UTC (rev 133204)
+++ trunk/Source/WebKit2/win/WebKit2.def	2012-11-01 18:57:39 UTC (rev 133205)
@@ -216,6 +216,7 @@
         ?scriptExecutionContext@JSDOMGlobalObject@WebCore@@QBEPAVScriptExecutionContext@2@XZ
         ?scriptNameToCode@WebCore@@YA?AW4UScriptCode@@ABVString@WTF@@@Z
         ?scrollElementToRect@FrameView@WebCore@@QAEXPAVElement@2@ABVIntRect@2@@Z
+        ?scrollingStateTreeAsText@Page@WebCore@@QAE?AVString@WTF@@XZ
         ?setCanStartMedia@Page@WebCore@@QAEX_N@Z
         ?setCursiveFontFamily@Settings@WebCore@@QAEXABVAtomicString@WTF@@W4UScriptCode@@@Z
         ?setDeviceScaleFactor@Page@WebCore@@QAEXM@Z

Modified: trunk/Source/WebKit2/win/WebKit2CFLite.def (133204 => 133205)


--- trunk/Source/WebKit2/win/WebKit2CFLite.def	2012-11-01 18:56:11 UTC (rev 133204)
+++ trunk/Source/WebKit2/win/WebKit2CFLite.def	2012-11-01 18:57:39 UTC (rev 133205)
@@ -209,6 +209,7 @@
         ?scriptExecutionContext@JSDOMGlobalObject@WebCore@@QBEPAVScriptExecutionContext@2@XZ
         ?scriptNameToCode@WebCore@@YA?AW4UScriptCode@@ABVString@WTF@@@Z
         ?scrollElementToRect@FrameView@WebCore@@QAEXPAVElement@2@ABVIntRect@2@@Z
+        ?scrollingStateTreeAsText@Page@WebCore@@QAE?AVString@WTF@@XZ
         ?setCanStartMedia@Page@WebCore@@QAEX_N@Z
         ?setCursiveFontFamily@Settings@WebCore@@QAEXABVAtomicString@WTF@@W4UScriptCode@@@Z
         ?setDeviceScaleFactor@Page@WebCore@@QAEXM@Z

Modified: trunk/Source/autotools/symbols.filter (133204 => 133205)


--- trunk/Source/autotools/symbols.filter	2012-11-01 18:56:11 UTC (rev 133204)
+++ trunk/Source/autotools/symbols.filter	2012-11-01 18:57:39 UTC (rev 133205)
@@ -30,6 +30,7 @@
 _ZN7WebCore4Page13setPaginationERKNS_10PaginationE;
 _ZN7WebCore4Page18setPageScaleFactorEfRKNS_8IntPointE;
 _ZN7WebCore4Page20setDeviceScaleFactorEf;
+_ZN7WebCore4Page24scrollingStateTreeAsTextEv;
 _ZN7WebCore4Page16setCanStartMediaEb;
 _ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_10ClientRectE;
 _ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_10ShadowRootE;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to