diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 9 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 40 |
3 files changed, 10 insertions, 41 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "44286", + "webkit_revision": "44342", } diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index c1d78c7..de1de28 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -1276,7 +1276,7 @@ BUG10356 MAC : LayoutTests/http/tests/security/originHeader/origin-header-for-ht // MERGE 38389:38450 // WebKit regression: https://bugs.webkit.org/show_bug.cgi?id=20342 // Fails upstream, deferring for now. -BUG10357 : LayoutTests/fast/dom/cssTarget-crash.html = TIMEOUT +BUG10357 : LayoutTests/fast/dom/cssTarget-crash.html = TIMEOUT CRASH // MERGE 38500:39550: New tests // Missing expected results @@ -2698,3 +2698,10 @@ BUG12882 LINUX : LayoutTests/fast/frames/iframe-js-url-clientWidth.html = CRASH // WebKit 44252:44286 BUG13105 REBASELINE : LayoutTests/fast/backgrounds/body-generated-image-propagated-to-root.html = FAIL + +// WebKit 44286:44342 +// This test crashes the next layout tests, so skip until resolved. +BUG13176 SKIP : LayoutTests/fast/workers/worker-close.html = FAIL +BUG13174 WIN REBASELINE : LayoutTests/transitions/shorthand-border-transitions.html = FAIL +BUG13174 REBASELINE : LayoutTests/fast/dynamic/anchor-lock.html = FAIL +BUG13174 REBASELINE : LayoutTests/fast/transforms/bounding-rect-zoom.html = FAIL diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 534ce7d..dd5726f 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -2110,7 +2110,6 @@ '../third_party/WebKit/WebCore/platform/chromium/FramelessScrollViewClient.h', '../third_party/WebKit/WebCore/platform/chromium/KeyCodeConversion.h', '../third_party/WebKit/WebCore/platform/chromium/KeyCodeConversionGtk.cpp', - '../third_party/WebKit/WebCore/platform/chromium/KeyboardCodes.h', '../third_party/WebKit/WebCore/platform/chromium/KeyboardCodesPosix.h', '../third_party/WebKit/WebCore/platform/chromium/KeyboardCodesWin.h', '../third_party/WebKit/WebCore/platform/chromium/Language.cpp', @@ -2971,6 +2970,7 @@ '../third_party/WebKit/WebCore/platform/GeolocationService.cpp', '../third_party/WebKit/WebCore/platform/GeolocationService.h', '../third_party/WebKit/WebCore/platform/HostWindow.h', + '../third_party/WebKit/WebCore/platform/KeyboardCodes.h', '../third_party/WebKit/WebCore/platform/KURL.cpp', '../third_party/WebKit/WebCore/platform/KURL.h', '../third_party/WebKit/WebCore/platform/KURLGoogle.cpp', @@ -3392,40 +3392,6 @@ '../third_party/WebKit/WebCore/svg/animation/SMILTimeContainer.h', '../third_party/WebKit/WebCore/svg/animation/SVGSMILElement.cpp', '../third_party/WebKit/WebCore/svg/animation/SVGSMILElement.h', - '../third_party/WebKit/WebCore/svg/graphics/cairo/SVGResourceFilterCairo.cpp', - '../third_party/WebKit/WebCore/svg/graphics/cg/SVGResourceFilterCg.cpp', - '../third_party/WebKit/WebCore/svg/graphics/cg/SVGResourceFilterCg.mm', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/SVGFEHelpersCg.h', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/SVGFEHelpersCg.mm', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/SVGFilterEffectCg.mm', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKArithmeticFilter.h', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKArithmeticFilter.m', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKComponentMergeFilter.h', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKComponentMergeFilter.m', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKDiffuseLightingFilter.h', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKDiffuseLightingFilter.m', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKDiscreteTransferFilter.h', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKDiscreteTransferFilter.m', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKDisplacementMapFilter.h', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKDisplacementMapFilter.m', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKDistantLightFilter.h', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKDistantLightFilter.m', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKGammaTransferFilter.h', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKGammaTransferFilter.m', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKIdentityTransferFilter.h', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKIdentityTransferFilter.m', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKLinearTransferFilter.h', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKLinearTransferFilter.m', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKNormalMapFilter.h', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKNormalMapFilter.m', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKPointLightFilter.h', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKPointLightFilter.m', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKSpecularLightingFilter.h', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKSpecularLightingFilter.m', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKSpotLightFilter.h', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKSpotLightFilter.m', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKTableTransferFilter.h', - '../third_party/WebKit/WebCore/svg/graphics/filters/cg/WKTableTransferFilter.m', '../third_party/WebKit/WebCore/svg/graphics/filters/SVGDistantLightSource.h', '../third_party/WebKit/WebCore/svg/graphics/filters/SVGFEConvolveMatrix.cpp', '../third_party/WebKit/WebCore/svg/graphics/filters/SVGFEConvolveMatrix.h', @@ -3457,10 +3423,6 @@ '../third_party/WebKit/WebCore/svg/graphics/filters/SVGLightSource.h', '../third_party/WebKit/WebCore/svg/graphics/filters/SVGPointLightSource.h', '../third_party/WebKit/WebCore/svg/graphics/filters/SVGSpotLightSource.h', - '../third_party/WebKit/WebCore/svg/graphics/mac/SVGResourceFilterPlatformDataMac.h', - '../third_party/WebKit/WebCore/svg/graphics/mac/SVGResourceFilterPlatformDataMac.mm', - '../third_party/WebKit/WebCore/svg/graphics/qt/SVGResourceFilterQt.cpp', - '../third_party/WebKit/WebCore/svg/graphics/skia/SVGResourceFilterSkia.cpp', '../third_party/WebKit/WebCore/svg/graphics/SVGImage.cpp', '../third_party/WebKit/WebCore/svg/graphics/SVGImage.h', '../third_party/WebKit/WebCore/svg/graphics/SVGPaintServer.cpp', |