diff options
| author | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-27 06:03:18 +0000 |
|---|---|---|
| committer | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-27 06:03:18 +0000 |
| commit | 6455bfa93b79cb0c6a25399f7d9d3dc06ed7e699 (patch) | |
| tree | 9c3115d29d84ce948f00693bd47cf13ebcf13cb9 /webkit | |
| parent | ce2b62264e87a736b81f6fad85bf97dfc0f253b1 (diff) | |
| download | chromium_src-6455bfa93b79cb0c6a25399f7d9d3dc06ed7e699.zip chromium_src-6455bfa93b79cb0c6a25399f7d9d3dc06ed7e699.tar.gz chromium_src-6455bfa93b79cb0c6a25399f7d9d3dc06ed7e699.tar.bz2 | |
WebKit merge 45270:45287
Review URL: http://codereview.chromium.org/149107
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19457 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 3 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 8a8f74a..298d0c5 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2815,6 +2815,9 @@ BUGMERGE WIN LINUX : LayoutTests/svg/custom/createImageElement.svg = FAIL BUG15478 SKIP : LayoutTests/fast/frames/viewsource-on-image-file.html = FAIL BUG15478 SKIP : LayoutTests/platform/qt/fast/events/event-sender-keydown-frame.html = FAIL +// WebKit 45270:45287 +BUG15490 WIN : LayoutTests/http/tests/xmlhttprequest/cross-origin-authorization.html = TIMEOUT + // Flaky for a while on DEBUG BUG15267 WIN LINUX DEBUG : LayoutTests/transitions/cancel-transition.html = PASS FAIL diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 737fa54..598ebb3 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -2211,8 +2211,6 @@ '../third_party/WebKit/WebCore/platform/graphics/cg/PathCG.cpp', '../third_party/WebKit/WebCore/platform/graphics/cg/PatternCG.cpp', '../third_party/WebKit/WebCore/platform/graphics/cg/TransformationMatrixCG.cpp', - '../third_party/WebKit/WebCore/platform/graphics/chromium/ColorChromium.cpp', - '../third_party/WebKit/WebCore/platform/graphics/chromium/ColorChromiumMac.mm', '../third_party/WebKit/WebCore/platform/graphics/chromium/FontCacheChromiumWin.cpp', '../third_party/WebKit/WebCore/platform/graphics/chromium/FontCacheLinux.cpp', '../third_party/WebKit/WebCore/platform/graphics/chromium/FontChromiumWin.cpp', |