diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-15 00:05:06 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-15 00:05:06 +0000 |
| commit | 2e5983f2a41f5c01fa5e75e68663c87a0b4f302f (patch) | |
| tree | d9b51dacb22a1be7c62121abff91c74a3b3d29cc /webkit | |
| parent | e1681f221ed06218232a4252721ffc9f5cc24fa0 (diff) | |
| download | chromium_src-2e5983f2a41f5c01fa5e75e68663c87a0b4f302f.zip chromium_src-2e5983f2a41f5c01fa5e75e68663c87a0b4f302f.tar.gz chromium_src-2e5983f2a41f5c01fa5e75e68663c87a0b4f302f.tar.bz2 | |
Implement setDomainRelaxationForbiddenForURLScheme in test_shell.
This was added to DRT upstream in http://trac.webkit.org/changeset/67479.
BUG=32674
Review URL: http://codereview.chromium.org/3447001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59460 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/layout_test_controller.cc | 10 | ||||
| -rw-r--r-- | webkit/tools/test_shell/layout_test_controller.h | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc index 8d7088f..feff62d 100644 --- a/webkit/tools/test_shell/layout_test_controller.cc +++ b/webkit/tools/test_shell/layout_test_controller.cc @@ -165,6 +165,7 @@ LayoutTestController::LayoutTestController(TestShell* shell) : BindMethod("numberOfPages", &LayoutTestController::numberOfPages); BindMethod("dumpSelectionRect", &LayoutTestController::dumpSelectionRect); BindMethod("grantDesktopNotificationPermission", &LayoutTestController::grantDesktopNotificationPermission); + BindMethod("setDomainRelaxationForbiddenForURLScheme", &LayoutTestController::setDomainRelaxationForbiddenForURLScheme); // The following are stubs. BindMethod("dumpAsWebArchive", &LayoutTestController::dumpAsWebArchive); @@ -967,6 +968,15 @@ void LayoutTestController::grantDesktopNotificationPermission( result->Set(true); } +void LayoutTestController::setDomainRelaxationForbiddenForURLScheme( + const CppArgumentList& args, CppVariant* result) { + if (args.size() != 2 || !args[0].isBool() || !args[1].isString()) + return; + + shell_->webView()->setDomainRelaxationForbidden( + CppVariantToBool(args[0]), WebString::fromUTF8(args[1].ToString())); +} + // // Unimplemented stubs // diff --git a/webkit/tools/test_shell/layout_test_controller.h b/webkit/tools/test_shell/layout_test_controller.h index 3dfe81c..3b2c60d 100644 --- a/webkit/tools/test_shell/layout_test_controller.h +++ b/webkit/tools/test_shell/layout_test_controller.h @@ -200,6 +200,8 @@ class LayoutTestController : public CppBoundClass { void grantDesktopNotificationPermission(const CppArgumentList& args, CppVariant* result); + void setDomainRelaxationForbiddenForURLScheme( + const CppArgumentList& args, CppVariant* result); void setEditingBehavior(const CppArgumentList&, CppVariant*); // The following are only stubs. TODO(pamg): Implement any of these that |