summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/accessibility_ui_element.cc4
-rw-r--r--webkit/tools/test_shell/accessibility_ui_element.h153
-rw-r--r--webkit/tools/test_shell/layout_test_controller.cc2
-rw-r--r--webkit/tools/test_shell/layout_test_controller.h13
4 files changed, 111 insertions, 61 deletions
diff --git a/webkit/tools/test_shell/accessibility_ui_element.cc b/webkit/tools/test_shell/accessibility_ui_element.cc
index cd8bc0be..c8756f3 100644
--- a/webkit/tools/test_shell/accessibility_ui_element.cc
+++ b/webkit/tools/test_shell/accessibility_ui_element.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -14,6 +14,8 @@ using WebKit::WebCString;
using WebKit::WebString;
using WebKit::WebAccessibilityObject;
using WebKit::WebAccessibilityRole;
+using webkit_glue::CppArgumentList;
+using webkit_glue::CppVariant;
namespace {
diff --git a/webkit/tools/test_shell/accessibility_ui_element.h b/webkit/tools/test_shell/accessibility_ui_element.h
index 630464d..d930177 100644
--- a/webkit/tools/test_shell/accessibility_ui_element.h
+++ b/webkit/tools/test_shell/accessibility_ui_element.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -8,7 +8,7 @@
#include "webkit/glue/cpp_bound_class.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h"
-class AccessibilityUIElement : public CppBoundClass {
+class AccessibilityUIElement : public webkit_glue::CppBoundClass {
public:
class Factory {
public:
@@ -33,74 +33,117 @@ class AccessibilityUIElement : public CppBoundClass {
private:
// Bound methods and properties.
- void AllAttributesCallback(const CppArgumentList& args, CppVariant* result);
+ void AllAttributesCallback(
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
void AttributesOfLinkedUIElementsCallback(
- const CppArgumentList& args, CppVariant* result);
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
void AttributesOfDocumentLinksCallback(
- const CppArgumentList& args, CppVariant* result);
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
void AttributesOfChildrenCallback(
- const CppArgumentList& args, CppVariant* result);
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
void ParametrizedAttributeNamesCallback(
- const CppArgumentList& args, CppVariant* result);
- void LineForIndexCallback(const CppArgumentList& args, CppVariant* result);
- void BoundsForRangeCallback(const CppArgumentList& args, CppVariant* result);
- void StringForRangeCallback(const CppArgumentList& args, CppVariant* result);
- void ChildAtIndexCallback(const CppArgumentList& args, CppVariant* result);
- void ElementAtPointCallback(const CppArgumentList& args, CppVariant* result);
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
+ void LineForIndexCallback(
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
+ void BoundsForRangeCallback(
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
+ void StringForRangeCallback(
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
+ void ChildAtIndexCallback(
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
+ void ElementAtPointCallback(
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
void AttributesOfColumnHeadersCallback(
- const CppArgumentList& args, CppVariant* result);
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
void AttributesOfRowHeadersCallback(
- const CppArgumentList& args, CppVariant* result);
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
void AttributesOfColumnsCallback(
- const CppArgumentList& args, CppVariant* result);
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
void AttributesOfRowsCallback(
- const CppArgumentList& args, CppVariant* result);
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
void AttributesOfVisibleCellsCallback(
- const CppArgumentList& args, CppVariant* result);
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
void AttributesOfHeaderCallback(
- const CppArgumentList& args, CppVariant* result);
- void IndexInTableCallback(const CppArgumentList& args, CppVariant* result);
- void RowIndexRangeCallback(const CppArgumentList& args, CppVariant* result);
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
+ void IndexInTableCallback(
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
+ void RowIndexRangeCallback(
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
void ColumnIndexRangeCallback(
- const CppArgumentList& args, CppVariant* result);
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
void CellForColumnAndRowCallback(
- const CppArgumentList& args, CppVariant* result);
- void TitleUIElementCallback(const CppArgumentList& args, CppVariant* result);
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
+ void TitleUIElementCallback(
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
void SetSelectedTextRangeCallback(
- const CppArgumentList& args, CppVariant* result);
- void AttributeValueCallback(const CppArgumentList& args, CppVariant* result);
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
+ void AttributeValueCallback(
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
void IsAttributeSettableCallback(
- const CppArgumentList& args, CppVariant* result);
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
void IsActionSupportedCallback(
- const CppArgumentList& args, CppVariant* result);
- void ParentElementCallback(const CppArgumentList& args, CppVariant* result);
- void IncrementCallback(const CppArgumentList& args, CppVariant* result);
- void DecrementCallback(const CppArgumentList& args, CppVariant* result);
- void FallbackCallback(const CppArgumentList& args, CppVariant* result);
-
- void ChildrenCountGetterCallback(CppVariant* result);
- void DescriptionGetterCallback(CppVariant* result);
- void IsEnabledGetterCallback(CppVariant* result);
- void IsSelectedGetterCallback(CppVariant* result);
- void RoleGetterCallback(CppVariant* result);
- void TitleGetterCallback(CppVariant* result);
-
- CppVariant subrole_;
- CppVariant language_;
- CppVariant x_;
- CppVariant y_;
- CppVariant width_;
- CppVariant height_;
- CppVariant click_point_x_;
- CppVariant click_point_y_;
- CppVariant int_value_;
- CppVariant min_value_;
- CppVariant max_value_;
- CppVariant children_count_;
- CppVariant insertion_point_line_number_;
- CppVariant selected_text_range;
- CppVariant is_required_;
- CppVariant value_description_;
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
+ void ParentElementCallback(
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
+ void IncrementCallback(
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
+ void DecrementCallback(
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
+ void FallbackCallback(
+ const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
+
+ void ChildrenCountGetterCallback(webkit_glue::CppVariant* result);
+ void DescriptionGetterCallback(webkit_glue::CppVariant* result);
+ void IsEnabledGetterCallback(webkit_glue::CppVariant* result);
+ void IsSelectedGetterCallback(webkit_glue::CppVariant* result);
+ void RoleGetterCallback(webkit_glue::CppVariant* result);
+ void TitleGetterCallback(webkit_glue::CppVariant* result);
+
+ webkit_glue::CppVariant subrole_;
+ webkit_glue::CppVariant language_;
+ webkit_glue::CppVariant x_;
+ webkit_glue::CppVariant y_;
+ webkit_glue::CppVariant width_;
+ webkit_glue::CppVariant height_;
+ webkit_glue::CppVariant click_point_x_;
+ webkit_glue::CppVariant click_point_y_;
+ webkit_glue::CppVariant int_value_;
+ webkit_glue::CppVariant min_value_;
+ webkit_glue::CppVariant max_value_;
+ webkit_glue::CppVariant children_count_;
+ webkit_glue::CppVariant insertion_point_line_number_;
+ webkit_glue::CppVariant selected_text_range;
+ webkit_glue::CppVariant is_required_;
+ webkit_glue::CppVariant value_description_;
WebKit::WebAccessibilityObject accessibility_object_;
Factory* factory_;
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc
index aadbd39..13be875 100644
--- a/webkit/tools/test_shell/layout_test_controller.cc
+++ b/webkit/tools/test_shell/layout_test_controller.cc
@@ -57,6 +57,8 @@ using WebKit::WebSecurityPolicy;
using WebKit::WebSize;
using WebKit::WebString;
using WebKit::WebURL;
+using webkit_glue::CppArgumentList;
+using webkit_glue::CppVariant;
TestShell* LayoutTestController::shell_ = NULL;
// Most of these flags need to be cleared in Reset() so that they get turned
diff --git a/webkit/tools/test_shell/layout_test_controller.h b/webkit/tools/test_shell/layout_test_controller.h
index 5e82b01..69490b2 100644
--- a/webkit/tools/test_shell/layout_test_controller.h
+++ b/webkit/tools/test_shell/layout_test_controller.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -23,7 +23,7 @@
class TestShell;
-class LayoutTestController : public CppBoundClass {
+class LayoutTestController : public webkit_glue::CppBoundClass {
public:
// Builds the property and method lists needed to bind this class to a JS
// object.
@@ -32,15 +32,18 @@ class LayoutTestController : public CppBoundClass {
// By default, tests end when page load is complete. These methods are used
// to delay the completion of the test until notifyDone is called.
- void waitUntilDone(const CppArgumentList& args, CppVariant* result);
- void notifyDone(const CppArgumentList& args, CppVariant* result);
+ void waitUntilDone(const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
+ void notifyDone(const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
// The fallback method is called when a nonexistent method is called on
// the layout test controller object.
// It is usefull to catch typos in the JavaScript code (a few layout tests
// do have typos in them) and it allows the script to continue running in
// that case (as the Mac does).
- void fallbackMethod(const CppArgumentList& args, CppVariant* result);
+ void fallbackMethod(const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
public:
// The following methods are not exposed to JavaScript.
generated by cgit v1.1 at 2025-01-26 12:23:20 +0000