diff options
| author | senorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-05 02:31:20 +0000 |
|---|---|---|
| committer | senorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-05 02:31:20 +0000 |
| commit | 178aed73d5f6fcd7a962e2b24949196bb1ce3b78 (patch) | |
| tree | cb42314759654b0749c9852554b432781cc83cd1 /webkit | |
| parent | 13b1e0b71563b8df5a250a5828cfe7c146d245c7 (diff) | |
| download | chromium_src-178aed73d5f6fcd7a962e2b24949196bb1ce3b78.zip chromium_src-178aed73d5f6fcd7a962e2b24949196bb1ce3b78.tar.gz chromium_src-178aed73d5f6fcd7a962e2b24949196bb1ce3b78.tar.bz2 | |
Implement layerTreeAsText in test_shell's version of LayoutTestController. This was causing a number of compositing tests to time out when run under test_shell.
BUG=61966
TEST=run_webkit_tests.bat --platform chromium-gpu-win
Review URL: http://codereview.chromium.org/4509001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65174 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/layout_test_controller.cc | 7 | ||||
| -rw-r--r-- | webkit/tools/test_shell/layout_test_controller.h | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc index d1d13bc..885c9e0 100644 --- a/webkit/tools/test_shell/layout_test_controller.cc +++ b/webkit/tools/test_shell/layout_test_controller.cc @@ -178,6 +178,7 @@ LayoutTestController::LayoutTestController(TestShell* shell) : BindMethod("repaintSweepHorizontally", &LayoutTestController::repaintSweepHorizontally); BindMethod("clearBackForwardList", &LayoutTestController::clearBackForwardList); BindMethod("keepWebHistory", &LayoutTestController::keepWebHistory); + BindMethod("layerTreeAsText", &LayoutTestController::layerTreeAsText); BindMethod("storeWebScriptObject", &LayoutTestController::storeWebScriptObject); BindMethod("accessStoredWebScriptObject", &LayoutTestController::accessStoredWebScriptObject); BindMethod("objCClassNameOf", &LayoutTestController::objCClassNameOf); @@ -1047,6 +1048,12 @@ void LayoutTestController::keepWebHistory( result->SetNull(); } +void LayoutTestController::layerTreeAsText( + const CppArgumentList& args, CppVariant* result) { + WebString rv = shell_->webView()->mainFrame()->layerTreeAsText(); + result->Set(rv.utf8()); +} + void LayoutTestController::storeWebScriptObject( const CppArgumentList& args, CppVariant* result) { result->SetNull(); diff --git a/webkit/tools/test_shell/layout_test_controller.h b/webkit/tools/test_shell/layout_test_controller.h index f193d3b1..bd202cd 100644 --- a/webkit/tools/test_shell/layout_test_controller.h +++ b/webkit/tools/test_shell/layout_test_controller.h @@ -218,6 +218,7 @@ class LayoutTestController : public CppBoundClass { void repaintSweepHorizontally(const CppArgumentList& args, CppVariant* result); void clearBackForwardList(const CppArgumentList& args, CppVariant* result); void keepWebHistory(const CppArgumentList& args, CppVariant* result); + void layerTreeAsText(const CppArgumentList& args, CppVariant* result); void storeWebScriptObject(const CppArgumentList& args, CppVariant* result); void accessStoredWebScriptObject(const CppArgumentList& args, CppVariant* result); void objCClassNameOf(const CppArgumentList& args, CppVariant* result); |