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

[dumi at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit d82960f3f3690000684dbea096a00020139d86c9
Author: dumi at chromium.org <dumi at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 31 22:18:44 2010 +0000

    Implementing LayoutTestController::markerTextForListItem() in Chromium's DRT.
    
    Reviewed by Tony Chang.
    
    * DumpRenderTree/chromium/LayoutTestController.cpp:
    (LayoutTestController::LayoutTestController):
    (LayoutTestController::markerTextForListItem):
    * DumpRenderTree/chromium/LayoutTestController.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66546 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d10fd41..33dd4df 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-31  Dumitru Daniliuc  <dumi at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        Implementing LayoutTestController::markerTextForListItem() in Chromium's DRT.
+
+        * DumpRenderTree/chromium/LayoutTestController.cpp:
+        (LayoutTestController::LayoutTestController):
+        (LayoutTestController::markerTextForListItem):
+        * DumpRenderTree/chromium/LayoutTestController.h:
+
 2010-08-31  Dirk Pranke  <dpranke at chromium.org>
 
         Reviewed by Ojan Vafai.
diff --git a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
index eb7d7bb..2999d3a 100644
--- a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
@@ -36,8 +36,10 @@
 #include "TestShell.h"
 #include "WebViewHost.h"
 #include "public/WebAnimationController.h"
+#include "public/WebBindings.h"
 #include "public/WebConsoleMessage.h"
 #include "public/WebDocument.h"
+#include "public/WebElement.h"
 #include "public/WebFrame.h"
 #include "public/WebGeolocationServiceMock.h"
 #include "public/WebInputElement.h"
@@ -180,6 +182,8 @@ LayoutTestController::LayoutTestController(TestShell* shell)
     bindMethod("abortModal", &LayoutTestController::abortModal);
     bindMethod("setMockSpeechInputResult", &LayoutTestController::setMockSpeechInputResult);
 
+    bindMethod("markerTextForListItem", &LayoutTestController::markerTextForListItem);
+
     // The fallback method is called when an unknown method is invoked.
     bindFallbackMethod(&LayoutTestController::fallbackMethod);
 
@@ -1441,3 +1445,12 @@ WebKit::WebSpeechInputController* LayoutTestController::speechInputController(We
         m_speechInputControllerMock.set(WebSpeechInputControllerMock::create(listener));
     return m_speechInputControllerMock.get();
 }
+
+void LayoutTestController::markerTextForListItem(const CppArgumentList& args, CppVariant* result)
+{
+    WebElement element;
+    if (!WebBindings::getElement(args[0].value.objectValue, &element))
+        result->setNull();
+    else
+        result->set(element.document().frame()->markerTextForListItem(element).utf8());
+}
diff --git a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.h b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.h
index 6e0457c..6706157 100644
--- a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.h
+++ b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.h
@@ -312,6 +312,8 @@ public:
     // Speech input related functions.
     void setMockSpeechInputResult(const CppArgumentList&, CppVariant*);
 
+    void markerTextForListItem(const CppArgumentList&, CppVariant*);
+
 public:
     // The following methods are not exposed to JavaScript.
     void setWorkQueueFrozen(bool frozen) { m_workQueue.setFrozen(frozen); }

-- 
WebKit Debian packaging