From 6176549d936f3383e8b55234dac72d5137bf6e5e Mon Sep 17 00:00:00 2001 From: "pinkerton@google.com" Date: Mon, 17 Nov 2008 19:53:43 +0000 Subject: use RGBA to get correctly colored pngs for pixel tests. Implement back/forward dump with window map. Review URL: http://codereview.chromium.org/11415 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5564 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/tools/test_shell/test_shell_mac.mm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'webkit') diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm index 8549673..4d38664 100644 --- a/webkit/tools/test_shell/test_shell_mac.mm +++ b/webkit/tools/test_shell/test_shell_mac.mm @@ -411,7 +411,7 @@ void TestShell::ResizeSubViews() { SkAutoLockPixels src_bmp_lock(src_bmp); PNGEncoder::Encode( reinterpret_cast(src_bmp.getPixels()), - PNGEncoder::FORMAT_BGRA, src_bmp.width(), src_bmp.height(), + PNGEncoder::FORMAT_RGBA, src_bmp.width(), src_bmp.height(), static_cast(src_bmp.rowBytes()), true, &png); // Write to disk. @@ -437,12 +437,10 @@ void TestShell::ResizeSubViews() { result->clear(); for (WindowList::iterator iter = TestShell::windowList()->begin(); iter != TestShell::windowList()->end(); iter++) { -#if 0 - HWND hwnd = *iter; - TestShell* shell = - static_cast(win_util::GetWindowUserData(hwnd)); - webkit_glue::DumpBackForwardList(shell->webView(), NULL, result); -#endif + NSWindow* window = *iter; + TestShell* shell = window_map_.Get()[window]; + if (shell) + webkit_glue::DumpBackForwardList(shell->webView(), NULL, result); } } -- cgit v1.1