diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 3 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 2 |
3 files changed, 4 insertions, 3 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "45270", + "webkit_revision": "45287", } 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', |