summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-08 17:11:16 +0000
committerojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-08 17:11:16 +0000
commita1320d6fb775ac75285f07064ad57630ce02e9e9 (patch)
tree7829d1136aac290a2295353320f0aa5c3649b49e /webkit
parent757271c77b6ceb2da0fdc228ac1097ccad483793 (diff)
downloadchromium_src-a1320d6fb775ac75285f07064ad57630ce02e9e9.zip
chromium_src-a1320d6fb775ac75285f07064ad57630ce02e9e9.tar.gz
chromium_src-a1320d6fb775ac75285f07064ad57630ce02e9e9.tar.bz2
Add setScrollbarPolicy to layoutTestController. The tests
that depend on it just need it to be defined. Review URL: http://codereview.chromium.org/1513025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43958 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/test_shell/layout_test_controller.cc9
-rw-r--r--webkit/tools/test_shell/layout_test_controller.h2
2 files changed, 11 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc
index a569eba..257ab41 100644
--- a/webkit/tools/test_shell/layout_test_controller.cc
+++ b/webkit/tools/test_shell/layout_test_controller.cc
@@ -121,6 +121,7 @@ LayoutTestController::LayoutTestController(TestShell* shell) :
BindMethod("disableImageLoading", &LayoutTestController::disableImageLoading);
BindMethod("setIconDatabaseEnabled", &LayoutTestController::setIconDatabaseEnabled);
BindMethod("setCustomPolicyDelegate", &LayoutTestController::setCustomPolicyDelegate);
+ BindMethod("setScrollbarPolicy", &LayoutTestController::setScrollbarPolicy);
BindMethod("waitForPolicyDelegate", &LayoutTestController::waitForPolicyDelegate);
BindMethod("setWillSendRequestClearHeader", &LayoutTestController::setWillSendRequestClearHeader);
BindMethod("setWillSendRequestReturnsNullOnRedirect", &LayoutTestController::setWillSendRequestReturnsNullOnRedirect);
@@ -644,6 +645,14 @@ void LayoutTestController::setUseDashboardCompatibilityMode(
result->SetNull();
}
+
+void LayoutTestController::setScrollbarPolicy(
+ const CppArgumentList& args, CppVariant* result) {
+ // FIXME: implement.
+ // Currently only has a non-null implementation on QT.
+ result->SetNull();
+}
+
void LayoutTestController::setCustomPolicyDelegate(
const CppArgumentList& args, CppVariant* result) {
if (args.size() > 0 && args[0].isBool()) {
diff --git a/webkit/tools/test_shell/layout_test_controller.h b/webkit/tools/test_shell/layout_test_controller.h
index 01ea79b..acb855e 100644
--- a/webkit/tools/test_shell/layout_test_controller.h
+++ b/webkit/tools/test_shell/layout_test_controller.h
@@ -119,6 +119,8 @@ class LayoutTestController : public CppBoundClass {
// never be used by Chrome, but some layout tests depend on its presence.
void setUseDashboardCompatibilityMode(const CppArgumentList& args, CppVariant* result);
+ void setScrollbarPolicy(const CppArgumentList& args, CppVariant* result);
+
// Causes navigation actions just printout the intended navigation instead
// of taking you to the page. This is used for cases like mailto, where you
// don't actually want to open the mail program.