diff options
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 3 | ||||
| -rw-r--r-- | webkit/tools/test_shell/layout_test_controller.cc | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index bcbbc33..b4f36a3 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -700,11 +700,10 @@ BUG20292 : LayoutTests/fast/forms/input-list.html = FAIL BUG20292 : LayoutTests/fast/forms/input-selectedoption.html = FAIL // Add support for inspector layout tests. -BUG26734 LINUX MAC SKIP : LayoutTests/inspector = FAIL +BUG26734 LINUX MAC SKIP : LayoutTests/inspector = PASS BUG26734 SKIP : LayoutTests/inspector/console-format-collections.html = TEXT BUG26734 SKIP : LayoutTests/inspector/console-format.html = TEXT BUG26734 SKIP : LayoutTests/inspector/settings-set-get.html = TEXT -BUG26734 SKIP : LayoutTests/inspector/timeline-paint.html = TEXT // Fails due to storage APIs not implemented. Might be worth re-baselining // temporarily so the rest of the conditions are still tested. diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc index 9ca297e..9e36ada 100644 --- a/webkit/tools/test_shell/layout_test_controller.cc +++ b/webkit/tools/test_shell/layout_test_controller.cc @@ -19,6 +19,7 @@ #include "third_party/WebKit/WebKit/chromium/public/WebKit.h" #include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h" #include "third_party/WebKit/WebKit/chromium/public/WebSecurityPolicy.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSize.h" #include "third_party/WebKit/WebKit/chromium/public/WebURL.h" #include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/dom_operations.h" @@ -777,6 +778,9 @@ void LayoutTestController::dumpSelectionRect( void LayoutTestController::display( const CppArgumentList& args, CppVariant* result) { WebViewHost* view_host = shell_->webViewHost(); + const WebKit::WebSize& size = view_host->webview()->size(); + gfx::Rect rect(size.width, size.height); + view_host->UpdatePaintRect(rect); view_host->Paint(); view_host->DisplayRepaintMask(); result->SetNull(); |