[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[kbr at google.com]

The following commit has been merged in the debian/experimental branch:
commit 81c1db7c3351cd5c599328e22ded0f27101b9f2b
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 22:11:35 2010 +0000

    2010-10-05  Kenneth Russell  <kbr at google.com>
    
            Reviewed by Tony Chang.
    
            [chromium] Implement layerTreeAsText in DumpRenderTree
            https://bugs.webkit.org/show_bug.cgi?id=47216
    
            Plumbed Frame::layerTreeAsText through Chromium's WebKit API to
            make it callable from DumpRenderTree.
    
            No new tests; verified with existing compositor layout tests.
    
            * public/WebFrame.h:
            * src/WebFrameImpl.cpp:
            (WebKit::WebFrameImpl::layerTreeAsText):
            * src/WebFrameImpl.h:
    2010-10-05  Kenneth Russell  <kbr at google.com>
    
            Reviewed by Tony Chang.
    
            [chromium] Implement layerTreeAsText in DumpRenderTree
            https://bugs.webkit.org/show_bug.cgi?id=47216
    
            Plumbed Frame::layerTreeAsText through Chromium's WebKit API to
            make it callable from DumpRenderTree.
    
            No new tests; verified with existing compositor layout tests.
    
            * DumpRenderTree/chromium/LayoutTestController.cpp:
            (LayoutTestController::LayoutTestController):
            (LayoutTestController::layerTreeAsText):
            * DumpRenderTree/chromium/LayoutTestController.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69151 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 1edf8f4..684a3c4 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,20 @@
+2010-10-05  Kenneth Russell  <kbr at google.com>
+
+        Reviewed by Tony Chang.
+
+        [chromium] Implement layerTreeAsText in DumpRenderTree
+        https://bugs.webkit.org/show_bug.cgi?id=47216
+
+        Plumbed Frame::layerTreeAsText through Chromium's WebKit API to
+        make it callable from DumpRenderTree.
+
+        No new tests; verified with existing compositor layout tests.
+
+        * public/WebFrame.h:
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::layerTreeAsText):
+        * src/WebFrameImpl.h:
+
 2010-10-05  Andrew Wilson  <atwilson at chromium.org>
 
         Reviewed by Andreas Kling.
diff --git a/WebKit/chromium/public/WebFrame.h b/WebKit/chromium/public/WebFrame.h
index 5f8539c..4f733db 100644
--- a/WebKit/chromium/public/WebFrame.h
+++ b/WebKit/chromium/public/WebFrame.h
@@ -550,6 +550,10 @@ public:
     virtual bool pauseSVGAnimation(const WebString& animationId,
                                    double time,
                                    const WebString& elementId) = 0;
+
+    // Dumps the layer tree, used by the accelerated compositor, in
+    // text form. This is used only by layout tests.
+    virtual WebString layerTreeAsText() const = 0;
 protected:
     ~WebFrame() { }
 };
diff --git a/WebKit/chromium/src/WebFrameImpl.cpp b/WebKit/chromium/src/WebFrameImpl.cpp
index 3cd6480..9daf26f 100644
--- a/WebKit/chromium/src/WebFrameImpl.cpp
+++ b/WebKit/chromium/src/WebFrameImpl.cpp
@@ -1770,6 +1770,13 @@ bool WebFrameImpl::pauseSVGAnimation(const WebString& animationId, double time,
 #endif
 }
 
+WebString WebFrameImpl::layerTreeAsText() const
+{
+    if (!m_frame)
+        return WebString();
+    return WebString(m_frame->layerTreeAsText());
+}
+
 // WebFrameImpl public ---------------------------------------------------------
 
 PassRefPtr<WebFrameImpl> WebFrameImpl::create(WebFrameClient* client)
diff --git a/WebKit/chromium/src/WebFrameImpl.h b/WebKit/chromium/src/WebFrameImpl.h
index 4e8b1ea..35158a1 100644
--- a/WebKit/chromium/src/WebFrameImpl.h
+++ b/WebKit/chromium/src/WebFrameImpl.h
@@ -190,6 +190,7 @@ public:
     virtual bool pauseSVGAnimation(const WebString& animationId,
                                    double time,
                                    const WebString& elementId);
+    virtual WebString layerTreeAsText() const;
 
     static PassRefPtr<WebFrameImpl> create(WebFrameClient* client);
     ~WebFrameImpl();
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 07dadb5..f5b58d2 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,20 @@
+2010-10-05  Kenneth Russell  <kbr at google.com>
+
+        Reviewed by Tony Chang.
+
+        [chromium] Implement layerTreeAsText in DumpRenderTree
+        https://bugs.webkit.org/show_bug.cgi?id=47216
+
+        Plumbed Frame::layerTreeAsText through Chromium's WebKit API to
+        make it callable from DumpRenderTree.
+
+        No new tests; verified with existing compositor layout tests.
+
+        * DumpRenderTree/chromium/LayoutTestController.cpp:
+        (LayoutTestController::LayoutTestController):
+        (LayoutTestController::layerTreeAsText):
+        * DumpRenderTree/chromium/LayoutTestController.h:
+
 2010-10-05  Brent Fulgham  <bfulgham at webkit.org>
 
         Unreviewed build correction.
diff --git a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
index 3d3c204..d7774e9 100644
--- a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
@@ -106,6 +106,7 @@ LayoutTestController::LayoutTestController(TestShell* shell)
     bindMethod("forceRedSelectionColors", &LayoutTestController::forceRedSelectionColors);
     bindMethod("grantDesktopNotificationPermission", &LayoutTestController::grantDesktopNotificationPermission);
     bindMethod("isCommandEnabled", &LayoutTestController::isCommandEnabled);
+    bindMethod("layerTreeAsText", &LayoutTestController::layerTreeAsText);
     bindMethod("markerTextForListItem", &LayoutTestController::markerTextForListItem);
     bindMethod("notifyDone", &LayoutTestController::notifyDone);
     bindMethod("numberOfActiveAnimations", &LayoutTestController::numberOfActiveAnimations);
@@ -1537,6 +1538,11 @@ WebKit::WebSpeechInputController* LayoutTestController::speechInputController(We
     return m_speechInputControllerMock.get();
 }
 
+void LayoutTestController::layerTreeAsText(const CppArgumentList& args, CppVariant* result)
+{
+    result->set(m_shell->webView()->mainFrame()->layerTreeAsText().utf8());
+}
+
 void LayoutTestController::markerTextForListItem(const CppArgumentList& args, CppVariant* result)
 {
     WebElement element;
diff --git a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.h b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.h
index 8467097..c836149 100644
--- a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.h
+++ b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.h
@@ -325,6 +325,8 @@ public:
     // Speech input related functions.
     void setMockSpeechInputResult(const CppArgumentList&, CppVariant*);
 
+    void layerTreeAsText(const CppArgumentList& args, CppVariant* result);
+
     void markerTextForListItem(const CppArgumentList&, CppVariant*);
 
 public:

-- 
WebKit Debian packaging