Adding support for markerTextForListItem() to Chromium's LayoutTestController...

webkit/tools/test_shell/layout_test_controller.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file contains the definition for LayoutTestController.
 
 #include <vector>
 
 #include "webkit/tools/test_shell/layout_test_controller.h"
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebDocument.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebGeolocationServiceMock.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityPolicy.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSize.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/webkit_glue.h"
@@ skipping 142 matching lines @@
   BindMethod("setAllowFileAccessFromFileURLs", &LayoutTestController::setAllowFileAccessFromFileURLs);
   BindMethod("setJavaScriptProfilingEnabled", &LayoutTestController::setJavaScriptProfilingEnabled);
   BindMethod("setTimelineProfilingEnabled", &LayoutTestController::setTimelineProfilingEnabled);
   BindMethod("evaluateInWebInspector", &LayoutTestController::evaluateInWebInspector);
   BindMethod("forceRedSelectionColors", &LayoutTestController::forceRedSelectionColors);
 
   BindMethod("setGeolocationPermission", &LayoutTestController::setGeolocationPermission);
   BindMethod("setMockGeolocationPosition", &LayoutTestController::setMockGeolocationPosition);
   BindMethod("setMockGeolocationError", &LayoutTestController::setMockGeolocationError);
 
+  BindMethod("markerTextForListItem", &LayoutTestController::markerTextForListItem);
+
   // The fallback method is called when an unknown method is invoked.
   BindFallbackMethod(&LayoutTestController::fallbackMethod);
 
   // Shared properties.
   // globalFlag is used by a number of layout tests in
   // LayoutTests\http\tests\security\dataURL.
   BindProperty("globalFlag", &globalFlag_);
   // webHistoryItemCount is used by tests in LayoutTests\http\tests\history
   BindProperty("webHistoryItemCount", &webHistoryItemCount_);
 }
@@ skipping 1133 matching lines @@
 }
 
 void LayoutTestController::setMockGeolocationError(const CppArgumentList& args,
                                                    CppVariant* result) {
   if (args.size() < 2 ||
       !args[0].isInt32() || !args[1].isString())
     return;
   WebKit::WebGeolocationServiceMock::setMockGeolocationError(
       args[0].ToInt32(), WebString::fromUTF8(args[1].ToString()));
 }
+
+void LayoutTestController::markerTextForListItem(const CppArgumentList& args,
+                                                 CppVariant* result) {
+  WebKit::WebElement element;

[darin (slow to review), 2010/08/27 03:35:22]

nit: I recommend putting 'using WebKit::WebElement' and 'usng
WebKit::WebBindings' at the top of this file so you don't need to have the
WebKit:: prefix here.  there may be other instances of WebKit:: in this file
that could use similar treatment :-/

[dumi, 2010/08/27 03:47:06]

done, for all WebKit::X references in this file.

+  if (!WebKit::WebBindings::getElement(args[0].value.objectValue, &element))
+    result->SetNull();
+  else
+    result->Set(
+        element.document().frame()->markerTextForListItem(element).utf8());
+}