diff options
| author | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-18 06:23:02 +0000 |
|---|---|---|
| committer | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-18 06:23:02 +0000 |
| commit | 3f8b726a1b21714dee14731166c915994af36255 (patch) | |
| tree | d9b401ccc133339ed76ac2efbd87e64550ad8b00 /webkit | |
| parent | 85d48aefa79319cd169019d0b9f5dab742e5484b (diff) | |
| download | chromium_src-3f8b726a1b21714dee14731166c915994af36255.zip chromium_src-3f8b726a1b21714dee14731166c915994af36255.tar.gz chromium_src-3f8b726a1b21714dee14731166c915994af36255.tar.bz2 | |
Webkit merge 45998:46050.
TBR=paul
TEST=NONE
BUG=NONE
Review URL: http://codereview.chromium.org/159043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21049 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 4 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 1f78049..7efbb2d 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -1563,6 +1563,7 @@ BUG10389 WIN LINUX : LayoutTests/fast/canvas/canvas-incremental-repaint.html = F BUG10389 WIN LINUX : LayoutTests/fast/repaint/create-layer-repaint.html = FAIL BUG10389 WIN LINUX : LayoutTests/fast/repaint/reflection-redraw.html = FAIL BUG10389 WIN LINUX : LayoutTests/fast/repaint/opacity-change-on-overflow-float.html = FAIL +BUG8630 WIN LINUX : LayoutTests/fast/repaint/background-misaligned.html = FAIL // Linux pixeltest failure: Failing to rotate the form control BUG10390 LINUX : LayoutTests/fast/transforms/transformed-focused-text-input.html = FAIL @@ -2969,3 +2970,6 @@ BUG16878 WIN : LayoutTests/fast/css/shadow-multiple.html = FAIL BUG16962 LINUX WIN : LayoutTests/fast/css/nested-floating-relative-position-percentages.html = FAIL BUG16962 LINUX WIN : LayoutTests/fast/forms/get-file-upload.html = TIMEOUT BUG16962 MAC : LayoutTests/fast/forms/get-file-upload.html = TIMEOUT + +// New test from WebKit merge 45998:46050 +BUG17144 LINUX WIN : LayoutTests/fast/css/positioned-overflow-scroll.html = FAIL diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 655fc11..0ae547d 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -621,6 +621,11 @@ # Exclude some, but not all, of storage. ['exclude', '/third_party/WebKit/WebCore/storage/(Local|Session)Storage[^/]*\\.cpp$'], + + # Exclude PluginDebug.cpp since it doesn't compile properly without the + # correct npapi.h inclusion (http://crbug.com/17127 + ['exclude', '/third_party/WebKit/WebCore/plugins/PluginDebug.cpp'], + ['exclude', '/third_party/WebKit/WebCore/plugins/PluginDebug.h'], ], 'sources!': [ # Custom bindings in bindings/v8/custom exist for these. |