From f44725cf38e0f25a54a5cdeef699c11c9562b2d9 Mon Sep 17 00:00:00 2001 From: "epoger@chromium.org" Date: Wed, 23 Nov 2011 19:07:54 +0000 Subject: Flip Y-axis in WebGL for Skia-Mac BUG=105025 This CL includes additions to webkit/tools/layout_tests/test_expectations.txt which can be removed once http://trac.webkit.org/changeset/101075 is rolled into Chrome. Review URL: http://codereview.chromium.org/8632012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111384 0039d316-1c4b-4281-b951-d872f2087c98 --- content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h | 2 +- webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h | 2 +- webkit/tools/layout_tests/test_expectations.txt | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h b/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h index 6b052aa..4cc3499 100644 --- a/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h +++ b/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h @@ -21,7 +21,7 @@ #include "ui/gfx/gl/gpu_preference.h" #include "ui/gfx/native_widget_types.h" -#if !defined(OS_MACOSX) +#if defined(USE_SKIA) #define FLIP_FRAMEBUFFER_VERTICALLY #endif diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h index 1ba8624..0d575b6 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h +++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h @@ -16,7 +16,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "ui/gfx/native_widget_types.h" -#if !defined(OS_MACOSX) +#if defined(USE_SKIA) #define FLIP_FRAMEBUFFER_VERTICALLY #endif diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 707c890..4e830a0 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -6,3 +6,7 @@ // until the changes can be landed upstream. // PLEASE DO NOT LEAVE ENTRIES IN THIS FILE FOR MORE THAN 24 HRS. + +// These can be removed once http://trac.webkit.org/changeset/101075 has been rolled into Chrome. +BUGCR105025 MAC CPU GPU : fast/canvas/webgl/css-webkit-canvas.html = IMAGE +BUGCR105025 MAC CPU GPU : fast/canvas/webgl/css-webkit-canvas-repaint.html = IMAGE \ No newline at end of file -- cgit v1.1