More green please: Vector canvas matrix test disable, mac fix, mark layout

tests failing.

TBR=brettw

Review URL: http://codereview.chromium.org/113342

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15952 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 14 insertions, 3 deletions

diff --git a/skia/ext/vector_canvas_unittest.cc b/skia/ext/vector_canvas_unittest.cc
index 9b2ff85..710d356 100644
--- a/skia/ext/vector_canvas_unittest.cc
+++ b/skia/ext/vector_canvas_unittest.cc
@@ -909,7 +909,7 @@ TEST_F(VectorCanvasTest, ClippingClean) {
   }
 }
 
-TEST_F(VectorCanvasTest, Matrix) {
+TEST_F(VectorCanvasTest, DISABLED_Matrix) {
   SkBitmap bitmap;
   LoadPngFileToSkBitmap(test_file(L"..\\bitmaps\\bitmap_opaque.png"), &bitmap);
   {
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 56b4494..652df09 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2659,6 +2659,17 @@ BUG_SENORBLANCO LINUX : LayoutTests/svg/custom/js-late-marker-creation.svg = FAI
 BUG_SENORBLANCO WIN : LayoutTests/svg/custom/gradient-stop-corner-cases.svg = FAIL
 BUG_SENORBLANCO WIN : LayoutTests/svg/custom/grayscale-gradient-mask.svg = FAIL
 BUG_SENORBLANCO WIN : LayoutTests/svg/custom/js-late-gradient-and-object-creation.svg = FAIL
+BUG_SENORBLANCO WIN : LayoutTests/editing/inserting/4960120-1.html = FAIL
+BUG_SENORBLANCO WIN : LayoutTests/fast/forms/textarea-scrollbar.html = FAIL
+BUG_SENORBLANCO WIN : LayoutTests/fast/forms/textarea-scrolled-type.html = FAIL
+BUG_SENORBLANCO WIN : LayoutTests/fast/layers/self-painting-outline.html = FAIL
+BUG_SENORBLANCO WIN : LayoutTests/fast/overflow/overflow-focus-ring.html = FAIL
+BUG_SENORBLANCO WIN : LayoutTests/repaint/layer-outline-horizontal.html = FAIL
+BUG_SENORBLANCO WIN : LayoutTests/repaint/layer-outline.html = FAIL
+BUG_SENORBLANCO LINUX : LayoutTests/fast/borders/border-image-01.html = FAIL
+BUG_SENORBLANCO LINUX : LayoutTests/fast/borders/border-image-omit-right-slice.html = FAIL
+BUG_SENORBLANCO LINUX : LayoutTests/transitions/transition-end-event-multiple-03.html = FAIL
+BUG_SENORBLANCO LINUX : LayoutTests/transitions/transition-end-event-set-none.html = FAIL
 
 // This needs to be rebaselined.  See http://trac.webkit.org/changeset/43378
 BUG11669 LINUX : LayoutTests/fast/layers/remove-only-this-layer-update.html = FAIL
@@ -2691,4 +2702,4 @@ BUG11832 LINUX : LayoutTests/svg/custom/circular-marker-reference-4.svg = FAIL P
 BUG11832 LINUX DEBUG : LayoutTests/svg/W3C-SVG-1.1/painting-marker-01-f.svg = FAIL PASS
 
 // This test is marked as Slow on other platforms but still times out on Mac debug
-BUG11812 MAC : LayoutTests/http/tests/xmlhttprequest/supported-xml-content-types.html = TIMEOUT
\ No newline at end of file
+BUG11812 MAC : LayoutTests/http/tests/xmlhttprequest/supported-xml-content-types.html = TIMEOUT
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index 229498c..1fd92f1 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -42,7 +42,7 @@
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 
-#include "SkBitmap.h"
+#import "third_party/skia/include/core/SkBitmap.h"
 
 #import "mac/DumpRenderTreePasteboard.h"