diff options
| author | mihaip@chromium.org <mihaip@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-09 20:38:30 +0000 |
|---|---|---|
| committer | mihaip@chromium.org <mihaip@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-09 20:38:30 +0000 |
| commit | b63f218a98a7dec9fd6dfb4e427d765fc95120fe (patch) | |
| tree | 5976fcb7dfbdfbb233d30e2afed6e50ae8abb04f /webkit/tools/test_shell/layout_test_controller.cc | |
| parent | e8234d36dc74d94f4921cadde17064ececae16b1 (diff) | |
| download | chromium_src-b63f218a98a7dec9fd6dfb4e427d765fc95120fe.zip chromium_src-b63f218a98a7dec9fd6dfb4e427d765fc95120fe.tar.gz chromium_src-b63f218a98a7dec9fd6dfb4e427d765fc95120fe.tar.bz2 | |
Implement layoutTestController.dumpResourceResponseMIMETypes in test_shell
(Chromium DRT side of this is in http://webkit.org/b/45479).
BUG=46872
TEST=fast/preloader and other layout tests now pass
Review URL: http://codereview.chromium.org/3317016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58994 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/layout_test_controller.cc')
| -rw-r--r-- | webkit/tools/test_shell/layout_test_controller.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc index cded274..600c045 100644 --- a/webkit/tools/test_shell/layout_test_controller.cc +++ b/webkit/tools/test_shell/layout_test_controller.cc @@ -61,6 +61,7 @@ bool LayoutTestController::dump_as_text_ = false; bool LayoutTestController::dump_editing_callbacks_ = false; bool LayoutTestController::dump_frame_load_callbacks_ = false; bool LayoutTestController::dump_resource_load_callbacks_ = false; +bool LayoutTestController::dump_resource_response_mime_types_ = false; bool LayoutTestController::dump_back_forward_list_ = false; bool LayoutTestController::dump_child_frame_scroll_positions_ = false; bool LayoutTestController::dump_child_frames_as_text_ = false; @@ -99,6 +100,7 @@ LayoutTestController::LayoutTestController(TestShell* shell) : BindMethod("dumpBackForwardList", &LayoutTestController::dumpBackForwardList); BindMethod("dumpFrameLoadCallbacks", &LayoutTestController::dumpFrameLoadCallbacks); BindMethod("dumpResourceLoadCallbacks", &LayoutTestController::dumpResourceLoadCallbacks); + BindMethod("dumpResourceResponseMIMETypes", &LayoutTestController::dumpResourceResponseMIMETypes); BindMethod("dumpStatusCallbacks", &LayoutTestController::dumpWindowStatusChanges); BindMethod("dumpTitleChanges", &LayoutTestController::dumpTitleChanges); BindMethod("setAcceptsEditing", &LayoutTestController::setAcceptsEditing); @@ -297,6 +299,12 @@ void LayoutTestController::dumpResourceLoadCallbacks( result->SetNull(); } +void LayoutTestController::dumpResourceResponseMIMETypes( + const CppArgumentList& args, CppVariant* result) { + dump_resource_response_mime_types_ = true; + result->SetNull(); +} + void LayoutTestController::dumpChildFrameScrollPositions( const CppArgumentList& args, CppVariant* result) { dump_child_frame_scroll_positions_ = true; @@ -519,6 +527,7 @@ void LayoutTestController::Reset() { dump_editing_callbacks_ = false; dump_frame_load_callbacks_ = false; dump_resource_load_callbacks_ = false; + dump_resource_response_mime_types_ = false; dump_back_forward_list_ = false; dump_child_frame_scroll_positions_ = false; dump_child_frames_as_text_ = false; @@ -869,7 +878,7 @@ void LayoutTestController::suspendAnimations( WebKit::WebAnimationController* controller = web_frame->animationController(); if (!controller) - return; + return; controller->suspendAnimations(); } |